fix: change charts to chart for all yaml

Signed-off-by: shilinlee <[email protected]>
openGemini · Nov 6, 2023 · 534749f · 534749f
1 parent c8059da
commit 534749f
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 34 deletions.
diff --git a/charts/templates/deployment.yaml b/charts/templates/deployment.yaml
@@ -1,24 +1,24 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "charts.fullname" . }}-controller-manager
+  name: {{ include "chart.fullname" . }}-controller-manager
   labels:
     app.kubernetes.io/component: manager
     app.kubernetes.io/created-by: opengemini-operator
     app.kubernetes.io/part-of: opengemini-operator
     control-plane: controller-manager
-  {{- include "charts.labels" . | nindent 4 }}
+  {{- include "chart.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.controllerManager.replicas }}
   selector:
     matchLabels:
       control-plane: controller-manager
-    {{- include "charts.selectorLabels" . | nindent 6 }}
+    {{- include "chart.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
         control-plane: controller-manager
-      {{- include "charts.selectorLabels" . | nindent 8 }}
+      {{- include "chart.selectorLabels" . | nindent 8 }}
       annotations:
         kubectl.kubernetes.io/default-container: manager
     spec:
@@ -94,5 +94,5 @@ spec:
           - ALL        
       securityContext:
         runAsNonRoot: true
-      serviceAccountName: {{ include "charts.fullname" . }}-controller-manager
+      serviceAccountName: {{ include "chart.fullname" . }}-controller-manager
       terminationGracePeriodSeconds: 10
diff --git a/charts/templates/geminicluster-crd.yaml b/charts/templates/geminicluster-crd.yaml
@@ -5,7 +5,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.10.0
   labels:
-  {{- include "charts.labels" . | nindent 4 }}
+  {{- include "chart.labels" . | nindent 4 }}
 spec:
   group: opengemini-operator.opengemini.org
   names:

diff --git a/charts/templates/leader-election-rbac.yaml b/charts/templates/leader-election-rbac.yaml
@@ -1,12 +1,12 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: {{ include "charts.fullname" . }}-leader-election-role
+  name: {{ include "chart.fullname" . }}-leader-election-role
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: opengemini-operator
     app.kubernetes.io/part-of: opengemini-operator
-  {{- include "charts.labels" . | nindent 4 }}
+  {{- include "chart.labels" . | nindent 4 }}
 rules:
 - apiGroups:
   - ""
@@ -43,17 +43,17 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ include "charts.fullname" . }}-leader-election-rolebinding
+  name: {{ include "chart.fullname" . }}-leader-election-rolebinding
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: opengemini-operator
     app.kubernetes.io/part-of: opengemini-operator
-  {{- include "charts.labels" . | nindent 4 }}
+  {{- include "chart.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: '{{ include "charts.fullname" . }}-leader-election-role'
+  name: '{{ include "chart.fullname" . }}-leader-election-role'
 subjects:
 - kind: ServiceAccount
-  name: '{{ include "charts.fullname" . }}-controller-manager'
+  name: '{{ include "chart.fullname" . }}-controller-manager'
   namespace: '{{ .Release.Namespace }}'
diff --git a/charts/templates/manager-rbac.yaml b/charts/templates/manager-rbac.yaml
@@ -1,9 +1,9 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ include "charts.fullname" . }}-manager-role
+  name: {{ include "chart.fullname" . }}-manager-role
   labels:
-  {{- include "charts.labels" . | nindent 4 }}
+  {{- include "chart.labels" . | nindent 4 }}
 rules:
 - apiGroups:
   - ""
@@ -94,17 +94,17 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ include "charts.fullname" . }}-manager-rolebinding
+  name: {{ include "chart.fullname" . }}-manager-rolebinding
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: opengemini-operator
     app.kubernetes.io/part-of: opengemini-operator
-  {{- include "charts.labels" . | nindent 4 }}
+  {{- include "chart.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: '{{ include "charts.fullname" . }}-manager-role'
+  name: '{{ include "chart.fullname" . }}-manager-role'
 subjects:
 - kind: ServiceAccount
-  name: '{{ include "charts.fullname" . }}-controller-manager'
+  name: '{{ include "chart.fullname" . }}-controller-manager'
   namespace: '{{ .Release.Namespace }}'
diff --git a/charts/templates/metrics-reader-rbac.yaml b/charts/templates/metrics-reader-rbac.yaml
@@ -1,12 +1,12 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ include "charts.fullname" . }}-metrics-reader
+  name: {{ include "chart.fullname" . }}-metrics-reader
   labels:
     app.kubernetes.io/component: kube-rbac-proxy
     app.kubernetes.io/created-by: opengemini-operator
     app.kubernetes.io/part-of: opengemini-operator
-  {{- include "charts.labels" . | nindent 4 }}
+  {{- include "chart.labels" . | nindent 4 }}
 rules:
 - nonResourceURLs:
   - /metrics

diff --git a/charts/templates/metrics-service.yaml b/charts/templates/metrics-service.yaml
@@ -1,18 +1,18 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "charts.fullname" . }}-controller-manager-metrics-service
+  name: {{ include "chart.fullname" . }}-controller-manager-metrics-service
   labels:
     app.kubernetes.io/component: kube-rbac-proxy
     app.kubernetes.io/created-by: opengemini-operator
     app.kubernetes.io/part-of: opengemini-operator
     control-plane: controller-manager
-  {{- include "charts.labels" . | nindent 4 }}
+  {{- include "chart.labels" . | nindent 4 }}
 spec:
   type: ClusterIP
   selector:
     control-plane: controller-manager
-  {{- include "charts.selectorLabels" . | nindent 4 }}
+  {{- include "chart.selectorLabels" . | nindent 4 }}
   ports:
   - name: https
     port: 8443

diff --git a/charts/templates/proxy-rbac.yaml b/charts/templates/proxy-rbac.yaml
@@ -1,12 +1,12 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ include "charts.fullname" . }}-proxy-role
+  name: {{ include "chart.fullname" . }}-proxy-role
   labels:
     app.kubernetes.io/component: kube-rbac-proxy
     app.kubernetes.io/created-by: opengemini-operator
     app.kubernetes.io/part-of: opengemini-operator
-  {{- include "charts.labels" . | nindent 4 }}
+  {{- include "chart.labels" . | nindent 4 }}
 rules:
 - apiGroups:
   - authentication.k8s.io
@@ -24,17 +24,17 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ include "charts.fullname" . }}-proxy-rolebinding
+  name: {{ include "chart.fullname" . }}-proxy-rolebinding
   labels:
     app.kubernetes.io/component: kube-rbac-proxy
     app.kubernetes.io/created-by: opengemini-operator
     app.kubernetes.io/part-of: opengemini-operator
-  {{- include "charts.labels" . | nindent 4 }}
+  {{- include "chart.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: '{{ include "charts.fullname" . }}-proxy-role'
+  name: '{{ include "chart.fullname" . }}-proxy-role'
 subjects:
 - kind: ServiceAccount
-  name: '{{ include "charts.fullname" . }}-controller-manager'
+  name: '{{ include "chart.fullname" . }}-controller-manager'
   namespace: '{{ .Release.Namespace }}'
diff --git a/charts/templates/serviceaccount.yaml b/charts/templates/serviceaccount.yaml
@@ -1,11 +1,11 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "charts.fullname" . }}-controller-manager
+  name: {{ include "chart.fullname" . }}-controller-manager
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: opengemini-operator
     app.kubernetes.io/part-of: opengemini-operator
-  {{- include "charts.labels" . | nindent 4 }}
+  {{- include "chart.labels" . | nindent 4 }}
   annotations:
     {{- toYaml .Values.controllerManager.serviceAccount.annotations | nindent 4 }}
diff --git a/go.mod b/go.mod
@@ -8,7 +8,6 @@ require (
 	github.com/onsi/ginkgo/v2 v2.1.4
 	github.com/onsi/gomega v1.19.0
 	github.com/stretchr/testify v1.7.0
-	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63
 	k8s.io/api v0.25.0
 	k8s.io/apimachinery v0.25.0
 	k8s.io/client-go v0.25.0

diff --git a/go.sum b/go.sum
@@ -375,8 +375,6 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ=
-golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=