From 7e3272b90697f0cacbf75a4d2431241001b5d7a7 Mon Sep 17 00:00:00 2001 From: Dan Bason Date: Wed, 7 Jun 2023 12:14:36 +1200 Subject: [PATCH] [CHORE] Update versions --- Tiltfile | 2 +- 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_v2.go | 2 +- .../kubernetes_manager/kubernetes_manager_test.go | 8 ++++---- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Tiltfile b/Tiltfile index 398689b64a..01efc79848 100644 --- a/Tiltfile +++ b/Tiltfile @@ -4,7 +4,7 @@ load('ext://namespace', 'namespace_create') set_team('52cc75cc-c4ed-462f-8ea7-a543d398a381') -version = '0.10.0-rc7' +version = '0.10.0-rc8' config.define_string_list('allowedContexts') config.define_string_list('opniChartValues') config.define_string('defaultRegistry') diff --git a/ci.cue b/ci.cue index 192e24c90c..1532b23b6d 100644 --- a/ci.cue +++ b/ci.cue @@ -19,7 +19,7 @@ import ( "github.com/rancher/opni/images" ) -opniVersion: "0.10.0-rc7" +opniVersion: "0.10.0-rc8" dagger.#Plan & { client: { diff --git a/packages/opni-agent/opni-agent/charts/Chart.yaml b/packages/opni-agent/opni-agent/charts/Chart.yaml index 75a5b2499e..0253e31717 100644 --- a/packages/opni-agent/opni-agent/charts/Chart.yaml +++ b/packages/opni-agent/opni-agent/charts/Chart.yaml @@ -4,7 +4,7 @@ annotations: catalog.rancher.io/namespace: opni-system catalog.rancher.io/release-name: opni-agent apiVersion: v2 -appVersion: 0.10.0-rc7 +appVersion: 0.10.0-rc8 dependencies: - condition: kube-prometheus-stack.enabled name: kube-prometheus-stack @@ -12,4 +12,4 @@ dependencies: description: Opni Agent name: opni-agent type: application -version: 0.10.0-rc7 +version: 0.10.0-rc8 diff --git a/packages/opni-agent/opni-agent/package.yaml b/packages/opni-agent/opni-agent/package.yaml index e2e3dab0bb..64aa88c4d9 100644 --- a/packages/opni-agent/opni-agent/package.yaml +++ b/packages/opni-agent/opni-agent/package.yaml @@ -1,3 +1,3 @@ url: local -version: 0.10.0-rc7 +version: 0.10.0-rc8 workingDir: charts diff --git a/packages/opni/opni/charts/Chart.yaml b/packages/opni/opni/charts/Chart.yaml index cac9211131..9a357541b5 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.10.0-rc7 +appVersion: 0.10.0-rc8 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.10.0-rc7 +version: 0.10.0-rc8 diff --git a/packages/opni/opni/package.yaml b/packages/opni/opni/package.yaml index 6139f157d7..3989940622 100644 --- a/packages/opni/opni/package.yaml +++ b/packages/opni/opni/package.yaml @@ -1,5 +1,5 @@ url: local -version: 0.10.0-rc7 +version: 0.10.0-rc8 workingDir: charts additionalCharts: - workingDir: charts-crd diff --git a/pkg/resources/opniopensearch/resources.go b/pkg/resources/opniopensearch/resources.go index 6ee6161994..ffe6d2a009 100644 --- a/pkg/resources/opniopensearch/resources.go +++ b/pkg/resources/opniopensearch/resources.go @@ -45,7 +45,7 @@ func (r *Reconciler) buildOpensearchCluster( // Set default image version version := r.instance.Spec.Version if version == "unversioned" { - version = "0.10.0-rc7" + version = "0.10.0-rc8" } image := fmt.Sprintf( diff --git a/plugins/logging/pkg/gateway/admin_v2.go b/plugins/logging/pkg/gateway/admin_v2.go index 15776004d0..5eb679e17d 100644 --- a/plugins/logging/pkg/gateway/admin_v2.go +++ b/plugins/logging/pkg/gateway/admin_v2.go @@ -24,7 +24,7 @@ import ( corev1 "k8s.io/api/core/v1" ) -const defaultOpniVersion = "0.10.0-rc7" +const defaultOpniVersion = "0.10.0-rc8" type ClusterStatus int diff --git a/plugins/logging/pkg/gateway/drivers/management/kubernetes_manager/kubernetes_manager_test.go b/plugins/logging/pkg/gateway/drivers/management/kubernetes_manager/kubernetes_manager_test.go index 4191ba3171..a2cbb0c4e0 100644 --- a/plugins/logging/pkg/gateway/drivers/management/kubernetes_manager/kubernetes_manager_test.go +++ b/plugins/logging/pkg/gateway/drivers/management/kubernetes_manager/kubernetes_manager_test.go @@ -60,7 +60,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("integration"), func() { BeforeEach(func() { namespace = "test-logging-v2" - version = "0.10.0-rc7" + version = "0.10.0-rc8" opensearchVersion = "2.4.0" security = &opsterv1.Security{ @@ -76,7 +76,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("integration"), func() { } dashboards = opsterv1.DashboardsConfig{ ImageSpec: &opsterv1.ImageSpec{ - Image: lo.ToPtr("docker.io/rancher/opensearch-dashboards:2.4.0-0.10.0-rc7"), + Image: lo.ToPtr("docker.io/rancher/opensearch-dashboards:2.4.0-0.10.0-rc8"), }, Replicas: 1, Enable: true, @@ -1088,7 +1088,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("integration"), func() { }) }, timeout, interval).Should(BeTrue()) Expect(object.Spec.Security).To(Equal(security)) - Expect(object.Spec.Version).To(Equal("0.10.0-rc7")) + Expect(object.Spec.Version).To(Equal("0.10.0-rc8")) Expect(len(object.Spec.NodePools)).To(Equal(2)) }) When("upgrade is available", func() { @@ -1099,7 +1099,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("integration"), func() { }, object) Expect(err).NotTo(HaveOccurred()) object.Status.OpensearchVersion = lo.ToPtr("2.4.0") - object.Status.Version = lo.ToPtr("0.10.0-rc7") + object.Status.Version = lo.ToPtr("0.10.0-rc8") Expect(k8sClient.Status().Update(context.Background(), object)).To(Succeed()) }) Specify("check upgrade available should return true", func() {