chore(addons): fix plan binds

Author: EamonZhang

addons/cloudbeaver/23/chart/cloudbeaver/values.yaml

@@ -358,7 +358,7 @@ persistence:
     - ReadWriteOnce
   ## @param persistence.size PVC Storage Request
   ##
-  size: 1Gi
+  size: 10Gi
   ## @param persistence.annotations Annotations for the PVC
   ##
   annotations: {}

addons/cloudbeaver/23/meta.yaml

@@ -1,5 +1,5 @@
 name: cloudbeaver
-version: 7.0
+version: 23
 id: b7cb26a4-b258-445c-860b-a664239a67f8
 description: "cloudbeaver"
 displayName: "cloudbeaver"
@@ -8,13 +8,13 @@ metadata:
   provider:
     name: drycc
     supportURL: http://cloudbeaver.io/
-  documentationURL: https://github.com/drycc-addons/drycc-docker-redis
+  documentationURL: https://github.com/drycc-addons/
 tags: cloudbeaver
 bindable: true
 instances_retrievable: true
 bindings_retrievable: true
-plan_updateable: true
+plan_updateable: false
 allow_parameters:
-- name: "networkPolicy.allowNamespaces"
-  description: "networkPolicy allowNamespaces config for values.yaml"
+- name: "service.type"
+  description: "service type config for values.yaml"
 archive: false

addons/grafana/10/chart/grafana/values.yaml

@@ -575,7 +575,7 @@ serviceAccount:
 service:
   ## @param service.type Kubernetes Service type
   ##
-  type: LoadBalancer
+  type: ClusterIP
   ## @param service.clusterIP Grafana service Cluster IP
   ## e.g.:
   ## clusterIP: None

addons/grafana/10/meta.yaml

@@ -0,0 +1,20 @@
+name: Grafana
+version: 7.0
+id: fff5b6c7-ed85-429b-8265-493e40cc53c7
+description: "grafana"
+displayName: "grafana"
+metadata:
+  displayName: "grafana"
+  provider:
+    name: drycc
+    supportURL: http://grafana.io/
+  documentationURL: https://github.com/drycc-addons/
+tags: cloudbeaver
+bindable: true
+instances_retrievable: true
+bindings_retrievable: true
+plan_updateable: false
+allow_parameters:
+- name: "service.type"
+  description: "service type config for values.yaml"
+archive: false

addons/grafana/10/plans/standard-1-2/values.yaml

@@ -1,29 +1,30 @@
 credential:
   {{- if (eq .Values.router.service.type "LoadBalancer") }}
-  - name: host
+  - name: HOST
     valueFrom:
       serviceRef:
         name: {{ printf "%s-router" (include "common.names.fullname" .) }}
         jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
-  - name: password
+  {{- else if (eq .Values.service.type "ClusterIP") }}
+  - name: HOST
+    valueFrom:
+      serviceRef:
+        name: {{ include "common.names.fullname" . }}
+        jsonpath: '{ .spec.clusterIP }'
+  {{- end }}
+  - name: PASSWORD
     valueFrom:
       secretKeyRef:
         name: {{ template "common.names.fullname" . }}-admin
         jsonpath: '{ .data.GF_SECURITY_ADMIN_PASSWORD }' 
-  - name: username
+  - name: USERNAME
     valueFrom:
       secretKeyRef:
         name: {{ template "common.names.fullname" . }}-admin
         jsonpath: '{ .data.GF_SECURITY_ADMIN_USER }' 
-  - name: portrw
-    valueFrom:
-      secretKeyRef:
-        name: {{ template "common.names.fullname" . }}-svcbind-custom-user
-        jsonpath: '{ .data.portrw }' 
-  - name: portro
-    valueFrom:
-      secretKeyRef:
-        name: {{ template "common.names.fullname" . }}-svcbind-custom-user
-        jsonpath: '{ .data.portro }' 
-  {{- end }}
+  - name: PORT
+    valueFrom:  
+      serviceRef:
+        name: {{ template "common.names.fullname" . }}
+        jsonpath: '{ .spec.ports[?(@.name=="http")].port }'
 

…/grafana/10/plans/standard-1-2/bind.yaml …ns/grafana/10/plans/standard-5/bind.yamladdons/grafana/10/plans/standard-1-2/bind.yaml renamed to addons/grafana/10/plans/standard-5/bind.yaml addons/grafana/10/plans/standard-1-2/bind.yaml renamed to addons/grafana/10/plans/standard-5/bind.yaml

@@ -1,6 +1,6 @@
-name: "standard-10"
+name: "standard-5"
 id: 2b455154-8725-482a-95b2-a193c180d9b5
-description: "grafana plan which limit 1c1g ,default persistence size 10Gi."
+description: "grafana plan which limit 1c1g ,default persistence size 5Gi."
 displayName: "1C2G"
 bindable: true
 maximum_polling_duration: 1800

…/grafana/10/plans/standard-1-2/meta.yaml …ns/grafana/10/plans/standard-5/meta.yamladdons/grafana/10/plans/standard-1-2/meta.yaml renamed to addons/grafana/10/plans/standard-5/meta.yaml addons/grafana/10/plans/standard-1-2/meta.yaml renamed to addons/grafana/10/plans/standard-5/meta.yaml

@@ -0,0 +1,14 @@
+## @param fullnameOverride String to fully override common.names.fullname template
+##
+fullnameOverride: hb-grafana-standard-5
+
+resources:
+  limits:
+    cpu: 1000m
+    memory: 1024Mi
+  requests:
+    cpu: 1000m
+    memory: 1024Mi
+
+persistence:
+    size: 5Gi

addons/grafana/10/plans/standard-5/values.yaml

@@ -858,7 +858,7 @@ router:
   service:
     ## @param secondary.service.type MySQL secondary Kubernetes service type
     ##
-    type: LoadBalancer
+    type: ClusterIP
     ## @param secondary.service.ports.mysql MySQL secondary Kubernetes service port
     ##
     portrw: 3306

addons/mysql-cluster/8.0/chart/mysql-cluster/values.yaml

@@ -13,8 +13,10 @@ tags: mysql-cluster
 bindable: true
 instances_retrievable: true
 bindings_retrievable: true
-plan_updateable: true
+plan_updateable: false
 allow_parameters:
 - name: "networkPolicy.allowNamespaces"
   description: "networkPolicy allowNamespaces config for values.yaml"
+- name: "router.service.type"
+  description: "service type config for values.yaml"
 archive: false