chore(pmm): set instance name

Author: EamonZhang

addons/pmm/2.41/chart/pmm/templates/statefulset.yaml

@@ -64,19 +64,19 @@ spec:
             - name: GF_AUTH_GENERIC_OAUTH_CLIENT_ID
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.secret.name }}
+                  name: {{ include "pmm.fullname" . }}
                   key: GF_AUTH_GENERIC_OAUTH_CLIENT_ID
                   optional: true
             - name: GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.secret.name }}
+                  name: {{ include "pmm.fullname" . }}
                   key: GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET
                   optional: true
             - name: GF_SECURITY_ADMIN_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.secret.name }}
+                  name: {{ include "pmm.fullname" . }}
                   key: PMM_ADMIN_PASSWORD
                   optional: true
             - name: PMM_INSTALL_METHOD

addons/pmm/2.41/chart/pmm/values.yaml

@@ -66,9 +66,6 @@ readyProbeConf:
 ## @section PMM secrets
 ##
 secret:
-  ## @param secret.name Defines the name of the k8s secret that holds passwords and other secrets
-  ##
-  name: ""
   ## @param secret.annotations -- Secret annotations configuration
   annotations: {}
   ## @param secret.create If true then secret will be generated by Helm chart. Otherwise it is expected to be created by user.

addons/pmm/2.41/plans/standard-10/bind.yaml

@@ -11,18 +11,5 @@ credential:
       serviceRef:
         name: {{ include "pmm.fullname" . }}
         jsonpath: '{ .spec.clusterIP }'
-  - name: PASSWORD
-    valueFrom:
-      secretKeyRef:
-        name: {{ include "pmm.fullname" . }}
-        jsonpath: '{ .data.password }' 
-  - name: USERNAME
-    valueFrom:
-      secretKeyRef:
-        name: {{ include "pmm.fullname" . }}
-        jsonpath: '{ .data.username }' 
   - name: PORT
-    valueFrom:
-      secretKeyRef:
-        name: {{ include "pmm.fullname" . }}
-        jsonpath: '{ .data.portro }'
+    value: 80