megre(addons)

EamonZhang · EamonZhang · commit e702a3fed153 · 2024-05-14T15:47:48.000+08:00
diff --git a/addons/kafka/3.6/chart/kafka/templates/_helpers.tpl b/addons/kafka/3.6/chart/kafka/templates/_helpers.tpl
@@ -1,5 +1,5 @@
 {{/*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/broker/config-secrets.yaml b/addons/kafka/3.6/chart/kafka/templates/broker/config-secrets.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/broker/configmap.yaml b/addons/kafka/3.6/chart/kafka/templates/broker/configmap.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/broker/pdb.yaml b/addons/kafka/3.6/chart/kafka/templates/broker/pdb.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/broker/statefulset.yaml b/addons/kafka/3.6/chart/kafka/templates/broker/statefulset.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/broker/svc-external-access.yaml b/addons/kafka/3.6/chart/kafka/templates/broker/svc-external-access.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/broker/svc-headless.yaml b/addons/kafka/3.6/chart/kafka/templates/broker/svc-headless.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/controller-eligible/config-secrets.yaml b/addons/kafka/3.6/chart/kafka/templates/controller-eligible/config-secrets.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/controller-eligible/configmap.yaml b/addons/kafka/3.6/chart/kafka/templates/controller-eligible/configmap.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/controller-eligible/pdb.yaml b/addons/kafka/3.6/chart/kafka/templates/controller-eligible/pdb.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/controller-eligible/statefulset.yaml b/addons/kafka/3.6/chart/kafka/templates/controller-eligible/statefulset.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/controller-eligible/svc-external-access.yaml b/addons/kafka/3.6/chart/kafka/templates/controller-eligible/svc-external-access.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/controller-eligible/svc-headless.yaml b/addons/kafka/3.6/chart/kafka/templates/controller-eligible/svc-headless.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/extra-list.yaml b/addons/kafka/3.6/chart/kafka/templates/extra-list.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/log4j-configmap.yaml b/addons/kafka/3.6/chart/kafka/templates/log4j-configmap.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/metrics/deployment.yaml b/addons/kafka/3.6/chart/kafka/templates/metrics/deployment.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/metrics/jmx-configmap.yaml b/addons/kafka/3.6/chart/kafka/templates/metrics/jmx-configmap.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/metrics/jmx-servicemonitor.yaml b/addons/kafka/3.6/chart/kafka/templates/metrics/jmx-servicemonitor.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/metrics/jmx-svc.yaml b/addons/kafka/3.6/chart/kafka/templates/metrics/jmx-svc.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/metrics/prometheusrule.yaml b/addons/kafka/3.6/chart/kafka/templates/metrics/prometheusrule.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/metrics/serviceaccount.yaml b/addons/kafka/3.6/chart/kafka/templates/metrics/serviceaccount.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/metrics/servicemonitor.yaml b/addons/kafka/3.6/chart/kafka/templates/metrics/servicemonitor.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/metrics/svc.yaml b/addons/kafka/3.6/chart/kafka/templates/metrics/svc.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/network-policy/networkpolicy-egress.yaml b/addons/kafka/3.6/chart/kafka/templates/network-policy/networkpolicy-egress.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/network-policy/networkpolicy-ingress.yaml b/addons/kafka/3.6/chart/kafka/templates/network-policy/networkpolicy-ingress.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/provisioning/job.yaml b/addons/kafka/3.6/chart/kafka/templates/provisioning/job.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/provisioning/serviceaccount.yaml b/addons/kafka/3.6/chart/kafka/templates/provisioning/serviceaccount.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/provisioning/tls-secret.yaml b/addons/kafka/3.6/chart/kafka/templates/provisioning/tls-secret.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/rbac/role.yaml b/addons/kafka/3.6/chart/kafka/templates/rbac/role.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/rbac/rolebinding.yaml b/addons/kafka/3.6/chart/kafka/templates/rbac/rolebinding.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/rbac/serviceaccount.yaml b/addons/kafka/3.6/chart/kafka/templates/rbac/serviceaccount.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/scripts-configmap.yaml b/addons/kafka/3.6/chart/kafka/templates/scripts-configmap.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/secrets.yaml b/addons/kafka/3.6/chart/kafka/templates/secrets.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/svc.yaml b/addons/kafka/3.6/chart/kafka/templates/svc.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/chart/kafka/templates/tls-secret.yaml b/addons/kafka/3.6/chart/kafka/templates/tls-secret.yaml
@@ -1,5 +1,5 @@
 {{- /*
-Copyright VMware, Inc.
+Copyright Drycc Community.
 SPDX-License-Identifier: APACHE-2.0
 */}}
 
diff --git a/addons/kafka/3.6/meta.yaml b/addons/kafka/3.6/meta.yaml
@@ -15,6 +15,9 @@ instances_retrievable: true
 bindings_retrievable: true
 plan_updateable: true
 allow_parameters:
+- name: "extraEnvVars"
+  required: false
+  description: "extraEnvVars config for values.yaml"
 - name: "listeners.client.protocol"
   required: false
   description: "listeners client protocol config for values.yaml"
@@ -33,9 +36,6 @@ allow_parameters:
 - name: "service.type"
   required: false
   description: "service type config for values.yaml"
-- name: "metrics.kafka.enabled"
-  required: false
-  description: "metrics kafka enabled or not config for values.yaml"
 - name: "externalAccess.enabled"
   required: false
   description: "externalAccess enabled or not config for values.yaml"
diff --git a/addons/kafka/3.6/plans/standard-16c32g3w/bind.yaml b/addons/kafka/3.6/plans/standard-16c32g3w/bind.yaml
@@ -44,11 +44,11 @@ credential:
 {{- $fullname := include "common.names.fullname" . }}
 {{- $replicaCount := .Values.controller.replicaCount | int }}
 {{- range $i := until $replicaCount }}
-{{- $targetPod := printf "%s-broker-%d" (printf "%s" $fullname) $i }}
+{{- $targetPod := printf "%s-controller-%d" (printf "%s" $fullname) $i }}
   - name: {{ printf "EXTERNAL_%d" $i }}
     valueFrom:
       serviceRef:
-        name: {{ printf "%s-broker-%d-external" (include "common.names.fullname" $) $i | trunc 63 | trimSuffix "-" }}
+        name: {{ printf "%s-controller-%d-external" (include "common.names.fullname" $) $i | trunc 63 | trimSuffix "-" }}
         jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
 {{- end }}
 
diff --git a/addons/kafka/3.6/plans/standard-1c2g3w/bind.yaml b/addons/kafka/3.6/plans/standard-1c2g3w/bind.yaml
@@ -44,11 +44,11 @@ credential:
 {{- $fullname := include "common.names.fullname" . }}
 {{- $replicaCount := .Values.controller.replicaCount | int }}
 {{- range $i := until $replicaCount }}
-{{- $targetPod := printf "%s-broker-%d" (printf "%s" $fullname) $i }}
+{{- $targetPod := printf "%s-controller-%d" (printf "%s" $fullname) $i }}
   - name: {{ printf "EXTERNAL_%d" $i }}
     valueFrom:
       serviceRef:
-        name: {{ printf "%s-broker-%d-external" (include "common.names.fullname" $) $i | trunc 63 | trimSuffix "-" }}
+        name: {{ printf "%s-controller-%d-external" (include "common.names.fullname" $) $i | trunc 63 | trimSuffix "-" }}
         jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
 {{- end }}
 
diff --git a/addons/kafka/3.6/plans/standard-24c64g3w/bind.yaml b/addons/kafka/3.6/plans/standard-24c64g3w/bind.yaml
@@ -44,11 +44,11 @@ credential:
 {{- $fullname := include "common.names.fullname" . }}
 {{- $replicaCount := .Values.controller.replicaCount | int }}
 {{- range $i := until $replicaCount }}
-{{- $targetPod := printf "%s-broker-%d" (printf "%s" $fullname) $i }}
+{{- $targetPod := printf "%s-controller-%d" (printf "%s" $fullname) $i }}
   - name: {{ printf "EXTERNAL_%d" $i }}
     valueFrom:
       serviceRef:
-        name: {{ printf "%s-broker-%d-external" (include "common.names.fullname" $) $i | trunc 63 | trimSuffix "-" }}
+        name: {{ printf "%s-controller-%d-external" (include "common.names.fullname" $) $i | trunc 63 | trimSuffix "-" }}
         jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
 {{- end }}
 
diff --git a/addons/kafka/3.6/plans/standard-2c4g3w/bind.yaml b/addons/kafka/3.6/plans/standard-2c4g3w/bind.yaml
@@ -44,11 +44,11 @@ credential:
 {{- $fullname := include "common.names.fullname" . }}
 {{- $replicaCount := .Values.controller.replicaCount | int }}
 {{- range $i := until $replicaCount }}
-{{- $targetPod := printf "%s-broker-%d" (printf "%s" $fullname) $i }}
+{{- $targetPod := printf "%s-controller-%d" (printf "%s" $fullname) $i }}
   - name: {{ printf "EXTERNAL_%d" $i }}
     valueFrom:
       serviceRef:
-        name: {{ printf "%s-broker-%d-external" (include "common.names.fullname" $) $i | trunc 63 | trimSuffix "-" }}
+        name: {{ printf "%s-controller-%d-external" (include "common.names.fullname" $) $i | trunc 63 | trimSuffix "-" }}
         jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
 {{- end }}
 
diff --git a/addons/kafka/3.6/plans/standard-4c8g3w/bind.yaml b/addons/kafka/3.6/plans/standard-4c8g3w/bind.yaml
@@ -44,11 +44,11 @@ credential:
 {{- $fullname := include "common.names.fullname" . }}
 {{- $replicaCount := .Values.controller.replicaCount | int }}
 {{- range $i := until $replicaCount }}
-{{- $targetPod := printf "%s-broker-%d" (printf "%s" $fullname) $i }}
+{{- $targetPod := printf "%s-controller-%d" (printf "%s" $fullname) $i }}
   - name: {{ printf "EXTERNAL_%d" $i }}
     valueFrom:
       serviceRef:
-        name: {{ printf "%s-broker-%d-external" (include "common.names.fullname" $) $i | trunc 63 | trimSuffix "-" }}
+        name: {{ printf "%s-controller-%d-external" (include "common.names.fullname" $) $i | trunc 63 | trimSuffix "-" }}
         jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
 {{- end }}
 
diff --git a/addons/kafka/3.6/plans/standard-8c16g3w/bind.yaml b/addons/kafka/3.6/plans/standard-8c16g3w/bind.yaml
@@ -44,11 +44,11 @@ credential:
 {{- $fullname := include "common.names.fullname" . }}
 {{- $replicaCount := .Values.controller.replicaCount | int }}
 {{- range $i := until $replicaCount }}
-{{- $targetPod := printf "%s-broker-%d" (printf "%s" $fullname) $i }}
+{{- $targetPod := printf "%s-controller-%d" (printf "%s" $fullname) $i }}
   - name: {{ printf "EXTERNAL_%d" $i }}
     valueFrom:
       serviceRef:
-        name: {{ printf "%s-broker-%d-external" (include "common.names.fullname" $) $i | trunc 63 | trimSuffix "-" }}
+        name: {{ printf "%s-controller-%d-external" (include "common.names.fullname" $) $i | trunc 63 | trimSuffix "-" }}
         jsonpath: '{ .status.loadBalancer.ingress[*].ip }'
 {{- end }}
 
diff --git a/addons/prometheus/2/chart/prometheus/templates/networkpolicy.yaml b/addons/prometheus/2/chart/prometheus/templates/networkpolicy.yaml
@@ -46,6 +46,10 @@ spec:
       {{- end }}
   {{- end }}  
   {{- end }}
+<<<<<<< HEAD
+=======
+  {{- end }}
+>>>>>>> 453a91857971275fb746127d5c3d9100c3c8215c
   {{- if eq .Values.server.service.type "LoadBalancer" }}
   ingress:
     - {}
diff --git a/addons/prometheus/2/chart/prometheus/values.yaml b/addons/prometheus/2/chart/prometheus/values.yaml
@@ -570,6 +570,7 @@ containerScrape:
   url: xxxx
   scheme: https
   namespaces: []
+
 ## @section Prometheus server Parameters
 ##
 ## Drycc Prometheus image
diff --git a/addons/prometheus/2/meta.yaml b/addons/prometheus/2/meta.yaml
@@ -30,12 +30,24 @@ allow_parameters:
 - name: "server.password"
   required: false
   description: "prometheus administor password"
+<<<<<<< HEAD
 - name: "containerScrape"
   required: false
   description: "container scrape"
 - name: "extraScrapeConfigs"
   required: false
   description: "extra scrape configs"
+=======
+- name: "drycc.token"
+  required: false
+  description: "drycc user token"
+- name: "drycc.url"
+  required: false
+  description: "drycc url"
+- name: "drycc.scheme"
+  required: false
+  description: "drycc scheme"
+>>>>>>> 453a91857971275fb746127d5c3d9100c3c8215c
 - name: "server.rules"
   required: false
   description: "rules config for values.yaml"
diff --git a/addons/prometheus/2/plans/standard-16c32g500/create-instance-schema.json~merged b/addons/prometheus/2/plans/standard-16c32g500/create-instance-schema.json~merged
diff --git a/addons/prometheus/2/plans/standard-1c1g10/create-instance-schema.json~merged b/addons/prometheus/2/plans/standard-1c1g10/create-instance-schema.json~merged
diff --git a/addons/prometheus/2/plans/standard-2c4g50/create-instance-schema.json~merged b/addons/prometheus/2/plans/standard-2c4g50/create-instance-schema.json~merged
diff --git a/addons/redis-cluster/7.0/chart/redis-cluster/templates/networkpolicy.yaml b/addons/redis-cluster/7.0/chart/redis-cluster/templates/networkpolicy.yaml
diff --git a/addons/redis/7.0/chart/redis/templates/networkpolicy.yaml b/addons/redis/7.0/chart/redis/templates/networkpolicy.yaml
diff --git a/addons/seaweedfs/3/meta.yaml b/addons/seaweedfs/3/meta.yaml
diff --git a/addons/seaweedfs/3/plans/standard-v4s3072/bind.yaml b/addons/seaweedfs/3/plans/standard-v4s3072/bind.yaml
diff --git a/addons/seaweedfs/3/plans/standard-v4s3072/create-instance-schema.json b/addons/seaweedfs/3/plans/standard-v4s3072/create-instance-schema.json
diff --git a/addons/seaweedfs/3/plans/standard-v4s3072/meta.yaml b/addons/seaweedfs/3/plans/standard-v4s3072/meta.yaml
diff --git a/addons/seaweedfs/3/plans/standard-v4s3072/values.yaml b/addons/seaweedfs/3/plans/standard-v4s3072/values.yaml
