Merge pull request #1464 from rancher/update-versions

kralicky · web-flow · commit a8882e3da170 · 2023-05-31T17:57:12.000-04:00
Update version numbers to 0.10.0-rc4
diff --git a/Tiltfile b/Tiltfile
@@ -4,7 +4,7 @@ load('ext://namespace', 'namespace_create')
 
 set_team('52cc75cc-c4ed-462f-8ea7-a543d398a381')
 
-version = '0.10.0-rc3'
+version = '0.10.0-rc4'
 config.define_string_list('allowedContexts')
 config.define_string_list('opniChartValues')
 config.define_string('defaultRegistry')
diff --git a/ci.cue b/ci.cue
@@ -19,7 +19,7 @@ import (
 	"github.com/rancher/opni/images"
 )
 
-opniVersion: "0.10.0-rc3"
+opniVersion: "0.10.0-rc4"
 
 dagger.#Plan & {
 	client: {
diff --git a/packages/opni-agent/opni-agent/charts/Chart.yaml b/packages/opni-agent/opni-agent/charts/Chart.yaml
@@ -4,12 +4,12 @@ annotations:
   catalog.rancher.io/namespace: opni-system
   catalog.rancher.io/release-name: opni-agent
 apiVersion: v2
-appVersion: 0.10.0-rc3
+appVersion: 0.10.0-rc4
 dependencies:
-- condition: kube-prometheus-stack.enabled
-  name: kube-prometheus-stack
-  repository: file://./charts/kube-prometheus-stack
+  - 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.10.0-rc3
+version: 0.10.0-rc4
diff --git 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-rc3
+version: 0.10.0-rc4
 workingDir: charts
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.10.0-rc3
+appVersion: 0.10.0-rc4
 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-rc3
+version: 0.10.0-rc4
diff --git a/packages/opni/opni/package.yaml b/packages/opni/opni/package.yaml
@@ -1,6 +1,6 @@
 
 url: local
-version: 0.10.0-rc3
+version: 0.10.0-rc4
 workingDir: charts
 additionalCharts:
 - workingDir: charts-crd
diff --git 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-rc3"
+		version = "0.10.0-rc4"
 	}
 
 	image := fmt.Sprintf(
diff --git a/plugins/aiops/pkg/gateway/admin_test.go b/plugins/aiops/pkg/gateway/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.10.0-rc3"
+				version = "v0.10.0-rc4"
 			})
 			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.10.0-rc3"))
+				Expect(cluster.Spec.Version).To(Equal("v0.10.0-rc4"))
 			})
 		})
 		When("new version is older", func() {
diff --git 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.10.0-rc3",
+		version: "v0.10.0-rc4",
 	}
 	options.apply(opts...)
 
diff --git 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-rc3"
+const defaultOpniVersion = "0.10.0-rc4"
 
 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
@@ -60,7 +60,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("integration"), func() {
 
 	BeforeEach(func() {
 		namespace = "test-logging-v2"
-		version = "0.10.0-rc3"
+		version = "0.10.0-rc4"
 		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-rc3"),
+				Image: lo.ToPtr("docker.io/rancher/opensearch-dashboards:2.4.0-0.10.0-rc4"),
 			},
 			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-rc3"))
+				Expect(object.Spec.Version).To(Equal("0.10.0-rc4"))
 				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-rc3")
+					object.Status.Version = lo.ToPtr("0.10.0-rc4")
 					Expect(k8sClient.Status().Update(context.Background(), object)).To(Succeed())
 				})
 				Specify("check upgrade available should return true", func() {

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ import (`
`19`	`19`	`"github.com/rancher/opni/images"`
`20`	`20`	`)`
`21`	`21`
`22`		`-opniVersion: "0.10.0-rc3"`
	`22`	`+opniVersion: "0.10.0-rc4"`
`23`	`23`
`24`	`24`	`dagger.#Plan & {`
`25`	`25`	`client: {`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ func (r *Reconciler) buildOpensearchCluster(`
`45`	`45`	`// Set default image version`
`46`	`46`	`version := r.instance.Spec.Version`
`47`	`47`	`if version == "unversioned" {`
`48`		`- version = "0.10.0-rc3"`
	`48`	`+ version = "0.10.0-rc4"`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`image := fmt.Sprintf(`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ func NewPlugin(ctx context.Context, opts ...PluginOption) *AIOpsPlugin {`
`90`	`90`	`Name: "opni",`
`91`	`91`	`Namespace: os.Getenv("POD_NAMESPACE"),`
`92`	`92`	`},`
`93`		`- version: "v0.10.0-rc3",`
	`93`	`+ version: "v0.10.0-rc4",`
`94`	`94`	`}`
`95`	`95`	`options.apply(opts...)`
`96`	`96`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`	`corev1 "k8s.io/api/core/v1"`
`25`	`25`	`)`
`26`	`26`
`27`		`-const defaultOpniVersion = "0.10.0-rc3"`
	`27`	`+const defaultOpniVersion = "0.10.0-rc4"`
`28`	`28`
`29`	`29`	`type ClusterStatus int`
`30`	`30`