Merge pull request #811 from rancher/release-062

Chore: update versions for release
rancher · Nov 15, 2022 · f1856df · f1856df
2 parents 5d30511 + 2858218
commit f1856df
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git 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
@@ -5,12 +5,12 @@ 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
   repository: file://./charts/kube-prometheus-stack
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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() {