From 370c925030a1401b8308fbad2f5a89a07c8b839f Mon Sep 17 00:00:00 2001 From: Dan Bason Date: Fri, 15 Sep 2023 12:59:01 +1200 Subject: [PATCH] Update version --- Tiltfile | 2 +- dagger/ci/defaults.toml | 2 +- dagger/config/setup.go | 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/aiops/pkg/gateway/plugin.go | 2 +- plugins/logging/pkg/gateway/admin_v2.go | 2 +- .../kubernetes_manager/kubernetes_manager_test.go | 8 ++++---- test/plugins/aiops/admin_test.go | 4 ++-- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Tiltfile b/Tiltfile index aa065e5dd9..ee8c637331 100644 --- a/Tiltfile +++ b/Tiltfile @@ -4,7 +4,7 @@ load('ext://namespace', 'namespace_create') set_team('52cc75cc-c4ed-462f-8ea7-a543d398a381') -version = '0.11.2-rc2' +version = '0.11.2' config.define_string_list('allowedContexts') config.define_string_list('opniChartValues') config.define_string('defaultRegistry') diff --git a/dagger/ci/defaults.toml b/dagger/ci/defaults.toml index d89f445108..e8eb0f1ec4 100644 --- a/dagger/ci/defaults.toml +++ b/dagger/ci/defaults.toml @@ -26,7 +26,7 @@ test = true [images.opensearch.build] dashboards-version = "2.8.0" opensearch-version = "2.8.0" - plugin-version = "0.11.2-rc2" + plugin-version = "0.11.2" [images.opensearch.dashboards] repo = "docker.io/rancher/opensearch-dashboards" diff --git a/dagger/config/setup.go b/dagger/config/setup.go index 47bae94896..cd2b3ef039 100644 --- a/dagger/config/setup.go +++ b/dagger/config/setup.go @@ -61,7 +61,7 @@ func RunSetup() { Build: OpensearchBuildConfig{ DashboardsVersion: "2.8.0", OpensearchVersion: "2.8.0", - PluginVersion: "0.11.2-rc2", + PluginVersion: "0.11.2", }, }, }, diff --git a/packages/opni-agent/opni-agent/charts/Chart.yaml b/packages/opni-agent/opni-agent/charts/Chart.yaml index dd42a64de7..34a3fbbbb9 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.11.2-rc2 +appVersion: 0.11.2 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.11.2-rc2 +version: 0.11.2 diff --git a/packages/opni-agent/opni-agent/package.yaml b/packages/opni-agent/opni-agent/package.yaml index 28d36fc6fd..6523722b01 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.11.2-rc2 +version: 0.11.2 workingDir: charts diff --git a/packages/opni/opni/charts/Chart.yaml b/packages/opni/opni/charts/Chart.yaml index 7c22c7cc6a..b1b8f9ae7c 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.11.2-rc2 +appVersion: 0.11.2 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.11.2-rc2 +version: 0.11.2 diff --git a/packages/opni/opni/package.yaml b/packages/opni/opni/package.yaml index d45bfa1a00..2949cd53ab 100644 --- a/packages/opni/opni/package.yaml +++ b/packages/opni/opni/package.yaml @@ -1,5 +1,5 @@ url: local -version: 0.11.2-rc2 +version: 0.11.2 workingDir: charts additionalCharts: - workingDir: charts-crd diff --git a/pkg/resources/opniopensearch/resources.go b/pkg/resources/opniopensearch/resources.go index da28739c21..0b67d5e855 100644 --- a/pkg/resources/opniopensearch/resources.go +++ b/pkg/resources/opniopensearch/resources.go @@ -47,7 +47,7 @@ func (r *Reconciler) buildOpensearchCluster( // Set default image version version := r.instance.Spec.Version if version == "unversioned" { - version = "0.11.2-rc2" + version = "0.11.2" } image := calculateImage(r.instance.Spec.ImageRepo, version, r.instance.Spec.OpensearchVersion) diff --git a/plugins/aiops/pkg/gateway/plugin.go b/plugins/aiops/pkg/gateway/plugin.go index 6fd61662c7..79ea5891de 100644 --- a/plugins/aiops/pkg/gateway/plugin.go +++ b/plugins/aiops/pkg/gateway/plugin.go @@ -90,7 +90,7 @@ func NewPlugin(ctx context.Context, opts ...PluginOption) *AIOpsPlugin { Name: "opni", Namespace: os.Getenv("POD_NAMESPACE"), }, - version: "v0.11.2-rc2", + version: "v0.11.2", } options.apply(opts...) diff --git a/plugins/logging/pkg/gateway/admin_v2.go b/plugins/logging/pkg/gateway/admin_v2.go index 32f5fc9426..bd2bd9aa75 100644 --- a/plugins/logging/pkg/gateway/admin_v2.go +++ b/plugins/logging/pkg/gateway/admin_v2.go @@ -25,7 +25,7 @@ import ( corev1 "k8s.io/api/core/v1" ) -const defaultOpniVersion = "0.11.2-rc2" +const defaultOpniVersion = "0.11.2" 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 6ccdf92c9e..ea3bb3eb90 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 @@ -62,7 +62,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("integration"), func() { BeforeEach(func() { namespace = "test-logging-v2" - version = "0.11.2-rc2" + version = "0.11.2" opensearchVersion = "2.8.0" security = &opsterv1.Security{ @@ -78,7 +78,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("integration"), func() { } dashboards = opsterv1.DashboardsConfig{ ImageSpec: &opsterv1.ImageSpec{ - Image: lo.ToPtr("docker.io/rancher/opensearch-dashboards:v0.11.2-rc2-2.8.0"), + Image: lo.ToPtr("docker.io/rancher/opensearch-dashboards:v0.11.2-2.8.0"), }, Replicas: 1, Enable: true, @@ -1150,7 +1150,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.11.2-rc2")) + Expect(object.Spec.Version).To(Equal("0.11.2")) Expect(len(object.Spec.NodePools)).To(Equal(2)) }) When("upgrade is available", func() { @@ -1161,7 +1161,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("integration"), func() { }, object) Expect(err).NotTo(HaveOccurred()) object.Status.OpensearchVersion = lo.ToPtr("2.8.0") - object.Status.Version = lo.ToPtr("0.11.2-rc2") + object.Status.Version = lo.ToPtr("0.11.2") Expect(k8sClient.Status().Update(context.Background(), object)).To(Succeed()) }) Specify("check upgrade available should return true", func() { diff --git a/test/plugins/aiops/admin_test.go b/test/plugins/aiops/admin_test.go index e3f3fc7845..dd5a5221a5 100644 --- a/test/plugins/aiops/admin_test.go +++ b/test/plugins/aiops/admin_test.go @@ -530,7 +530,7 @@ var _ = Describe("AI Admin", Ordered, Label("integration"), func() { }) When("new version is available", func() { BeforeEach(func() { - version = "v0.11.2-rc2" + version = "v0.11.2" }) When("updating the opni cluster", func() { BeforeEach(func() { @@ -569,7 +569,7 @@ var _ = Describe("AI Admin", Ordered, Label("integration"), func() { Name: OpniServicesName, Namespace: namespace, }, cluster)).Should(Succeed()) - Expect(cluster.Spec.Version).To(Equal("v0.11.2-rc2")) + Expect(cluster.Spec.Version).To(Equal("v0.11.2")) }) }) When("new version is older", func() {