From 484e8336492b9c88a32ec5971b294441c4c0bc39 Mon Sep 17 00:00:00 2001 From: Dan Bason Date: Fri, 21 Oct 2022 13:38:35 +1300 Subject: [PATCH 1/3] Fix chart values --- .../opni/charts/templates/ai/opnicluster.yaml | 24 +------------------ .../opni/opni/charts/templates/gateway.yaml | 9 +------ 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/packages/opni/opni/charts/templates/ai/opnicluster.yaml b/packages/opni/opni/charts/templates/ai/opnicluster.yaml index 7e98bcc015..ffb2427500 100644 --- 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 index 483fff9620..021dc17900 100644 --- 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 }} From 232ce4d4ccd0390b553d33869ad225a17f0f5221 Mon Sep 17 00:00:00 2001 From: Dan Bason Date: Fri, 21 Oct 2022 13:39:42 +1300 Subject: [PATCH 2/3] Fix namespace of aggregators --- pkg/resources/logadapter/logging.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/resources/logadapter/logging.go b/pkg/resources/logadapter/logging.go index 1d10672681..e0be62b345 100644 --- 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 { From a5ef4f455410d28a9d9cab8e09c5b876485ff283 Mon Sep 17 00:00:00 2001 From: Dan Bason Date: Fri, 21 Oct 2022 13:49:28 +1300 Subject: [PATCH 3/3] Always pull images --- controllers/logging_opniopensearch_controller_test.go | 1 + pkg/resources/opniopensearch/resources.go | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/controllers/logging_opniopensearch_controller_test.go b/controllers/logging_opniopensearch_controller_test.go index 880ea579b8..62c7d21f14 100644 --- 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/pkg/resources/opniopensearch/resources.go b/pkg/resources/opniopensearch/resources.go index f2bdcaee72..7ec9627abd 100644 --- 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),