From 8fb910383d6dc9e11ff0bc63b90c36c31b820a54 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 13 Mar 2024 05:54:53 -0600 Subject: [PATCH] update kubelet-serving-cert-approver --- .../kubelet-serving-cert-approver/Chart.yaml | 2 +- .../templates/cluster-role-binding.yaml | 7 +++---- .../templates/cluster-role.yaml | 10 ++++------ .../templates/deployment.yaml | 18 +++++++++--------- .../templates/namespace.yaml | 4 ++-- .../templates/role-binding.yaml | 7 +++---- .../templates/service-account.yaml | 7 +++---- .../templates/service.yaml | 9 ++++----- 8 files changed, 29 insertions(+), 35 deletions(-) diff --git a/charts/kubelet-serving-cert-approver/Chart.yaml b/charts/kubelet-serving-cert-approver/Chart.yaml index 5ead10b..60a5cd9 100644 --- a/charts/kubelet-serving-cert-approver/Chart.yaml +++ b/charts/kubelet-serving-cert-approver/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: kubelet-serving-cert-approver -version: 0.0.3 +version: 0.0.4 description: Kubelet Serving TLS Certificate Signing Request Approver keywords: - kubernetes diff --git a/charts/kubelet-serving-cert-approver/templates/cluster-role-binding.yaml b/charts/kubelet-serving-cert-approver/templates/cluster-role-binding.yaml index 04f48ec..47fab8b 100644 --- a/charts/kubelet-serving-cert-approver/templates/cluster-role-binding.yaml +++ b/charts/kubelet-serving-cert-approver/templates/cluster-role-binding.yaml @@ -1,15 +1,14 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ .Release.Name }} + name: kubelet-serving-cert-approver namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: {{ .Release.Name }} + app.kubernetes.io/name: kubelet-serving-cert-approver app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: server - app.kubernetes.io/part-of: {{ .Release.Name }} - app.kubernetes.io/managed-by: helm + app.kubernetes.io/part-of: kubelet-serving-cert-approver roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/charts/kubelet-serving-cert-approver/templates/cluster-role.yaml b/charts/kubelet-serving-cert-approver/templates/cluster-role.yaml index 3c99585..744a52d 100644 --- a/charts/kubelet-serving-cert-approver/templates/cluster-role.yaml +++ b/charts/kubelet-serving-cert-approver/templates/cluster-role.yaml @@ -4,12 +4,11 @@ metadata: name: "certificates:{{ .Release.Name }}" namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: {{ .Release.Name }} + app.kubernetes.io/name: kubelet-serving-cert-approver app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: server - app.kubernetes.io/part-of: {{ .Release.Name }} - app.kubernetes.io/managed-by: helm + app.kubernetes.io/part-of: kubelet-serving-cert-approver rules: - apiGroups: - certificates.k8s.io @@ -47,12 +46,11 @@ metadata: name: "events:{{ .Release.Name }}" namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: {{ .Release.Name }} + app.kubernetes.io/name: kubelet-serving-cert-approver app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: server - app.kubernetes.io/part-of: {{ .Release.Name }} - app.kubernetes.io/managed-by: helm + app.kubernetes.io/part-of: kubelet-serving-cert-approverv rules: - apiGroups: - "" diff --git a/charts/kubelet-serving-cert-approver/templates/deployment.yaml b/charts/kubelet-serving-cert-approver/templates/deployment.yaml index f0689ba..5327ecc 100644 --- a/charts/kubelet-serving-cert-approver/templates/deployment.yaml +++ b/charts/kubelet-serving-cert-approver/templates/deployment.yaml @@ -1,15 +1,14 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ .Release.Name }} + name: kubelet-serving-cert-approver namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: {{ .Release.Name }} + app.kubernetes.io/name: kubelet-serving-cert-approver app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: server - app.kubernetes.io/part-of: {{ .Release.Name }} - app.kubernetes.io/managed-by: helm + app.kubernetes.io/part-of: kubelet-serving-cert-approver spec: revisionHistoryLimit: 3 replicas: {{ .Values.deployment.replicas }} @@ -17,13 +16,14 @@ spec: type: {{ .Values.deployment.strategy }} selector: matchLabels: + app.kubernetes.io/name: kubelet-serving-cert-approver app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: {{ .Release.Name }} + template: metadata: labels: + app.kubernetes.io/name: kubelet-serving-cert-approver app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: {{ .Release.Name }} spec: affinity: nodeAffinity: @@ -43,7 +43,7 @@ spec: - containerPort: 8080 name: health - containerPort: 9090 - name: metrics + name: metrics args: - serve env: @@ -52,7 +52,7 @@ spec: fieldRef: fieldPath: metadata.namespace resources: - {{- toYaml .Values.deployment.resources | nindent 12 }} + {{- toYaml .Values.deployment.resources | nindent 12 }} livenessProbe: httpGet: path: /healthz @@ -78,7 +78,7 @@ spec: runAsUser: 65534 seccompProfile: type: RuntimeDefault - serviceAccountName: {{ .Release.Name }} + serviceAccountName: kubelet-serving-cert-approver tolerations: - effect: NoSchedule key: node-role.kubernetes.io/master diff --git a/charts/kubelet-serving-cert-approver/templates/namespace.yaml b/charts/kubelet-serving-cert-approver/templates/namespace.yaml index 5ddca1e..18e109b 100644 --- a/charts/kubelet-serving-cert-approver/templates/namespace.yaml +++ b/charts/kubelet-serving-cert-approver/templates/namespace.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: Namespace metadata: - name: {{ .Release.Name }} + name: kubelet-serving-cert-approver labels: + app.kubernetes.io/name: kubelet-serving-cert-approver app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: {{ .Release.Name }} pod-security.kubernetes.io/audit: restricted pod-security.kubernetes.io/enforce: restricted pod-security.kubernetes.io/warn: restricted diff --git a/charts/kubelet-serving-cert-approver/templates/role-binding.yaml b/charts/kubelet-serving-cert-approver/templates/role-binding.yaml index 72bc269..94da549 100644 --- a/charts/kubelet-serving-cert-approver/templates/role-binding.yaml +++ b/charts/kubelet-serving-cert-approver/templates/role-binding.yaml @@ -4,17 +4,16 @@ metadata: name: "events:{{ .Release.Name }}" namespace: default labels: - app.kubernetes.io/name: {{ .Release.Name }} + app.kubernetes.io/name: kubelet-serving-cert-approver app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: server - app.kubernetes.io/part-of: {{ .Release.Name }} - app.kubernetes.io/managed-by: helm + app.kubernetes.io/part-of: kubelet-serving-cert-approver roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole name: "events:{{ .Release.Name }}" subjects: - kind: ServiceAccount - name: {{ .Release.Name }} + name: kubelet-serving-cert-approver namespace: {{ .Release.Name }} diff --git a/charts/kubelet-serving-cert-approver/templates/service-account.yaml b/charts/kubelet-serving-cert-approver/templates/service-account.yaml index 132ae90..710325e 100644 --- a/charts/kubelet-serving-cert-approver/templates/service-account.yaml +++ b/charts/kubelet-serving-cert-approver/templates/service-account.yaml @@ -1,12 +1,11 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ .Release.Name }} + name: kubelet-serving-cert-approver namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: {{ .Release.Name }} + app.kubernetes.io/name: kubelet-serving-cert-approver app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: server - app.kubernetes.io/part-of: {{ .Release.Name }} - app.kubernetes.io/managed-by: helm + app.kubernetes.io/part-of: kubelet-serving-cert-approver diff --git a/charts/kubelet-serving-cert-approver/templates/service.yaml b/charts/kubelet-serving-cert-approver/templates/service.yaml index e7c1f3d..f0fd270 100644 --- a/charts/kubelet-serving-cert-approver/templates/service.yaml +++ b/charts/kubelet-serving-cert-approver/templates/service.yaml @@ -1,15 +1,14 @@ apiVersion: v1 kind: Service metadata: - name: {{ .Release.Name }} + name: kubelet-serving-cert-approver namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: {{ .Release.Name }} + app.kubernetes.io/name: kubelet-serving-cert-approver app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: server - app.kubernetes.io/part-of: {{ .Release.Name }} - app.kubernetes.io/managed-by: helm + app.kubernetes.io/part-of: kubelet-serving-cert-approver spec: ports: - name: metrics @@ -17,5 +16,5 @@ spec: protocol: TCP targetPort: metrics selector: + app.kubernetes.io/name: kubelet-serving-cert-approver app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/name: {{ .Release.Name }}