mirror of
https://github.com/bitnami/charts.git
synced 2026-03-16 14:57:08 +08:00
adjust the naming style for resources to make them not pass the length (#13072)
Signed-off-by: cleverhu <shouping.hu@daocloud.io> Signed-off-by: cleverhu <shouping.hu@daocloud.io>
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
|
apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ printf "%s-controller" (include "common.names.fullname" .) }}
|
name: {{ printf "%s-controller" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
namespace: {{ include "common.names.namespace" . | quote }}
|
namespace: {{ include "common.names.namespace" . | quote }}
|
||||||
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
||||||
app.kubernetes.io/component: controller
|
app.kubernetes.io/component: controller
|
||||||
@@ -99,7 +99,7 @@ spec:
|
|||||||
- name: METALLB_ML_SECRET_NAME
|
- name: METALLB_ML_SECRET_NAME
|
||||||
value: {{ include "metallb.speaker.secretName" . }}
|
value: {{ include "metallb.speaker.secretName" . }}
|
||||||
- name: METALLB_DEPLOYMENT
|
- name: METALLB_DEPLOYMENT
|
||||||
value: {{ printf "%s-controller" (include "common.names.fullname" .) }}
|
value: {{ printf "%s-controller" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.controller.extraEnvVars }}
|
{{- if .Values.controller.extraEnvVars }}
|
||||||
{{- include "common.tplvalues.render" (dict "value" .Values.controller.extraEnvVars "context" $) | nindent 12 }}
|
{{- include "common.tplvalues.render" (dict "value" .Values.controller.extraEnvVars "context" $) | nindent 12 }}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
apiVersion: policy/v1beta1
|
apiVersion: policy/v1beta1
|
||||||
kind: PodSecurityPolicy
|
kind: PodSecurityPolicy
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ printf "%s-controller" (include "common.names.fullname" .) }}
|
name: {{ printf "%s-controller" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
namespace: {{ include "common.names.namespace" . | quote }}
|
namespace: {{ include "common.names.namespace" . | quote }}
|
||||||
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
||||||
app.kubernetes.io/component: controller
|
app.kubernetes.io/component: controller
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
|
apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ printf "%s:controller" (include "common.names.fullname" .) }}
|
name: {{ printf "%s:controller" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
namespace: {{ include "common.names.namespace" . | quote }}
|
namespace: {{ include "common.names.namespace" . | quote }}
|
||||||
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
||||||
app.kubernetes.io/component: controller
|
app.kubernetes.io/component: controller
|
||||||
@@ -38,7 +38,7 @@ rules:
|
|||||||
- apiGroups:
|
- apiGroups:
|
||||||
- policy
|
- policy
|
||||||
resourceNames:
|
resourceNames:
|
||||||
- {{ printf "%s-controller" (include "common.names.fullname" .) }}
|
- {{ printf "%s-controller" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
resources:
|
resources:
|
||||||
- podsecuritypolicies
|
- podsecuritypolicies
|
||||||
verbs:
|
verbs:
|
||||||
@@ -72,7 +72,7 @@ rules:
|
|||||||
apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
|
apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
|
||||||
kind: Role
|
kind: Role
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ printf "%s-controller" (include "common.names.fullname" .) }}
|
name: {{ printf "%s-controller" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
namespace: {{ include "common.names.namespace" . | quote }}
|
namespace: {{ include "common.names.namespace" . | quote }}
|
||||||
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
||||||
app.kubernetes.io/component: controller
|
app.kubernetes.io/component: controller
|
||||||
@@ -105,7 +105,7 @@ rules:
|
|||||||
resources:
|
resources:
|
||||||
- deployments
|
- deployments
|
||||||
resourceNames:
|
resourceNames:
|
||||||
- {{ printf "%s-controller" (include "common.names.fullname" .) }}
|
- {{ printf "%s-controller" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
verbs:
|
verbs:
|
||||||
- get
|
- get
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
@@ -178,7 +178,7 @@ rules:
|
|||||||
apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
|
apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ printf "%s:controller" (include "common.names.fullname" .) }}
|
name: {{ printf "%s:controller" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
namespace: {{ include "common.names.namespace" . | quote }}
|
namespace: {{ include "common.names.namespace" . | quote }}
|
||||||
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
||||||
app.kubernetes.io/component: controller
|
app.kubernetes.io/component: controller
|
||||||
@@ -195,12 +195,12 @@ subjects:
|
|||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
name: {{ printf "%s:controller" (include "common.names.fullname" .) }}
|
name: {{ printf "%s:controller" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
---
|
---
|
||||||
apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
|
apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
|
||||||
kind: RoleBinding
|
kind: RoleBinding
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ printf "%s-controller" (include "common.names.fullname" .) }}
|
name: {{ printf "%s-controller" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
namespace: {{ include "common.names.namespace" . | quote }}
|
namespace: {{ include "common.names.namespace" . | quote }}
|
||||||
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
||||||
app.kubernetes.io/component: controller
|
app.kubernetes.io/component: controller
|
||||||
@@ -217,5 +217,5 @@ subjects:
|
|||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
kind: Role
|
kind: Role
|
||||||
name: {{ printf "%s-controller" (include "common.names.fullname" .) }}
|
name: {{ printf "%s-controller" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Service
|
kind: Service
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ printf "%s-controller-metrics" (include "common.names.fullname" .) }}
|
name: {{ printf "%s-controller-metrics" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
namespace: {{ include "common.names.namespace" . | quote }}
|
namespace: {{ include "common.names.namespace" . | quote }}
|
||||||
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
||||||
app.kubernetes.io/component: controller
|
app.kubernetes.io/component: controller
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
apiVersion: monitoring.coreos.com/v1
|
apiVersion: monitoring.coreos.com/v1
|
||||||
kind: ServiceMonitor
|
kind: ServiceMonitor
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ printf "%s-controller" (include "common.names.fullname" .) }}
|
name: {{ printf "%s-controller" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
{{- if .Values.controller.metrics.serviceMonitor.namespace }}
|
{{- if .Values.controller.metrics.serviceMonitor.namespace }}
|
||||||
namespace: {{ .Values.controller.metrics.serviceMonitor.namespace | quote }}
|
namespace: {{ .Values.controller.metrics.serviceMonitor.namespace | quote }}
|
||||||
{{- else }}
|
{{- else }}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
kind: NetworkPolicy
|
kind: NetworkPolicy
|
||||||
apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }}
|
apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }}
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ printf "%s-controller" (include "common.names.fullname" .) }}
|
name: {{ printf "%s-controller" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
namespace: {{ include "common.names.namespace" . | quote }}
|
namespace: {{ include "common.names.namespace" . | quote }}
|
||||||
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
||||||
app.kubernetes.io/component: controller
|
app.kubernetes.io/component: controller
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
|
apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
|
||||||
kind: Role
|
kind: Role
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ printf "%s-config-watcher" (include "common.names.fullname" .) }}
|
name: {{ printf "%s-config-watcher" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
namespace: {{ include "common.names.namespace" . | quote }}
|
namespace: {{ include "common.names.namespace" . | quote }}
|
||||||
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
||||||
{{- if .Values.commonLabels }}
|
{{- if .Values.commonLabels }}
|
||||||
@@ -24,7 +24,7 @@ rules:
|
|||||||
apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
|
apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
|
||||||
kind: RoleBinding
|
kind: RoleBinding
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ printf "%s-config-watcher" (include "common.names.fullname" .) }}
|
name: {{ printf "%s-config-watcher" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
namespace: {{ include "common.names.namespace" . | quote }}
|
namespace: {{ include "common.names.namespace" . | quote }}
|
||||||
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
||||||
{{- if .Values.commonLabels }}
|
{{- if .Values.commonLabels }}
|
||||||
@@ -45,5 +45,5 @@ subjects:
|
|||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
kind: Role
|
kind: Role
|
||||||
name: {{ printf "%s-config-watcher" (include "common.names.fullname" .) }}
|
name: {{ printf "%s-config-watcher" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: DaemonSet
|
kind: DaemonSet
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ printf "%s-speaker" (include "common.names.fullname" .) }}
|
name: {{ printf "%s-speaker" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
namespace: {{ include "common.names.namespace" . | quote }}
|
namespace: {{ include "common.names.namespace" . | quote }}
|
||||||
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
||||||
app.kubernetes.io/component: speaker
|
app.kubernetes.io/component: speaker
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
apiVersion: policy/v1beta1
|
apiVersion: policy/v1beta1
|
||||||
kind: PodSecurityPolicy
|
kind: PodSecurityPolicy
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ printf "%s-speaker" (include "common.names.fullname" .) }}
|
name: {{ printf "%s-speaker" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
namespace: {{ include "common.names.namespace" . | quote }}
|
namespace: {{ include "common.names.namespace" . | quote }}
|
||||||
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
||||||
app.kubernetes.io/component: speaker
|
app.kubernetes.io/component: speaker
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
|
apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ printf "%s-speaker" (include "common.names.fullname" .) }}
|
name: {{ printf "%s-speaker" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
namespace: {{ include "common.names.namespace" . | quote }}
|
namespace: {{ include "common.names.namespace" . | quote }}
|
||||||
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
||||||
app.kubernetes.io/component: speaker
|
app.kubernetes.io/component: speaker
|
||||||
@@ -33,7 +33,7 @@ rules:
|
|||||||
- apiGroups:
|
- apiGroups:
|
||||||
- policy
|
- policy
|
||||||
resourceNames:
|
resourceNames:
|
||||||
- {{ printf "%s-speaker" (include "common.names.fullname" .) }}
|
- {{ printf "%s-speaker" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
resources:
|
resources:
|
||||||
- podsecuritypolicies
|
- podsecuritypolicies
|
||||||
verbs:
|
verbs:
|
||||||
@@ -50,7 +50,7 @@ rules:
|
|||||||
apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
|
apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
|
||||||
kind: Role
|
kind: Role
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ printf "%s-pod-lister" (include "common.names.fullname" .) }}
|
name: {{ printf "%s-pod-lister" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
namespace: {{ include "common.names.namespace" . | quote }}
|
namespace: {{ include "common.names.namespace" . | quote }}
|
||||||
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
||||||
app.kubernetes.io/component: speaker
|
app.kubernetes.io/component: speaker
|
||||||
@@ -135,7 +135,7 @@ rules:
|
|||||||
apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
|
apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ printf "%s-speaker" (include "common.names.fullname" .) }}
|
name: {{ printf "%s-speaker" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
namespace: {{ include "common.names.namespace" . | quote }}
|
namespace: {{ include "common.names.namespace" . | quote }}
|
||||||
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
||||||
app.kubernetes.io/component: speaker
|
app.kubernetes.io/component: speaker
|
||||||
@@ -152,12 +152,12 @@ subjects:
|
|||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
kind: ClusterRole
|
kind: ClusterRole
|
||||||
name: {{ printf "%s-speaker" (include "common.names.fullname" .) }}
|
name: {{ printf "%s-speaker" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
---
|
---
|
||||||
apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
|
apiVersion: {{ include "common.capabilities.rbac.apiVersion" . }}
|
||||||
kind: RoleBinding
|
kind: RoleBinding
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ printf "%s-pod-lister" (include "common.names.fullname" .) }}
|
name: {{ printf "%s-pod-lister" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
namespace: {{ include "common.names.namespace" . | quote }}
|
namespace: {{ include "common.names.namespace" . | quote }}
|
||||||
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
||||||
app.kubernetes.io/component: speaker
|
app.kubernetes.io/component: speaker
|
||||||
@@ -170,7 +170,7 @@ metadata:
|
|||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
kind: Role
|
kind: Role
|
||||||
name: {{ printf "%s-pod-lister" (include "common.names.fullname" .) }}
|
name: {{ printf "%s-pod-lister" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
subjects:
|
subjects:
|
||||||
- kind: ServiceAccount
|
- kind: ServiceAccount
|
||||||
name: {{ include "metallb.speaker.serviceAccountName" . }}
|
name: {{ include "metallb.speaker.serviceAccountName" . }}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Service
|
kind: Service
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ printf "%s-speaker-metrics" (include "common.names.fullname" .) }}
|
name: {{ printf "%s-speaker-metrics" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
namespace: {{ include "common.names.namespace" . | quote }}
|
namespace: {{ include "common.names.namespace" . | quote }}
|
||||||
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
labels: {{- include "common.labels.standard" . | nindent 4 }}
|
||||||
app.kubernetes.io/component: speaker
|
app.kubernetes.io/component: speaker
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
apiVersion: monitoring.coreos.com/v1
|
apiVersion: monitoring.coreos.com/v1
|
||||||
kind: ServiceMonitor
|
kind: ServiceMonitor
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ printf "%s-speaker" (include "common.names.fullname" .) }}
|
name: {{ printf "%s-speaker" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
|
||||||
{{- if .Values.speaker.metrics.serviceMonitor.namespace }}
|
{{- if .Values.speaker.metrics.serviceMonitor.namespace }}
|
||||||
namespace: {{ .Values.speaker.metrics.serviceMonitor.namespace | quote }}
|
namespace: {{ .Values.speaker.metrics.serviceMonitor.namespace | quote }}
|
||||||
{{- else }}
|
{{- else }}
|
||||||
|
|||||||
Reference in New Issue
Block a user