Skip to content

Commit

Permalink
Trunc the resource name in swck's helm chart to no more than 63 chara…
Browse files Browse the repository at this point in the history
…cters.

Signed-off-by: dashanji <dashanjic@gmail.com>
  • Loading branch information
dashanji committed Apr 24, 2023
1 parent 670d705 commit 069fe34
Show file tree
Hide file tree
Showing 13 changed files with 80 additions and 79 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Release Notes.

- Add helm chart for swck v0.7.0.
- Add `pprof` port export in satellite.
- Trunc the resource name in swck's helm chart to no more than 63 characters.

4.4.0
------------------
Expand Down
2 changes: 1 addition & 1 deletion chart/adapter/templates/apiservice.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
groupPriorityMinimum: 100
insecureSkipTLSVerify: true
service:
name: {{ include "adapter.fullname" . }}-custom-metrics-apiserver
name: {{ include "adapter.fullname" . | trunc (int (sub 63 (len "-custom-metrics-apiserver"))) | printf "%s-custom-metrics-apiserver" }}
namespace: {{ .Release.Namespace }}
version: v1beta1
versionPriority: 100
8 changes: 4 additions & 4 deletions chart/adapter/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@ apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app: {{ include "adapter.fullname" . }}-custom-metrics-apiserver
app: {{ include "adapter.fullname" . | trunc (int (sub 63 (len "-custom-metrics-apiserver"))) | printf "%s-custom-metrics-apiserver" }}
{{- include "adapter.labels" . | nindent 4 }}
name: {{ include "adapter.fullname" . }}-adapter
name: {{ include "adapter.fullname" . | trunc (int (sub 63 (len "-adapter"))) | printf "%s-adapter" }}
namespace: {{ .Release.Namespace }}
spec:
replicas: {{ .Values.replicas }}
selector:
matchLabels:
app: {{ include "adapter.fullname" . }}-custom-metrics-apiserver
app: {{ include "adapter.fullname" . | trunc (int (sub 63 (len "-custom-metrics-apiserver"))) | printf "%s-custom-metrics-apiserver" }}
{{- include "adapter.selectorLabels" . | nindent 6 }}
template:
metadata:
labels:
app: {{ include "adapter.fullname" . }}-custom-metrics-apiserver
app: {{ include "adapter.fullname" . | trunc (int (sub 63 (len "-custom-metrics-apiserver"))) | printf "%s-custom-metrics-apiserver" }}
{{- include "adapter.selectorLabels" . | nindent 8 }}
name: custom-metrics-apiserver
spec:
Expand Down
16 changes: 8 additions & 8 deletions chart/adapter/templates/rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ metadata:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: {{ include "adapter.fullname" . }}-custom-metrics-resource-reader
name: {{ include "adapter.fullname" . | trunc (int (sub 63 (len "-custom-metrics-resource-reader"))) | printf "%s-custom-metrics-resource-reader" }}
rules:
- apiGroups:
- ""
Expand All @@ -38,7 +38,7 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: {{ include "adapter.fullname" . }}-custom-metrics-server-resources
name: {{ include "adapter.fullname" . | trunc (int (sub 63 (len "-custom-metrics-server-resources"))) | printf "%s-custom-metrics-server-resources" }}
rules:
- apiGroups:
- custom.metrics.k8s.io
Expand All @@ -51,7 +51,7 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: {{ include "adapter.fullname" . }}-custom-metrics-auth-reader
name: {{ include "adapter.fullname" . | trunc (int (sub 63 (len "-custom-metrics-auth-reader"))) | printf "%s-custom-metrics-auth-reader" }}
namespace: kube-system
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -65,11 +65,11 @@ subjects:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: {{ include "adapter.fullname" . }}-custom-metrics-hpa-controller
name: {{ include "adapter.fullname" . | trunc (int (sub 63 (len "-custom-metrics-hpa-controller"))) | printf "%s-custom-metrics-hpa-controller" }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: {{ include "adapter.fullname" . }}-custom-metrics-server-resources
name: {{ include "adapter.fullname" . | trunc (int (sub 63 (len "-custom-metrics-server-resources"))) | printf "%s-custom-metrics-server-resources" }}
subjects:
- kind: ServiceAccount
name: horizontal-pod-autoscaler
Expand All @@ -78,11 +78,11 @@ subjects:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: {{ include "adapter.fullname" . }}-custom-metrics-resource-reader
name: {{ include "adapter.fullname" . | trunc (int (sub 63 (len "-custom-metrics-resource-reader"))) | printf "%s-custom-metrics-resource-reader" }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: {{ include "adapter.fullname" . }}-custom-metrics-resource-reader
name: {{ include "adapter.fullname" . | trunc (int (sub 63 (len "-custom-metrics-resource-reader"))) | printf "%s-custom-metrics-resource-reader" }}
subjects:
- kind: ServiceAccount
name: {{ .Values.serviceAccountName }}
Expand All @@ -91,7 +91,7 @@ subjects:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: {{ include "adapter.fullname" . }}-custom-metrics-system:auth-delegator
name: {{ include "adapter.fullname" . | trunc (int (sub 63 (len "-custom-metrics-system:auth-delegator"))) | printf "%s-custom-metrics-system:auth-delegator" }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand Down
4 changes: 2 additions & 2 deletions chart/adapter/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
apiVersion: v1
kind: Service
metadata:
name: {{ include "adapter.fullname" . }}-custom-metrics-apiserver
name: {{ include "adapter.fullname" . | trunc (int (sub 63 (len "-custom-metrics-apiserver"))) | printf "%s-custom-metrics-apiserver" }}
namespace: {{ .Release.Namespace }}
spec:
ports:
- name: https
port: 443
targetPort: {{ .Values.service.port }}
selector:
app: {{ include "adapter.fullname" . }}-custom-metrics-apiserver
app: {{ include "adapter.fullname" . | trunc (int (sub 63 (len "-custom-metrics-apiserver"))) | printf "%s-custom-metrics-apiserver" }}
12 changes: 6 additions & 6 deletions chart/operator/templates/cert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,24 @@
apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
name: {{ include "operator.fullname" . }}-serving-cert
name: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-serving-cert"))) | printf "%s-serving-cert" }}
namespace: {{ .Release.Namespace }}
annotations:
"helm.sh/hook": post-install,post-upgrade
"helm.sh/hook-weight": "2"
spec:
dnsNames:
- {{ include "operator.fullname" . }}-webhook-service.{{ .Release.Namespace }}.svc
- {{ include "operator.fullname" . }}-webhook-service.{{ .Release.Namespace }}.svc.cluster.local
- {{ include "operator.fullname" . | trunc (int (sub 63 (len "-webhook-service"))) | printf "%s-webhook-service" }}.{{ .Release.Namespace }}.svc
- {{ include "operator.fullname" . | trunc (int (sub 63 (len "-webhook-service"))) | printf "%s-webhook-service" }}.{{ .Release.Namespace }}.svc.cluster.local
issuerRef:
kind: Issuer
name: {{ include "operator.fullname" . }}-selfsigned-issuer
secretName: {{ include "operator.fullname" . }}-controller-manager-cert
name: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-selfsigned-issuer"))) | printf "%s-selfsigned-issuer" }}
secretName: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-controller-manager-cert"))) | printf "%s-controller-manager-cert" }}
---
apiVersion: cert-manager.io/v1
kind: Issuer
metadata:
name: {{ include "operator.fullname" . }}-selfsigned-issuer
name: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-selfsigned-issuer"))) | printf "%s-selfsigned-issuer" }}
namespace: {{ .Release.Namespace }}
annotations:
"helm.sh/hook": post-install,post-upgrade
Expand Down
2 changes: 1 addition & 1 deletion chart/operator/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

kind: ConfigMap
metadata:
name: {{ include "operator.fullname" . }}-manager-config
name: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-manager-config"))) | printf "%s-manager-config" }}
namespace: {{ .Release.Namespace }}
apiVersion: v1
data:
Expand Down
14 changes: 7 additions & 7 deletions chart/operator/templates/crds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "operator.fullname" . }}-serving-cert
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "operator.fullname" . | trunc (int (sub 63 (len "-serving-cert"))) | printf "%s-serving-cert" }}
controller-gen.kubebuilder.io/version: v0.7.0
name: fetchers.operator.skywalking.apache.org
spec:
Expand Down Expand Up @@ -130,7 +130,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "operator.fullname" . }}-serving-cert
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "operator.fullname" . | trunc (int (sub 63 (len "-serving-cert"))) | printf "%s-serving-cert" }}
controller-gen.kubebuilder.io/version: v0.7.0
name: javaagents.operator.skywalking.apache.org
spec:
Expand Down Expand Up @@ -236,7 +236,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "operator.fullname" . }}-serving-cert
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "operator.fullname" . | trunc (int (sub 63 (len "-serving-cert"))) | printf "%s-serving-cert" }}
controller-gen.kubebuilder.io/version: v0.7.0
name: oapserverconfigs.operator.skywalking.apache.org
spec:
Expand Down Expand Up @@ -549,7 +549,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "operator.fullname" . }}-serving-cert
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "operator.fullname" . | trunc (int (sub 63 (len "-serving-cert"))) | printf "%s-serving-cert" }}
controller-gen.kubebuilder.io/version: v0.7.0
name: oapservers.operator.skywalking.apache.org
spec:
Expand Down Expand Up @@ -1117,7 +1117,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "operator.fullname" . }}-serving-cert
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "operator.fullname" . | trunc (int (sub 63 (len "-serving-cert"))) | printf "%s-serving-cert" }}
controller-gen.kubebuilder.io/version: v0.7.0
name: satellites.operator.skywalking.apache.org
spec:
Expand Down Expand Up @@ -1462,7 +1462,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "operator.fullname" . }}-serving-cert
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "operator.fullname" . | trunc (int (sub 63 (len "-serving-cert"))) | printf "%s-serving-cert" }}
controller-gen.kubebuilder.io/version: v0.7.0
name: storages.operator.skywalking.apache.org
spec:
Expand Down Expand Up @@ -1980,7 +1980,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "operator.fullname" . }}-serving-cert
cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "operator.fullname" . | trunc (int (sub 63 (len "-serving-cert"))) | printf "%s-serving-cert" }}
controller-gen.kubebuilder.io/version: v0.7.0
name: uis.operator.skywalking.apache.org
spec:
Expand Down
14 changes: 7 additions & 7 deletions chart/operator/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "operator.fullname" . }}-operator
name: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-operator"))) | printf "%s-operator" }}
namespace: {{ .Release.Namespace }}
labels:
control-plane: {{ include "operator.fullname" . }}-controller-manager
control-plane: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-controller-manager"))) | printf "%s-controller-manager" }}
{{- include "operator.labels" . | nindent 4 }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
control-plane: {{ include "operator.fullname" . }}-controller-manager
control-plane: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-controller-manager"))) | printf "%s-controller-manager" }}
{{- include "operator.selectorLabels" . | nindent 6 }}
template:
metadata:
labels:
control-plane: {{ include "operator.fullname" . }}-controller-manager
control-plane: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-controller-manager"))) | printf "%s-controller-manager" }}
{{- include "operator.selectorLabels" . | nindent 8 }}
spec:
containers:
Expand Down Expand Up @@ -89,17 +89,17 @@ spec:
{{- end }}
securityContext:
runAsNonRoot: true
serviceAccountName: {{ include "operator.fullname" . }}-controller-manager
serviceAccountName: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-controller-manager"))) | printf "%s-controller-manager" }}
terminationGracePeriodSeconds: 10
volumes:
{{- if .Values.webhook.enabled }}
- name: cert
secret:
defaultMode: 420
secretName: {{ include "operator.fullname" . }}-controller-manager-cert
secretName: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-controller-manager-cert"))) | printf "%s-controller-manager-cert" }}
{{- end }}
- configMap:
name: {{ include "operator.fullname" . }}-manager-config
name: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-manager-config"))) | printf "%s-manager-config" }}
name: manager-config
{{- with .Values.affinity }}
affinity:
Expand Down
2 changes: 1 addition & 1 deletion chart/operator/templates/java-agent-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ include "operator.fullname" . }}-java-agent-configmap
name: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-java-agent-configmap"))) | printf "%s-java-agent-configmap" }}
namespace: {{ .Release.Namespace }}
data:
agent.config: |-
Expand Down
28 changes: 14 additions & 14 deletions chart/operator/templates/rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "operator.fullname" . }}-controller-manager
name: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-controller-manager"))) | printf "%s-controller-manager" }}
namespace: {{ .Release.Namespace }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: {{ include "operator.fullname" . }}-leader-election-role
name: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-leader-election-role"))) | printf "%s-leader-election-role" }}
namespace: {{ .Release.Namespace }}
rules:
- apiGroups:
Expand Down Expand Up @@ -61,7 +61,7 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: {{ include "operator.fullname" . }}-manager-role
name: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-manager-role"))) | printf "%s-manager-role" }}
rules:
- apiGroups:
- certificates.k8s.io
Expand Down Expand Up @@ -400,7 +400,7 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: {{ include "operator.fullname" . }}-metrics-reader
name: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-metrics-reader"))) | printf "%s-metrics-reader" }}
rules:
- nonResourceURLs:
- /metrics
Expand All @@ -410,7 +410,7 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: {{ include "operator.fullname" . }}-proxy-role
name: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-proxy-role"))) | printf "%s-proxy-role" }}
rules:
- apiGroups:
- authentication.k8s.io
Expand All @@ -428,39 +428,39 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: {{ include "operator.fullname" . }}-leader-election-rolebinding
name: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-leader-election-role"))) | printf "%s-leader-election-role" }} binding
namespace: {{ .Release.Namespace }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: {{ include "operator.fullname" . }}-leader-election-role
name: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-leader-election-role"))) | printf "%s-leader-election-role" }}
subjects:
- kind: ServiceAccount
name: {{ include "operator.fullname" . }}-controller-manager
name: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-controller-manager"))) | printf "%s-controller-manager" }}
namespace: {{ .Release.Namespace }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: {{ include "operator.fullname" . }}-manager-rolebinding
name: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-manager-role"))) | printf "%s-manager-role" }} binding
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: {{ include "operator.fullname" . }}-manager-role
name: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-manager-role"))) | printf "%s-manager-role" }}
subjects:
- kind: ServiceAccount
name: {{ include "operator.fullname" . }}-controller-manager
name: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-controller-manager"))) | printf "%s-controller-manager" }}
namespace: {{ .Release.Namespace }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: {{ include "operator.fullname" . }}-proxy-rolebinding
name: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-proxy-rolebinding"))) | printf "%s-proxy-rolebinding" }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: {{ include "operator.fullname" . }}-proxy-role
name: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-proxy-role"))) | printf "%s-proxy-role" }}
subjects:
- kind: ServiceAccount
name: {{ include "operator.fullname" . }}-controller-manager
name: {{ include "operator.fullname" . | trunc (int (sub 63 (len "-controller-manager"))) | printf "%s-controller-manager" }}
namespace: {{ .Release.Namespace }}
Loading

0 comments on commit 069fe34

Please sign in to comment.