Merge pull request #698 from rancher/chart-fixes

Fix minor issues with release
rancher · Oct 21, 2022 · 8d9e8a3 · 8d9e8a3
2 parents f4fa7ae + a5ef4f4
commit 8d9e8a3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 38 deletions.
diff --git a/controllers/logging_opniopensearch_controller_test.go b/controllers/logging_opniopensearch_controller_test.go
@@ -150,6 +150,7 @@ var _ = Describe("Logging OpniOpensearch Controller", Ordered, Label("controller
 							object.Spec.OpensearchVersion,
 							object.Spec.Version,
 						)),
+						ImagePullPolicy: lo.ToPtr(corev1.PullAlways),
 					},
 					Version:          object.Spec.Version,
 					ServiceName:      fmt.Sprintf("%s-opensearch-svc", object.Name),

diff --git a/packages/opni/opni/charts/templates/ai/opnicluster.yaml b/packages/opni/opni/charts/templates/ai/opnicluster.yaml
@@ -19,29 +19,7 @@ spec:
       - name: rancher
       - name: longhorn
     metrics:
-      enabled: {{ .Values.monitoring.enabled }}
-      prometheusEndpoint: https://cortex-query-frontend:8080
-      extraVolumeMounts:
-      - name: cortex-client-certs
-        mountPath: /run/cortex/certs/client
-        secret:
-          secretName: cortex-client-cert-keys
-          defaultMode: 256
-          items:
-            - key: tls.crt
-              path: tls.crt
-            - key: tls.key
-              path: tls.key
-            - key: ca.crt
-              path: ca.crt
-      - name: cortex-server-cacert
-        mountPath: /run/cortex/certs/server
-        secret:
-          secretName: cortex-serving-cert-keys
-          defaultMode: 256
-          items:
-            - key: ca.crt
-              path: ca.crt
+      enabled: false
   opensearch:
     name: opni
     namespace: {{ include "opni.namespace" . }}

diff --git a/packages/opni/opni/charts/templates/gateway.yaml b/packages/opni/opni/charts/templates/gateway.yaml
@@ -21,15 +21,8 @@ spec:
   {{- end }}
   {{- with .Values.gateway.auth }}
   auth:
-    provider: {{ .provider }}
-    {{- if eq .provider "openid" }}
-    openid: {{ toYaml .openid | nindent 6 }}
-    {{- end }}
+    {{ toYaml . | nindent 4 }}
   {{- end}}
-    {{- if eq .Values.gateway.auth.provider "noauth" }}
-    noauth:
-      grafanaHostname: {{ .Values.monitoring.grafana.hostname }}
-    {{- end }}
   {{- with .Values.nodeSelector }}
   nodeSelector:
     {{- toYaml . | nindent 4 }}

diff --git a/pkg/resources/logadapter/logging.go b/pkg/resources/logadapter/logging.go
@@ -209,7 +209,7 @@ func BuildK3SConfig(instance interface{}) *corev1.ConfigMap {
 		if adapter.Spec.OpniCluster == nil {
 			copy := adapter.DeepCopy()
 			copy.Spec.OpniCluster = &v1beta2.OpniClusterNameSpec{
-				Namespace: "opni-system",
+				Namespace: controlNamespace(convertSpec(adapter.Spec)),
 			}
 			fluentBitK3sTemplate.Execute(&buffer, copy)
 		} else {
@@ -227,7 +227,7 @@ func BuildK3SConfig(instance interface{}) *corev1.ConfigMap {
 		if adapter.Spec.OpniCluster == nil {
 			copy := adapter.DeepCopy()
 			copy.Spec.OpniCluster = &opniloggingv1beta1.OpniClusterNameSpec{
-				Namespace: "opni-system",
+				Namespace: controlNamespace(adapter.Spec),
 			}
 			fluentBitK3sTemplate.Execute(&buffer, copy)
 		} else {
@@ -455,7 +455,7 @@ func BuildRKEConfig(instance interface{}) *corev1.ConfigMap {
 		if adapter.Spec.OpniCluster == nil {
 			copy := adapter.DeepCopy()
 			copy.Spec.OpniCluster = &v1beta2.OpniClusterNameSpec{
-				Namespace: "opni-system",
+				Namespace: controlNamespace(convertSpec(adapter.Spec)),
 			}
 			fluentBitRKETemplate.Execute(&buffer, copy)
 		} else {
@@ -475,7 +475,7 @@ func BuildRKEConfig(instance interface{}) *corev1.ConfigMap {
 		if adapter.Spec.OpniCluster == nil {
 			copy := adapter.DeepCopy()
 			copy.Spec.OpniCluster = &opniloggingv1beta1.OpniClusterNameSpec{
-				Namespace: "opni-system",
+				Namespace: controlNamespace(adapter.Spec),
 			}
 			fluentBitRKETemplate.Execute(&buffer, copy)
 		} else {
@@ -751,7 +751,7 @@ func BuildRKE2Config(instance interface{}) *corev1.ConfigMap {
 		if adapter.Spec.OpniCluster == nil {
 			copy := adapter.DeepCopy()
 			copy.Spec.OpniCluster = &v1beta2.OpniClusterNameSpec{
-				Namespace: "opni-system",
+				Namespace: controlNamespace(convertSpec(adapter.Spec)),
 			}
 			fluentBitRKE2Template.Execute(&buffer, copy)
 		} else {
@@ -773,7 +773,7 @@ func BuildRKE2Config(instance interface{}) *corev1.ConfigMap {
 		if adapter.Spec.OpniCluster == nil {
 			copy := adapter.DeepCopy()
 			copy.Spec.OpniCluster = &opniloggingv1beta1.OpniClusterNameSpec{
-				Namespace: "opni-system",
+				Namespace: controlNamespace(adapter.Spec),
 			}
 			fluentBitRKE2Template.Execute(&buffer, copy)
 		} else {

diff --git a/pkg/resources/opniopensearch/resources.go b/pkg/resources/opniopensearch/resources.go
@@ -8,6 +8,7 @@ import (
 	opnicorev1beta1 "github.com/rancher/opni/apis/core/v1beta1"
 	loggingv1beta1 "github.com/rancher/opni/apis/logging/v1beta1"
 	opnimeta "github.com/rancher/opni/pkg/util/meta"
+	"github.com/samber/lo"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -49,7 +50,8 @@ func (r *Reconciler) buildOpensearchCluster(natsAuthSecret string) *opsterv1.Ope
 		Spec: opsterv1.ClusterSpec{
 			General: opsterv1.GeneralConfig{
 				ImageSpec: &opsterv1.ImageSpec{
-					Image: &image,
+					Image:           &image,
+					ImagePullPolicy: lo.ToPtr(corev1.PullAlways),
 				},
 				Version:          r.instance.Spec.OpensearchVersion,
 				ServiceName:      fmt.Sprintf("%s-opensearch-svc", r.instance.Name),