diff --git a/7project/charts/myapp-chart/templates/rabbitmq-permission.yaml b/7project/charts/myapp-chart/templates/rabbitmq-permission.yaml index 10ae61b..880398f 100644 --- a/7project/charts/myapp-chart/templates/rabbitmq-permission.yaml +++ b/7project/charts/myapp-chart/templates/rabbitmq-permission.yaml @@ -3,9 +3,7 @@ apiVersion: rabbitmq.com/v1beta1 kind: Permission metadata: name: {{ printf "%s-permission" (.Values.rabbitmq.username | default "demo-app") }} - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/managed-by: Helm + namespace: {{ .Values.rabbitmq.namespace | default "rabbitmq" }} spec: rabbitmqClusterReference: name: {{ .Values.rabbitmq.clusterName | default "rabbitmq" }} diff --git a/7project/charts/myapp-chart/templates/rabbitmq-queue.yaml b/7project/charts/myapp-chart/templates/rabbitmq-queue.yaml index 4d2b451..2980934 100644 --- a/7project/charts/myapp-chart/templates/rabbitmq-queue.yaml +++ b/7project/charts/myapp-chart/templates/rabbitmq-queue.yaml @@ -4,8 +4,6 @@ kind: Queue metadata: name: {{ .Values.worker.mailQueueName | replace "_" "-" | lower }} namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/managed-by: Helm spec: rabbitmqClusterReference: name: {{ .Values.rabbitmq.clusterName | default "rabbitmq" }} diff --git a/7project/charts/myapp-chart/templates/rabbitmq-user-secret.yaml b/7project/charts/myapp-chart/templates/rabbitmq-user-secret.yaml index 6249b5f..4c8a43e 100644 --- a/7project/charts/myapp-chart/templates/rabbitmq-user-secret.yaml +++ b/7project/charts/myapp-chart/templates/rabbitmq-user-secret.yaml @@ -4,8 +4,6 @@ kind: Secret metadata: name: {{ printf "%s-user-credentials" (.Values.rabbitmq.username | default "app-user") }} namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/managed-by: Helm stringData: password: {{ .Values.rabbitmq.password | quote }} {{- end }} diff --git a/7project/charts/myapp-chart/templates/rabbitmq-user.yaml b/7project/charts/myapp-chart/templates/rabbitmq-user.yaml index e038524..c336fcd 100644 --- a/7project/charts/myapp-chart/templates/rabbitmq-user.yaml +++ b/7project/charts/myapp-chart/templates/rabbitmq-user.yaml @@ -4,8 +4,6 @@ kind: User metadata: name: {{ .Values.rabbitmq.username | default "demo-app" }} namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/managed-by: Helm spec: rabbitmqClusterReference: name: {{ .Values.rabbitmq.clusterName | default "rabbitmq" }}