Merge pull request #169 from rancher/release-030

Update for version v0.3.0
rancher · Dec 11, 2021 · fee96c5 · fee96c5
2 parents c0bf325 + 0909607
commit fee96c5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/apis/v1beta1/opnicluster_meta.go b/apis/v1beta1/opnicluster_meta.go
@@ -61,6 +61,8 @@ func (s ServiceKind) ImageName() string {
 	switch s {
 	case GPUControllerService:
 		return "opni-gpu-service-controller"
+	case UIService:
+		return "opni-ui"
 	default:
 		return "opni-" + s.String() + "-service"
 	}

diff --git a/deploy/manifests/20_cluster.yaml b/deploy/manifests/20_cluster.yaml
@@ -24,7 +24,7 @@ metadata:
   name: cluster
   namespace: opni
 spec:
-  version: v0.2.1
+  version: v0.3.0
   deployLogCollector: true
   services:
     gpuController:
@@ -33,12 +33,10 @@ spec:
       pretrainedModels:
       - name: control-plane
     metrics:
-      enabled: false # metrics anomaly detection is currently experimental
-      prometheusEndpoint: http://prometheus-url # metrics anomaly detection requires a prometheus url to connect to.
-    insights:
-      enabled: false
-    ui:
-      enabled: false
+      enabled: false # metrics anomaly detection is currently beta
+      prometheuus:
+        name: prometheus-name #The name of the prometheus resource
+        namespace: promethues-namespace #The namespace the prometheus resource is in
   elastic:
     version: 1.1.0
   s3:

diff --git a/deploy/patches/versions.yaml b/deploy/patches/versions.yaml
@@ -3,6 +3,6 @@ kind: OpniCluster
 metadata:
   name: cluster
 spec:
-  version: v0.2.1
+  version: v0.3.0
   elastic:
     version: 1.1.0
diff --git a/test/e2e/cluster_test.go b/test/e2e/cluster_test.go
@@ -113,7 +113,7 @@ var _ = Describe("OpniCluster E2E Test", Label("e2e"), func() {
 					Namespace: clusterCrNamespace,
 				},
 				Spec: v1beta1.OpniClusterSpec{
-					Version:            "v0.2.1",
+					Version:            "v0.3.0",
 					DeployLogCollector: pointer.BoolPtr(true),
 					Services: v1beta1.ServicesSpec{
 						GPUController: v1beta1.GPUControllerServiceSpec{
@@ -133,12 +133,6 @@ var _ = Describe("OpniCluster E2E Test", Label("e2e"), func() {
 								},
 							},
 						},
-						Insights: v1beta1.InsightsServiceSpec{
-							Enabled: pointer.BoolPtr(false),
-						},
-						UI: v1beta1.UIServiceSpec{
-							Enabled: pointer.BoolPtr(false),
-						},
 					},
 					Elastic: v1beta1.ElasticSpec{
 						Version: "1.1.0",