From b59853359540a2eb53a3dd24c1e52db0595adccc Mon Sep 17 00:00:00 2001 From: Amartya Chakraborty Date: Thu, 8 Dec 2022 13:40:06 -0800 Subject: [PATCH] Update versioning and fix merge conflicts --- ci.cue | 4 ++-- plugins/logging/pkg/gateway/admin_v2_test.go | 10 +++++----- plugins/logging/pkg/gateway/plugin_test.go | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ci.cue b/ci.cue index 661d78f283..91982817f8 100644 --- a/ci.cue +++ b/ci.cue @@ -35,8 +35,8 @@ dagger.#Plan & { HELM_OCI_REPO: string | *"ghcr.io/rancher" DASHBOARDS_VERSION: string | *"2.4.0" OPENSEARCH_VERSION: string | *"2.4.0" - PLUGIN_VERSION: string | *"0.7.0" - PLUGIN_PUBLISH: string | *"0.7.0" + PLUGIN_VERSION: string | *"0.8.0-rc1" + PLUGIN_PUBLISH: string | *"0.8.0-rc1" EXPECTED_REF?: string // used by tilt DOCKER_USERNAME?: string DOCKER_PASSWORD?: dagger.#Secret diff --git a/plugins/logging/pkg/gateway/admin_v2_test.go b/plugins/logging/pkg/gateway/admin_v2_test.go index 6623c532c6..a52228ac19 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.7.0" + version = "0.8.0-rc1" 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.7.0"), + Image: lo.ToPtr("docker.io/rancher/opensearch-dashboards:2.4.0-0.8.0-rc1"), }, Replicas: 1, Enable: true, @@ -945,7 +945,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("unit"), func() { }) When("updating the cluster", func() { BeforeEach(func() { - version = "0.7.0" + version = "0.8.0-rc1" }) newRequest := createRequest() newRequest.DataNodes.Persistence = &loggingadmin.DataPersistence{ @@ -1035,7 +1035,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.7.0") + object.Status.Version = lo.ToPtr("0.8.0-rc1") Expect(k8sClient.Status().Update(context.Background(), object)).To(Succeed()) }) Specify("check upgrade available should return true", func() { @@ -1054,7 +1054,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("unit"), func() { if err != nil { return false } - return object.Spec.Version == "0.7.0" + return object.Spec.Version == "0.8.0-rc1" }, timeout, interval).Should(BeTrue()) }) }) diff --git a/plugins/logging/pkg/gateway/plugin_test.go b/plugins/logging/pkg/gateway/plugin_test.go index bdc152d071..0a91d6ac28 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.7.0" + version = "0.8.0-rc1" 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.7.0"), + Image: lo.ToPtr("docker.io/rancher/opensearch-dashboards:2.4.0-0.8.0-rc1"), }, 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.7.0" + version = "0.8.0-rc1" }) It("should succeed and update the cluster, excluding the version", func() { _, err := plugin.CreateOrUpdateOpensearchCluster(context.Background(), request)