diff --git a/ci.cue b/ci.cue index 3c714b1d5a..650786552a 100644 --- a/ci.cue +++ b/ci.cue @@ -35,8 +35,8 @@ dagger.#Plan & { HELM_OCI_REPO: string | *"ghcr.io/rancher" DASHBOARDS_VERSION: string | *"1.3.3" OPENSEARCH_VERSION: string | *"1.3.3" - PLUGIN_VERSION: string | *"0.6.1-rc2" - PLUGIN_PUBLISH: string | *"0.6.1" + PLUGIN_VERSION: string | *"0.6.2-rc1" + PLUGIN_PUBLISH: string | *"0.6.2-rc1" EXPECTED_REF?: string // used by tilt DOCKER_USERNAME?: string DOCKER_PASSWORD?: dagger.#Secret diff --git a/packages/opni-agent/opni-agent/charts/Chart.yaml b/packages/opni-agent/opni-agent/charts/Chart.yaml index 9f245c5d41..902c0948e7 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.6.1 +appVersion: 0.6.2-rc1 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.6.1 +version: 0.6.2-rc1 diff --git a/packages/opni-agent/opni-agent/package.yaml b/packages/opni-agent/opni-agent/package.yaml index 6c5caafa4f..c6bec8fc2b 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.6.1 +version: 0.6.2-rc1 workingDir: charts additionalCharts: - workingDir: charts-crd diff --git a/packages/opni/opni/charts/Chart.yaml b/packages/opni/opni/charts/Chart.yaml index f1b5f77cd1..c59918ed00 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.6.1 +appVersion: 0.6.2-rc1 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.6.1 +version: 0.6.2-rc1 diff --git a/packages/opni/opni/package.yaml b/packages/opni/opni/package.yaml index 0fb6911e68..95555e8560 100644 --- a/packages/opni/opni/package.yaml +++ b/packages/opni/opni/package.yaml @@ -1,6 +1,6 @@ url: local -version: 0.6.1 +version: 0.6.2-rc1 workingDir: charts additionalCharts: - workingDir: charts-crd diff --git a/pkg/resources/opniopensearch/resources.go b/pkg/resources/opniopensearch/resources.go index 4c19cbf358..72114d74a6 100644 --- a/pkg/resources/opniopensearch/resources.go +++ b/pkg/resources/opniopensearch/resources.go @@ -33,7 +33,7 @@ func (r *Reconciler) buildOpensearchCluster(natsAuthSecret string) *opsterv1.Ope // Set default image version version := r.instance.Spec.Version if version == "unversioned" { - version = "0.6.1" + version = "0.6.2-rc1" } image := fmt.Sprintf( diff --git a/plugins/logging/pkg/gateway/admin.go b/plugins/logging/pkg/gateway/admin.go index d51430fd9f..6bfafa1073 100644 --- a/plugins/logging/pkg/gateway/admin.go +++ b/plugins/logging/pkg/gateway/admin.go @@ -465,7 +465,7 @@ func (p *Plugin) convertProtobufToDashboards( cluster *loggingv1beta1.OpniOpensearch, ) opsterv1.DashboardsConfig { var osVersion string - version := "0.6.1" + version := "0.6.2-rc1" if cluster == nil { if util.Version != "unversioned" { version = strings.TrimPrefix(util.Version, "v") @@ -491,7 +491,7 @@ func (p *Plugin) convertProtobufToDashboards( } if version == "unversioned" { - version = "0.6.1" + version = "0.6.2-rc1" } image := fmt.Sprintf( diff --git a/plugins/logging/pkg/gateway/plugin_test.go b/plugins/logging/pkg/gateway/plugin_test.go index 28656bf36f..76f4b2198c 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.6.1" + version = "0.6.2-rc1" opensearchVersion = "1.3.3" request = &loggingadmin.OpensearchCluster{ @@ -123,7 +123,7 @@ var _ = Describe("Logging Plugin", Ordered, Label("unit"), func() { } dashboards = opsterv1.DashboardsConfig{ ImageSpec: &opsterv1.ImageSpec{ - Image: lo.ToPtr("docker.io/rancher/opensearch-dashboards:1.3.3-0.6.1"), + Image: lo.ToPtr("docker.io/rancher/opensearch-dashboards:1.3.3-0.6.2-rc1"), }, Replicas: 1, Enable: true, @@ -246,7 +246,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.6.1")) + Expect(object.Spec.Version).To(Equal("0.6.2-rc1")) }) }) Specify("check upgrade available should return false", func() {