apply suggestions

Author: Revolyssup

charts/templates/cluster_role.yaml

@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: api7-ingress-manager-role
+  name: {{ .Release.Name }}-api7-ingress-manager-role
 rules:
 - apiGroups:
   - ""
@@ -106,7 +106,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: api7-ingress-metrics-auth-role
+  name: {{ .Release.Name }}-api7-ingress-metrics-auth-role
 rules:
 - apiGroups:
   - authentication.k8s.io
@@ -124,7 +124,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: api7-ingress-metrics-reader
+  name: {{ .Release.Name }}-api7-ingress-metrics-reader
 rules:
 - nonResourceURLs:
   - /metrics

charts/templates/cluster_role_binding.yaml

@@ -3,25 +3,25 @@ kind: ClusterRoleBinding
 metadata:
   labels:
     app.kubernetes.io/name: api7-ingress
-  name: api7-ingress-manager-rolebinding
+  name: {{ .Release.Name }}-{{ .Release.Name }}-api7-ingress-manager-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: api7-ingress-manager-role
+  name: {{ .Release.Name }}-api7-ingress-manager-role
 subjects:
 - kind: ServiceAccount
   name: {{ .Release.Name }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: api7-ingress-metrics-auth-rolebinding
+  name: {{ .Release.Name }}-api7-ingress-metrics-auth-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: api7-ingress-metrics-auth-role
+  name: {{ .Release.Name }}-api7-ingress-metrics-auth-role
 subjects:
 - kind: ServiceAccount
   name: {{ .Release.Name }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}

charts/templates/configmap.yaml

@@ -1,11 +1,11 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: ingress-config
-  namespace: {{ .Values.namespace }}
+  name: {{ .Release.Name }}-ingress-config
+  namespace: {{ .Release.Namespace }}
 data:
   config.yaml: |
-    log_level: "debug"
+    log_level: "{{ .Values.logLevel | default "debug" }}"
 
     controller_name: {{ .Values.controllerName | default "gateway.api7.io/api7-ingress-controller" }}
 
@@ -14,9 +14,9 @@ data:
     gateway_configs:
     - name: "api7ee"
       control_plane:
-        admin_key: "{{ .Values.admin.key }}"
+        admin_key: "{{ required "Provide a valid admin key!" .Values.admin.key }}"
         endpoints:
-          - "{{ .Values.admin.adminEndpoint }}"
-        tls_verify: {{ .Values.admin.adminTLSVerify }}
+          - "{{ .Values.admin.endpoint }}"
+        tls_verify: {{ .Values.admin.tlsVerify }}
       addresses:                      # record the status address of the gateway-api gateway
       - "{{ .Values.statusAddress }}"

charts/templates/deployment.yaml

@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/name: api7-ingress
     control-plane: controller-manager
   name: {{ .Release.Name }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: {{ .Values.replicas }}
   selector:
@@ -19,9 +19,9 @@ spec:
         control-plane: controller-manager
     spec:
       containers:
-      - image: api7/api7-ingress-controller:dev
+      - image: "api7/api7-ingress-controller:{{ .Values.imageTag }}"
         volumeMounts:
-        - name: ingress-config
+        - name: {{ .Release.Name }}-ingress-config
           mountPath: /app/conf/config.yaml
           subPath: config.yaml
         livenessProbe:
@@ -50,9 +50,9 @@ spec:
             drop:
             - ALL
       volumes:
-      - name: ingress-config
+      - name: {{ .Release.Name }}-ingress-config
         configMap:
-          name: ingress-config
+          name: {{ .Release.Name }}-ingress-config
       securityContext:
         runAsNonRoot: true
       serviceAccountName: {{ .Release.Name }}

charts/templates/role.yaml

@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/name: api7-ingress
   name: api7-ingress-leader-election-role
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
 rules:
 - apiGroups:
   - ""

charts/templates/role_binding.yaml

@@ -4,12 +4,12 @@ metadata:
   labels:
     app.kubernetes.io/name: api7-ingress
   name: api7-ingress-leader-election-rolebinding
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: api7-ingress-leader-election-role
 subjects:
 - kind: ServiceAccount
   name: {{ .Release.Name }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}

charts/templates/service-account.yaml

@@ -4,4 +4,4 @@ metadata:
   labels:
     app.kubernetes.io/name: api7-ingress
   name: {{ .Release.Name }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}

charts/templates/service.yaml

@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/name: api7-ingress
     control-plane: controller-manager
   name: {{ .Release.Name }}-metrics-service
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
 spec:
   ports:
   - name: https

charts/values.yaml

@@ -1,8 +1,9 @@
 controllerName: gateway.api7.io/api7-ingress-controller
 replicas: 1
 admin:
-  key: '' # Pass the admin key generated for the ingress gateway group
-  adminTLSVerify: false
-  adminEndpoint: https://api7ee3-dashboard.api7-ee-e2e:7443/apisix/admin
-namespace: ingress-apisix
+  key: 'a7adm-e8J8XAu6FX3W9LD1f84dg3JCpTIj22e733p5qLZ8NY304ksZIz-1ff6f82c482a41f6b8d86af79d3a1c20' # Pass the admin key generated for the ingress gateway group
+  tlsVerify: false
+  endpoint: https://api7ee3-dashboard.api7-ee-e2e:7443/apisix/admin
 statusAddress: ''
+logLevel: debug
+imageTag: dev