From 29e4fab4369911771e7eab0fe2b2a703e90ac3ca Mon Sep 17 00:00:00 2001 From: michaelhtm <98621731+michaelhtm@users.noreply.github.com> Date: Tue, 27 May 2025 09:48:54 -0700 Subject: [PATCH] changes!! --- apis/v1alpha1/ack-generate-metadata.yaml | 8 +++---- helm/templates/caches-role-binding.yaml | 22 +++++++++++++---- helm/templates/caches-role.yaml | 18 ++++++++++++-- helm/templates/cluster-role-binding.yaml | 24 +++++++++++++++---- helm/templates/cluster-role-controller.yaml | 19 +++++++++++++-- .../leader-election-role-binding.yaml | 11 +++++++-- helm/templates/leader-election-role.yaml | 9 ++++++- helm/templates/role-reader.yaml | 9 ++++++- helm/templates/role-writer.yaml | 9 ++++++- 9 files changed, 108 insertions(+), 21 deletions(-) diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml index bc7c8f5..23e3701 100755 --- a/apis/v1alpha1/ack-generate-metadata.yaml +++ b/apis/v1alpha1/ack-generate-metadata.yaml @@ -1,8 +1,8 @@ ack_generate_info: - build_date: "2025-05-24T00:16:13Z" - build_hash: 66a58d259146834e61b211a9a01609beaa58ef77 - go_version: go1.24.2 - version: v0.47.1 + build_date: "2025-05-30T19:18:58Z" + build_hash: da78c1859faff7de93d1094ce8f26dc8b1fa5690 + go_version: go1.24.3 + version: v0.46.2-4-gda78c18 api_directory_checksum: 2627dc306e3a83c86c04050c6c4336451459e728 api_version: v1alpha1 aws_sdk_go_version: v1.32.6 diff --git a/helm/templates/caches-role-binding.yaml b/helm/templates/caches-role-binding.yaml index dd1961a..7038721 100644 --- a/helm/templates/caches-role-binding.yaml +++ b/helm/templates/caches-role-binding.yaml @@ -1,11 +1,18 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: ack-namespaces-cache-sqs-controller + name: {{ include "ack-sqs-controller.app.fullname" . }}-namespace-caches + labels: + app.kubernetes.io/name: {{ include "ack-sqs-controller.app.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} + k8s-app: {{ include "ack-sqs-controller.app.name" . }} + helm.sh/chart: {{ include "ack-sqs-controller.chart.name-version" . }} roleRef: kind: ClusterRole apiGroup: rbac.authorization.k8s.io - name: ack-namespaces-cache-sqs-controller + name: {{ include "ack-sqs-controller.app.fullname" . }}-namespace-caches subjects: - kind: ServiceAccount name: {{ include "ack-sqs-controller.service-account.name" . }} @@ -14,12 +21,19 @@ subjects: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: ack-configmaps-cache-sqs-controller + name: {{ include "ack-sqs-controller.app.fullname" . }}-configmaps-cache namespace: {{ .Release.Namespace }} + labels: + app.kubernetes.io/name: {{ include "ack-sqs-controller.app.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} + k8s-app: {{ include "ack-sqs-controller.app.name" . }} + helm.sh/chart: {{ include "ack-sqs-controller.chart.name-version" . }} roleRef: kind: Role apiGroup: rbac.authorization.k8s.io - name: ack-configmaps-cache-sqs-controller + name: {{ include "ack-sqs-controller.app.fullname" . }}-configmaps-cache subjects: - kind: ServiceAccount name: {{ include "ack-sqs-controller.service-account.name" . }} diff --git a/helm/templates/caches-role.yaml b/helm/templates/caches-role.yaml index 563b870..046664f 100644 --- a/helm/templates/caches-role.yaml +++ b/helm/templates/caches-role.yaml @@ -1,7 +1,14 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: ack-namespaces-cache-sqs-controller + name: {{ include "ack-sqs-controller.app.fullname" . }}-namespaces-cache + labels: + app.kubernetes.io/name: {{ include "ack-sqs-controller.app.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} + k8s-app: {{ include "ack-sqs-controller.app.name" . }} + helm.sh/chart: {{ include "ack-sqs-controller.chart.name-version" . }} rules: - apiGroups: - "" @@ -15,8 +22,15 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: ack-configmaps-cache-sqs-controller + name: {{ include "ack-sqs-controller.app.fullname" . }}-configmaps-cache namespace: {{ .Release.Namespace }} + labels: + app.kubernetes.io/name: {{ include "ack-sqs-controller.app.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} + k8s-app: {{ include "ack-sqs-controller.app.name" . }} + helm.sh/chart: {{ include "ack-sqs-controller.chart.name-version" . }} rules: - apiGroups: - "" diff --git a/helm/templates/cluster-role-binding.yaml b/helm/templates/cluster-role-binding.yaml index 563078c..bb16f40 100644 --- a/helm/templates/cluster-role-binding.yaml +++ b/helm/templates/cluster-role-binding.yaml @@ -2,11 +2,18 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ include "ack-sqs-controller.app.fullname" . }} + name: {{ include "ack-sqs-controller.app.fullname" . }}-rolebinding + labels: + app.kubernetes.io/name: {{ include "ack-sqs-controller.app.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} + k8s-app: {{ include "ack-sqs-controller.app.name" . }} + helm.sh/chart: {{ include "ack-sqs-controller.chart.name-version" . }} roleRef: kind: ClusterRole apiGroup: rbac.authorization.k8s.io - name: ack-sqs-controller + name: {{ include "ack-sqs-controller.app.fullname" . }} subjects: - kind: ServiceAccount name: {{ include "ack-sqs-controller.service-account.name" . }} @@ -17,17 +24,26 @@ subjects: {{ $fullname := include "ack-sqs-controller.app.fullname" . }} {{ $releaseNamespace := .Release.Namespace }} {{ $serviceAccountName := include "ack-sqs-controller.service-account.name" . }} +{{ $chartVersion := include "ack-sqs-controller.chart.name-version" . }} +{{ $appVersion := .Chart.AppVersion | quote }} {{ range $namespaces }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: {{ $fullname }} + name: {{ $fullname }}-{{ . }} namespace: {{ . }} + labels: + app.kubernetes.io/name: {{ $fullname }} + app.kubernetes.io/instance: {{ $.Release.Name }} + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: {{ $appVersion }} + k8s-app: {{ $fullname }} + helm.sh/chart: {{ $chartVersion }} roleRef: kind: Role apiGroup: rbac.authorization.k8s.io - name: ack-sqs-controller + name: {{ $fullname }}-{{ . }} subjects: - kind: ServiceAccount name: {{ $serviceAccountName }} diff --git a/helm/templates/cluster-role-controller.yaml b/helm/templates/cluster-role-controller.yaml index b3530c7..ebf9fd2 100644 --- a/helm/templates/cluster-role-controller.yaml +++ b/helm/templates/cluster-role-controller.yaml @@ -1,11 +1,20 @@ {{ $labels := .Values.role.labels }} +{{ $appVersion := .Chart.AppVersion | quote }} {{ $rbacRules := include "ack-sqs-controller.rbac-rules" . }} +{{ $fullname := include "ack-sqs-controller.app.fullname" . }} +{{ $chartVersion := include "ack-sqs-controller.chart.name-version" . }} {{ if eq .Values.installScope "cluster" }} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: ack-sqs-controller + name: {{ include "ack-sqs-controller.app.fullname" . }} labels: + app.kubernetes.io/name: {{ include "ack-sqs-controller.app.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} + k8s-app: {{ include "ack-sqs-controller.app.name" . }} + helm.sh/chart: {{ include "ack-sqs-controller.chart.name-version" . }} {{- range $key, $value := $labels }} {{ $key }}: {{ $value | quote }} {{- end }} @@ -18,9 +27,15 @@ metadata: apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: ack-sqs-controller + name: {{ $fullname }}-{{ . }} namespace: {{ . }} labels: + app.kubernetes.io/name: {{ $fullname }} + app.kubernetes.io/instance: {{ $.Release.Name }} + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: {{ $appVersion }} + k8s-app: {{ $fullname }} + helm.sh/chart: {{ $chartVersion }} {{- range $key, $value := $labels }} {{ $key }}: {{ $value | quote }} {{- end }} diff --git a/helm/templates/leader-election-role-binding.yaml b/helm/templates/leader-election-role-binding.yaml index 1bb5f9b..6584fa8 100644 --- a/helm/templates/leader-election-role-binding.yaml +++ b/helm/templates/leader-election-role-binding.yaml @@ -2,16 +2,23 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: sqs-leader-election-rolebinding + name: {{ include "ack-sqs-controller.app.fullname" . }}-leaderelection {{ if .Values.leaderElection.namespace }} namespace: {{ .Values.leaderElection.namespace }} {{ else }} namespace: {{ .Release.Namespace }} {{ end }} + labels: + app.kubernetes.io/name: {{ include "ack-sqs-controller.app.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} + k8s-app: {{ include "ack-sqs-controller.app.name" . }} + helm.sh/chart: {{ include "ack-sqs-controller.chart.name-version" . }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: sqs-leader-election-role + name: {{ include "ack-sqs-controller.app.fullname" . }}-leaderelection subjects: - kind: ServiceAccount name: {{ include "ack-sqs-controller.service-account.name" . }} diff --git a/helm/templates/leader-election-role.yaml b/helm/templates/leader-election-role.yaml index d91cb55..15c36f0 100644 --- a/helm/templates/leader-election-role.yaml +++ b/helm/templates/leader-election-role.yaml @@ -2,12 +2,19 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: sqs-leader-election-role + name: {{ include "ack-sqs-controller.app.fullname" . }}-leaderelection {{ if .Values.leaderElection.namespace }} namespace: {{ .Values.leaderElection.namespace }} {{ else }} namespace: {{ .Release.Namespace }} {{ end }} + labels: + app.kubernetes.io/name: {{ include "ack-sqs-controller.app.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} + k8s-app: {{ include "ack-sqs-controller.app.name" . }} + helm.sh/chart: {{ include "ack-sqs-controller.chart.name-version" . }} rules: - apiGroups: - coordination.k8s.io diff --git a/helm/templates/role-reader.yaml b/helm/templates/role-reader.yaml index 7a0482b..5db42ba 100644 --- a/helm/templates/role-reader.yaml +++ b/helm/templates/role-reader.yaml @@ -3,8 +3,15 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: creationTimestamp: null - name: ack-sqs-reader + name: {{ include "ack-sqs-controller.app.fullname" . }}-reader namespace: {{ .Release.Namespace }} + labels: + app.kubernetes.io/name: {{ include "ack-sqs-controller.app.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} + k8s-app: {{ include "ack-sqs-controller.app.name" . }} + helm.sh/chart: {{ include "ack-sqs-controller.chart.name-version" . }} rules: - apiGroups: - sqs.services.k8s.aws diff --git a/helm/templates/role-writer.yaml b/helm/templates/role-writer.yaml index 8b9a6d5..517c34f 100644 --- a/helm/templates/role-writer.yaml +++ b/helm/templates/role-writer.yaml @@ -3,8 +3,15 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: creationTimestamp: null - name: ack-sqs-writer + name: {{ include "ack-sqs-controller.app.fullname" . }}-writer namespace: {{ .Release.Namespace }} + labels: + app.kubernetes.io/name: {{ include "ack-sqs-controller.app.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} + k8s-app: {{ include "ack-sqs-controller.app.name" . }} + helm.sh/chart: {{ include "ack-sqs-controller.chart.name-version" . }} rules: - apiGroups: - sqs.services.k8s.aws