Merge pull request #926 from rancher/release-v0.8

Update files to reflect v0.8.0

Tiltfile

@@ -4,7 +4,7 @@ load('ext://namespace', 'namespace_create')
 
 set_team('52cc75cc-c4ed-462f-8ea7-a543d398a381')
 
-version = '0.8.0-rc5'
+version = '0.8.0'
 config.define_string_list('allowedContexts')
 config.define_string_list('opniChartValues')
 config.define_string('defaultRegistry')

ci.cue

@@ -19,7 +19,7 @@ import (
 	"github.com/rancher/opni/images"
 )
 
-opniVersion: "0.8.0-rc5"
+opniVersion: "0.8.0"
 
 dagger.#Plan & {
 	client: {

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.8.0-rc5
+appVersion: 0.8.0
 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.8.0-rc5
+version: 0.8.0

packages/opni-agent/opni-agent/package.yaml

@@ -1,6 +1,6 @@
 
 url: local
-version: 0.8.0-rc5
+version: 0.8.0
 workingDir: charts
 additionalCharts:
 - workingDir: charts-crd

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.8.0-rc5
+appVersion: 0.8.0
 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.8.0-rc5
+version: 0.8.0

packages/opni/opni/package.yaml

@@ -1,6 +1,6 @@
 
 url: local
-version: 0.8.0-rc5
+version: 0.8.0
 workingDir: charts
 additionalCharts:
 - workingDir: charts-crd

pkg/resources/opniopensearch/resources.go

@@ -39,7 +39,7 @@ func (r *Reconciler) buildOpensearchCluster(
 	// Set default image version
 	version := r.instance.Spec.Version
 	if version == "unversioned" {
-		version = "0.8.0-rc5"
+		version = "0.8.0"
 	}
 
 	image := fmt.Sprintf(

plugins/logging/pkg/gateway/admin.go

@@ -411,7 +411,7 @@ func (p *Plugin) convertProtobufToDashboards(
 	cluster *loggingv1beta1.OpniOpensearch,
 ) opsterv1.DashboardsConfig {
 	var osVersion string
-	version := "0.8.0-rc5"
+	version := "0.8.0"
 	if cluster == nil {
 		if versions.Version != "unversioned" {
 			version = strings.TrimPrefix(versions.Version, "v")
@@ -437,7 +437,7 @@ func (p *Plugin) convertProtobufToDashboards(
 	}
 
 	if version == "unversioned" {
-		version = "0.8.0-rc5"
+		version = "0.8.0"
 	}
 
 	image := fmt.Sprintf(

plugins/logging/pkg/gateway/admin_v2.go

@@ -1028,7 +1028,7 @@ func (m *LoggingManagerV2) convertProtobufToDashboards(
 	cluster *loggingv1beta1.OpniOpensearch,
 ) opsterv1.DashboardsConfig {
 	var osVersion string
-	version := "0.8.0-rc5"
+	version := "0.8.0"
 	if cluster == nil {
 		osVersion = opensearchVersion
 	} else {
@@ -1045,7 +1045,7 @@ func (m *LoggingManagerV2) convertProtobufToDashboards(
 	}
 
 	if version == "unversioned" {
-		version = "0.8.0-rc5"
+		version = "0.8.0"
 	}
 
 	if m.versionOverride != "" {

plugins/logging/pkg/gateway/admin_v2_test.go

@@ -54,7 +54,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("unit"), func() {
 
 	BeforeEach(func() {
 		namespace = "test-logging-v2"
-		version = "0.8.0-rc5"
+		version = "0.8.0"
 		opensearchVersion = "2.4.0"
 
 		security = &opsterv1.Security{
@@ -70,7 +70,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("unit"), func() {
 		}
 		dashboards = opsterv1.DashboardsConfig{
 			ImageSpec: &opsterv1.ImageSpec{
-				Image: lo.ToPtr("docker.io/rancher/opensearch-dashboards:2.4.0-0.8.0-rc5"),
+				Image: lo.ToPtr("docker.io/rancher/opensearch-dashboards:2.4.0-0.8.0"),
 			},
 			Replicas: 1,
 			Enable:   true,
@@ -1053,7 +1053,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("unit"), func() {
 		})
 		When("updating the cluster", func() {
 			BeforeEach(func() {
-				version = "0.8.0-rc5"
+				version = "0.8.0"
 			})
 			newRequest := createRequest()
 			newRequest.DataNodes.Persistence = &loggingadmin.DataPersistence{
@@ -1142,7 +1142,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("unit"), func() {
 					})
 				}, timeout, interval).Should(BeTrue())
 				Expect(object.Spec.Security).To(Equal(security))
-				Expect(object.Spec.Version).To(Equal("0.8.0-rc5"))
+				Expect(object.Spec.Version).To(Equal("0.8.0"))
 				Expect(len(object.Spec.NodePools)).To(Equal(2))
 			})
 			When("upgrade is available", func() {
@@ -1153,7 +1153,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("unit"), func() {
 					}, object)
 					Expect(err).NotTo(HaveOccurred())
 					object.Status.OpensearchVersion = lo.ToPtr("2.4.0")
-					object.Status.Version = lo.ToPtr("0.8.0-rc5")
+					object.Status.Version = lo.ToPtr("0.8.0")
 					Expect(k8sClient.Status().Update(context.Background(), object)).To(Succeed())
 				})
 				Specify("check upgrade available should return true", func() {
@@ -1172,7 +1172,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("unit"), func() {
 						if err != nil {
 							return false
 						}
-						return object.Spec.Version == "0.8.0-rc5"
+						return object.Spec.Version == "0.8.0"
 					}, timeout, interval).Should(BeTrue())
 				})
 			})

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.8.0-rc5"
+		version = "0.8.0"
 		opensearchVersion = "2.4.0"
 
 		request = &loggingadmin.OpensearchCluster{
@@ -127,7 +127,7 @@ var _ = Describe("Logging Plugin", Ordered, Label("unit"), func() {
 		}
 		dashboards = opsterv1.DashboardsConfig{
 			ImageSpec: &opsterv1.ImageSpec{
-				Image: lo.ToPtr("docker.io/rancher/opensearch-dashboards:2.4.0-0.8.0-rc5"),
+				Image: lo.ToPtr("docker.io/rancher/opensearch-dashboards:2.4.0-0.8.0"),
 			},
 			Replicas: 1,
 			Enable:   true,
@@ -234,7 +234,7 @@ var _ = Describe("Logging Plugin", Ordered, Label("unit"), func() {
 				nodePool.Jvm = fmt.Sprintf("-Xmx%d -Xms%d", 2*giBytes, 2*giBytes)
 				nodePool.Resources.Limits[corev1.ResourceMemory] = resource.MustParse("4Gi")
 				nodePool.Resources.Requests[corev1.ResourceMemory] = resource.MustParse("4Gi")
-				version = "0.8.0-rc5"
+				version = "0.8.0"
 			})
 			It("should succeed and update the cluster, excluding the version", func() {
 				_, err := plugin.CreateOrUpdateOpensearchCluster(context.Background(), request)
@@ -250,7 +250,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.8.0-rc5"))
+				Expect(object.Spec.Version).To(Equal("0.8.0"))
 			})
 		})
 		Specify("check upgrade available should return false", func() {
@@ -260,10 +260,10 @@ var _ = Describe("Logging Plugin", Ordered, Label("unit"), func() {
 		})
 		XWhen("new version is available", func() {
 			BeforeEach(func() {
-				version = "0.8.0-rc5"
+				version = "0.8.0"
 			})
 			Specify("upgrade available should return true", func() {
-				Expect(version).To(Equal("0.8.0-rc5"))
+				Expect(version).To(Equal("0.8.0"))
 				response, err := plugin.UpgradeAvailable(context.Background(), nil)
 				Expect(err).NotTo(HaveOccurred())
 				Expect(response.UpgradePending).To(BeTrue())