From f54ebaf894e3447f539ba80823f1c1ad38e05a89 Mon Sep 17 00:00:00 2001 From: Amartya Chakraborty Date: Wed, 14 Dec 2022 18:27:26 -0500 Subject: [PATCH] Update files for rc2 release v0.8.0 --- ci.cue | 2 +- packages/opni-agent/opni-agent/charts/Chart.yaml | 4 ++-- packages/opni-agent/opni-agent/package.yaml | 2 +- packages/opni/opni/charts/Chart.yaml | 4 ++-- packages/opni/opni/package.yaml | 2 +- pkg/resources/opniopensearch/resources.go | 2 +- plugins/logging/pkg/gateway/admin.go | 4 ++-- plugins/logging/pkg/gateway/admin_v2.go | 4 ++-- plugins/logging/pkg/gateway/admin_v2_test.go | 12 ++++++------ plugins/logging/pkg/gateway/plugin_test.go | 12 ++++++------ 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/ci.cue b/ci.cue index d24c26a2e6..44183048c4 100644 --- a/ci.cue +++ b/ci.cue @@ -19,7 +19,7 @@ import ( "github.com/rancher/opni/images" ) -opniVersion: "0.8.0-rc1" +opniVersion: "0.8.0-rc2" dagger.#Plan & { client: { diff --git a/packages/opni-agent/opni-agent/charts/Chart.yaml b/packages/opni-agent/opni-agent/charts/Chart.yaml index 3d406453af..21a3559a3e 100644 --- a/packages/opni-agent/opni-agent/charts/Chart.yaml +++ b/packages/opni-agent/opni-agent/charts/Chart.yaml @@ -5,7 +5,7 @@ annotations: catalog.rancher.io/namespace: opni-system catalog.rancher.io/release-name: opni-agent apiVersion: v2 -appVersion: 0.8.0-rc1 +appVersion: 0.8.0-rc2 dependencies: - condition: kube-prometheus-stack.enabled name: kube-prometheus-stack @@ -13,4 +13,4 @@ dependencies: description: Opni Agent name: opni-agent type: application -version: 0.8.0-rc1 +version: 0.8.0-rc2 diff --git a/packages/opni-agent/opni-agent/package.yaml b/packages/opni-agent/opni-agent/package.yaml index 70d71a27d1..2374666c7a 100644 --- a/packages/opni-agent/opni-agent/package.yaml +++ b/packages/opni-agent/opni-agent/package.yaml @@ -1,6 +1,6 @@ url: local -version: 0.8.0-rc1 +version: 0.8.0-rc2 workingDir: charts additionalCharts: - workingDir: charts-crd diff --git a/packages/opni/opni/charts/Chart.yaml b/packages/opni/opni/charts/Chart.yaml index daba24cd86..7efc84e890 100644 --- a/packages/opni/opni/charts/Chart.yaml +++ b/packages/opni/opni/charts/Chart.yaml @@ -5,7 +5,7 @@ annotations: catalog.rancher.io/namespace: opni-cluster-system catalog.rancher.io/release-name: opni apiVersion: v2 -appVersion: 0.8.0-rc1 +appVersion: 0.8.0-rc2 dependencies: - condition: opni-agent.kube-prometheus-stack.enabled name: kube-prometheus-stack @@ -31,4 +31,4 @@ maintainers: name: Dan Bason name: opni type: application -version: 0.8.0-rc1 +version: 0.8.0-rc2 diff --git a/packages/opni/opni/package.yaml b/packages/opni/opni/package.yaml index a5f9a08c5e..7c20d82acd 100644 --- a/packages/opni/opni/package.yaml +++ b/packages/opni/opni/package.yaml @@ -1,6 +1,6 @@ url: local -version: 0.8.0-rc1 +version: 0.8.0-rc2 workingDir: charts additionalCharts: - workingDir: charts-crd diff --git a/pkg/resources/opniopensearch/resources.go b/pkg/resources/opniopensearch/resources.go index 8a97ab07db..4deda4c229 100644 --- a/pkg/resources/opniopensearch/resources.go +++ b/pkg/resources/opniopensearch/resources.go @@ -39,7 +39,7 @@ func (r *Reconciler) buildOpensearchCluster( // Set default image version version := r.instance.Spec.Version if version == "unversioned" { - version = "0.8.0-rc1" + version = "0.8.0-rc2" } image := fmt.Sprintf( diff --git a/plugins/logging/pkg/gateway/admin.go b/plugins/logging/pkg/gateway/admin.go index 1a67607fad..5f9f6a3fac 100644 --- a/plugins/logging/pkg/gateway/admin.go +++ b/plugins/logging/pkg/gateway/admin.go @@ -410,7 +410,7 @@ func (p *Plugin) convertProtobufToDashboards( cluster *loggingv1beta1.OpniOpensearch, ) opsterv1.DashboardsConfig { var osVersion string - version := "0.8.0-rc1" + version := "0.8.0-rc2" if cluster == nil { if util.Version != "unversioned" { version = strings.TrimPrefix(util.Version, "v") @@ -436,7 +436,7 @@ func (p *Plugin) convertProtobufToDashboards( } if version == "unversioned" { - version = "0.8.0-rc1" + version = "0.8.0-rc2" } image := fmt.Sprintf( diff --git a/plugins/logging/pkg/gateway/admin_v2.go b/plugins/logging/pkg/gateway/admin_v2.go index e315c28aea..a2483615b4 100644 --- a/plugins/logging/pkg/gateway/admin_v2.go +++ b/plugins/logging/pkg/gateway/admin_v2.go @@ -1027,7 +1027,7 @@ func (m *LoggingManagerV2) convertProtobufToDashboards( cluster *loggingv1beta1.OpniOpensearch, ) opsterv1.DashboardsConfig { var osVersion string - version := "0.8.0-rc1" + version := "0.8.0-rc2" if cluster == nil { osVersion = opensearchVersion } else { @@ -1044,7 +1044,7 @@ func (m *LoggingManagerV2) convertProtobufToDashboards( } if version == "unversioned" { - version = "0.8.0-rc1" + version = "0.8.0-rc2" } if m.versionOverride != "" { diff --git a/plugins/logging/pkg/gateway/admin_v2_test.go b/plugins/logging/pkg/gateway/admin_v2_test.go index bbb4be15ef..a22a1d1891 100644 --- a/plugins/logging/pkg/gateway/admin_v2_test.go +++ b/plugins/logging/pkg/gateway/admin_v2_test.go @@ -54,7 +54,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("unit"), func() { BeforeEach(func() { namespace = "test-logging-v2" - version = "0.8.0-rc1" + version = "0.8.0-rc2" opensearchVersion = "2.4.0" security = &opsterv1.Security{ @@ -70,7 +70,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("unit"), func() { } dashboards = opsterv1.DashboardsConfig{ ImageSpec: &opsterv1.ImageSpec{ - Image: lo.ToPtr("docker.io/rancher/opensearch-dashboards:2.4.0-0.8.0-rc1"), + Image: lo.ToPtr("docker.io/rancher/opensearch-dashboards:2.4.0-0.8.0-rc2"), }, Replicas: 1, Enable: true, @@ -1053,7 +1053,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("unit"), func() { }) When("updating the cluster", func() { BeforeEach(func() { - version = "0.8.0-rc1" + version = "0.8.0-rc2" }) newRequest := createRequest() newRequest.DataNodes.Persistence = &loggingadmin.DataPersistence{ @@ -1142,7 +1142,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("unit"), func() { }) }, timeout, interval).Should(BeTrue()) Expect(object.Spec.Security).To(Equal(security)) - Expect(object.Spec.Version).To(Equal("0.8.0-rc1")) + Expect(object.Spec.Version).To(Equal("0.8.0-rc2")) Expect(len(object.Spec.NodePools)).To(Equal(2)) }) When("upgrade is available", func() { @@ -1153,7 +1153,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("unit"), func() { }, object) Expect(err).NotTo(HaveOccurred()) object.Status.OpensearchVersion = lo.ToPtr("2.4.0") - object.Status.Version = lo.ToPtr("0.8.0-rc1") + object.Status.Version = lo.ToPtr("0.8.0-rc2") Expect(k8sClient.Status().Update(context.Background(), object)).To(Succeed()) }) Specify("check upgrade available should return true", func() { @@ -1172,7 +1172,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("unit"), func() { if err != nil { return false } - return object.Spec.Version == "0.8.0-rc1" + return object.Spec.Version == "0.8.0-rc2" }, timeout, interval).Should(BeTrue()) }) }) diff --git a/plugins/logging/pkg/gateway/plugin_test.go b/plugins/logging/pkg/gateway/plugin_test.go index 0a91d6ac28..0fbb259520 100644 --- a/plugins/logging/pkg/gateway/plugin_test.go +++ b/plugins/logging/pkg/gateway/plugin_test.go @@ -43,7 +43,7 @@ var _ = Describe("Logging Plugin", Ordered, Label("unit"), func() { BeforeEach(func() { namespace = "test-logging" - version = "0.8.0-rc1" + version = "0.8.0-rc2" opensearchVersion = "2.4.0" request = &loggingadmin.OpensearchCluster{ @@ -127,7 +127,7 @@ var _ = Describe("Logging Plugin", Ordered, Label("unit"), func() { } dashboards = opsterv1.DashboardsConfig{ ImageSpec: &opsterv1.ImageSpec{ - Image: lo.ToPtr("docker.io/rancher/opensearch-dashboards:2.4.0-0.8.0-rc1"), + Image: lo.ToPtr("docker.io/rancher/opensearch-dashboards:2.4.0-0.8.0-rc2"), }, Replicas: 1, Enable: true, @@ -234,7 +234,7 @@ var _ = Describe("Logging Plugin", Ordered, Label("unit"), func() { nodePool.Jvm = fmt.Sprintf("-Xmx%d -Xms%d", 2*giBytes, 2*giBytes) nodePool.Resources.Limits[corev1.ResourceMemory] = resource.MustParse("4Gi") nodePool.Resources.Requests[corev1.ResourceMemory] = resource.MustParse("4Gi") - version = "0.8.0-rc1" + version = "0.8.0-rc2" }) It("should succeed and update the cluster, excluding the version", func() { _, err := plugin.CreateOrUpdateOpensearchCluster(context.Background(), request) @@ -250,7 +250,7 @@ var _ = Describe("Logging Plugin", Ordered, Label("unit"), func() { return reflect.DeepEqual(object.Spec.NodePools[0], nodePool) }, timeout, interval).Should(BeTrue()) Expect(object.Spec.Security).To(Equal(security)) - Expect(object.Spec.Version).To(Equal("0.8.0-rc1")) + Expect(object.Spec.Version).To(Equal("0.8.0-rc2")) }) }) Specify("check upgrade available should return false", func() { @@ -260,10 +260,10 @@ var _ = Describe("Logging Plugin", Ordered, Label("unit"), func() { }) XWhen("new version is available", func() { BeforeEach(func() { - version = "0.8.0-rc1" + version = "0.8.0-rc2" }) Specify("upgrade available should return true", func() { - Expect(version).To(Equal("0.8.0-rc1")) + Expect(version).To(Equal("0.8.0-rc2")) response, err := plugin.UpgradeAvailable(context.Background(), nil) Expect(err).NotTo(HaveOccurred()) Expect(response.UpgradePending).To(BeTrue())