From 65d150239bc91d8a77f53ffd6b1df09bd6fb86aa Mon Sep 17 00:00:00 2001 From: Cesar Celis Hernandez Date: Mon, 16 Oct 2023 16:01:48 -0600 Subject: [PATCH] Revert change as field is actually needed (#1821) --- helm/operator/templates/console-configmap.yaml | 1 + helm/operator/templates/console-deployment.yaml | 1 + helm/operator/templates/console-ingress.yaml | 1 + helm/operator/templates/console-secret.yaml | 1 + helm/operator/templates/console-service.yaml | 1 + helm/operator/templates/console-serviceaccount.yaml | 1 + helm/operator/templates/operator-deployment.yaml | 1 + helm/operator/templates/operator-service.yaml | 1 + helm/operator/templates/operator-serviceaccount.yaml | 1 + helm/operator/templates/sts-service.yaml | 1 + 10 files changed, 10 insertions(+) diff --git a/helm/operator/templates/console-configmap.yaml b/helm/operator/templates/console-configmap.yaml index ef4e2ad336c..e45634f49fa 100644 --- a/helm/operator/templates/console-configmap.yaml +++ b/helm/operator/templates/console-configmap.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: console-env + namespace: {{ .Release.Namespace }} data: CONSOLE_PORT: "9090" CONSOLE_TLS_PORT: "9443" diff --git a/helm/operator/templates/console-deployment.yaml b/helm/operator/templates/console-deployment.yaml index f57ebb02d8e..ad4f7521e75 100644 --- a/helm/operator/templates/console-deployment.yaml +++ b/helm/operator/templates/console-deployment.yaml @@ -3,6 +3,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: console + namespace: {{ .Release.Namespace }} labels: {{- include "minio-operator.labels" . | nindent 4 }} spec: replicas: {{ .Values.console.replicaCount }} diff --git a/helm/operator/templates/console-ingress.yaml b/helm/operator/templates/console-ingress.yaml index 14b9a7c0b5b..bce6c9f1910 100644 --- a/helm/operator/templates/console-ingress.yaml +++ b/helm/operator/templates/console-ingress.yaml @@ -4,6 +4,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ include "minio-operator.console-fullname" . }} + namespace: {{ .Release.Namespace }} {{- with .Values.console.ingress.labels }} labels: {{ toYaml . | nindent 4 }} {{- end }} diff --git a/helm/operator/templates/console-secret.yaml b/helm/operator/templates/console-secret.yaml index 42a9c85363c..78b4fbdb00c 100644 --- a/helm/operator/templates/console-secret.yaml +++ b/helm/operator/templates/console-secret.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: console-sa-secret + namespace: {{ .Release.Namespace }} annotations: kubernetes.io/service-account.name: console-sa type: kubernetes.io/service-account-token diff --git a/helm/operator/templates/console-service.yaml b/helm/operator/templates/console-service.yaml index 392578a7e79..fbd1e3e3e51 100644 --- a/helm/operator/templates/console-service.yaml +++ b/helm/operator/templates/console-service.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Service metadata: name: console + namespace: {{ .Release.Namespace }} labels: {{- include "minio-operator.labels" . | nindent 4 }} spec: ports: diff --git a/helm/operator/templates/console-serviceaccount.yaml b/helm/operator/templates/console-serviceaccount.yaml index a5972e359db..8b767397742 100644 --- a/helm/operator/templates/console-serviceaccount.yaml +++ b/helm/operator/templates/console-serviceaccount.yaml @@ -3,4 +3,5 @@ apiVersion: v1 kind: ServiceAccount metadata: name: console-sa + namespace: {{ .Release.Namespace }} {{- end }} diff --git a/helm/operator/templates/operator-deployment.yaml b/helm/operator/templates/operator-deployment.yaml index 52303919227..c79885adb09 100644 --- a/helm/operator/templates/operator-deployment.yaml +++ b/helm/operator/templates/operator-deployment.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: minio-operator + namespace: {{ .Release.Namespace }} labels: {{- include "minio-operator.labels" . | nindent 4 }} spec: replicas: {{ .Values.operator.replicaCount }} diff --git a/helm/operator/templates/operator-service.yaml b/helm/operator/templates/operator-service.yaml index 0abb7c061d6..33f25fbbb13 100644 --- a/helm/operator/templates/operator-service.yaml +++ b/helm/operator/templates/operator-service.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: name: operator + namespace: {{ .Release.Namespace }} labels: {{- include "minio-operator.labels" . | nindent 4 }} spec: type: ClusterIP diff --git a/helm/operator/templates/operator-serviceaccount.yaml b/helm/operator/templates/operator-serviceaccount.yaml index 9c118323dde..7b644248028 100644 --- a/helm/operator/templates/operator-serviceaccount.yaml +++ b/helm/operator/templates/operator-serviceaccount.yaml @@ -2,4 +2,5 @@ apiVersion: v1 kind: ServiceAccount metadata: name: minio-operator + namespace: {{ .Release.Namespace }} labels: {{- include "minio-operator.labels" . | nindent 4 }} diff --git a/helm/operator/templates/sts-service.yaml b/helm/operator/templates/sts-service.yaml index faeb98fc69c..51b06a5903b 100644 --- a/helm/operator/templates/sts-service.yaml +++ b/helm/operator/templates/sts-service.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: name: sts + namespace: {{ .Release.Namespace }} labels: {{- include "minio-operator.labels" . | nindent 4 }} spec: type: ClusterIP