chore(workflow): canonical charts naming

Author: duanhongyi

_scripts/install.sh

@@ -215,12 +215,12 @@ EOF
   fi
   helm install drycc drycc/workflow \
     --set builder.service.type=LoadBalancer \
-    --set global.cluster_domain="cluster.local" \
-    --set global.platform_domain="${PLATFORM_DOMAIN}" \
-    --set global.cert_manager_enabled=${CERT_MANAGER_ENABLED:-true} \
-    --set global.ingress_class=traefik \
-    --set fluentd.daemon_environment.CONTAINER_TAIL_PARSER_TYPE="/^(?<time>.+) (?<stream>stdout|stderr)( (?<tags>.))? (?<log>.*)$/" \
-    --set controller.app_storage_class=${CONTROLLER_APP_STORAGE_CLASS:-"openebs-kernel-nfs"} \
+    --set global.clusterDomain="cluster.local" \
+    --set global.platformDomain="${PLATFORM_DOMAIN}" \
+    --set global.certManagerEnabled=${CERT_MANAGER_ENABLED:-true} \
+    --set global.ingressClass=traefik \
+    --set fluentd.daemonEnvironment.CONTAINER_TAIL_PARSER_TYPE="/^(?<time>.+) (?<stream>stdout|stderr)( (?<tags>.))? (?<log>.*)$/" \
+    --set controller.appStorageClass=${CONTROLLER_APP_STORAGE_CLASS:-"openebs-kernel-nfs"} \
     --set minio.persistence.enabled=true \
     --set minio.persistence.size=${MINIO_PERSISTENCE_SIZE:-20Gi} \
     --set minio.persistence.storageClass=${MINIO_PERSISTENCE_STORAGE_CLASS:-""} \
@@ -235,8 +235,8 @@ EOF
     --set monitor.grafana.persistence.enabled=true \
     --set monitor.grafana.persistence.size=${MONITOR_GRAFANA_PERSISTENCE_SIZE:-5Gi} \
     --set monitor.grafana.storageClass=${MONITOR_GRAFANA_PERSISTENCE_STORAGE_CLASS:-""} \
-    --set passport.admin_username=${DRYCC_ADMIN_USERNAME} \
-    --set passport.admin_password=${DRYCC_ADMIN_PASSWORD} \
+    --set passport.adminUsername=${DRYCC_ADMIN_USERNAME} \
+    --set passport.adminPassword=${DRYCC_ADMIN_PASSWORD} \
     --namespace drycc \
     --values /tmp/drycc-values.yaml \
     --create-namespace --wait --timeout 30m0s
@@ -256,12 +256,12 @@ function install_helmbroker {
   echo -e "\\033[32m---> Start installing helmbroker...\\033[0m"
 
   helm install helmbroker drycc/helmbroker \
-    --set ingress_class="traefik" \
-    --set platform_domain="cluster.local" \
+    --set ingressClass="traefik" \
+    --set platformDomain="cluster.local" \
     --set persistence.size=${HELMBROKER_PERSISTENCE_SIZE:-5Gi} \
     --set persistence.storageClass=${HELMBROKER_PERSISTENCE_STORAGE_CLASS:-"openebs-kernel-nfs"} \
-    --set platform_domain=${PLATFORM_DOMAIN} \
-    --set cert_manager_enabled=${CERT_MANAGER_ENABLED:-true} \
+    --set platformDomain=${PLATFORM_DOMAIN} \
+    --set certManagerEnabled=${CERT_MANAGER_ENABLED:-true} \
     --set username=${HELMBROKER_USERNAME} \
     --set password=${HELMBROKER_PASSWORD} \
     --set environment.HELMBROKER_CELERY_BROKER="amqp://${RABBITMQ_USERNAME}:${RABBITMQ_PASSWORD}@drycc-rabbitmq-0.drycc-rabbitmq.drycc.svc.cluster.local:5672/drycc" \

charts/workflow/templates/drycc-cluster-issuer.yaml

@@ -16,4 +16,4 @@ spec:
     solvers:
     - http01:
         ingress:
-          class: "{{ .Values.global.ingress_class }}"
+          class: "{{ .Values.global.ingressClass }}"

charts/workflow/templates/objectstorage-secret.yaml

@@ -11,36 +11,36 @@ data:
 {{ if eq .Values.global.storage "gcs"}}
   accesskey: {{.Values.gcs.accesskey | b64enc }}
   secretkey: {{ .Values.gcs.secretkey | b64enc }}
-  key.json: {{.Values.gcs.key_json}}
+  key.json: {{.Values.gcs.keyJson}}
   projectid: {{ .Values.gcs.projectid | b64enc }}
-  builder-bucket: {{.Values.gcs.builder_bucket | b64enc }}
-  registry-bucket: {{.Values.gcs.registry_bucket | b64enc }}
-  database-bucket: {{.Values.gcs.database_bucket | b64enc }}
+  builder-bucket: {{.Values.gcs.builderBucket | b64enc }}
+  registry-bucket: {{.Values.gcs.registryBucket | b64enc }}
+  database-bucket: {{.Values.gcs.databaseBucket | b64enc }}
 {{ else if eq .Values.global.storage "azure"}}
   accesskey: {{.Values.azure.accesskey | b64enc }}
   secretkey: {{ .Values.azure.secretkey | b64enc }}
   endpoint: {{ .Values.azure.endpoint | b64enc }}
-  builder-bucket: {{ .Values.azure.builder_bucket | b64enc }}
-  registry-bucket: {{ .Values.azure.registry_bucket | b64enc }}
-  database-bucket: {{ .Values.azure.database_bucket | b64enc }}
+  builder-bucket: {{ .Values.azure.builderBucket | b64enc }}
+  registry-bucket: {{ .Values.azure.registryBucket | b64enc }}
+  database-bucket: {{ .Values.azure.databaseBucket | b64enc }}
 {{ else if eq .Values.global.storage "s3"}}
   accesskey: {{ .Values.s3.accesskey | b64enc }}
   secretkey: {{ .Values.s3.secretkey | b64enc }}
   endpoint: {{ .Values.s3.endpoint | b64enc }}
-  builder-bucket: {{ .Values.s3.builder_bucket | b64enc }}
-  registry-bucket: {{.Values.s3.registry_bucket | b64enc }}
-  database-bucket: {{.Values.s3.database_bucket | b64enc }}
+  builder-bucket: {{ .Values.s3.builderBucket | b64enc }}
+  registry-bucket: {{.Values.s3.registryBucket | b64enc }}
+  database-bucket: {{.Values.s3.databaseBucket | b64enc }}
 {{ else if eq .Values.global.storage "oss"}}
   accesskey: {{ .Values.oss.accesskey | b64enc }}
   secretkey: {{ .Values.oss.secretkey | b64enc }}
   endpoint: {{ .Values.oss.endpoint | b64enc }}
-  builder-bucket: {{ .Values.oss.builder_bucket | b64enc }}
-  registry-bucket: {{.Values.oss.registry_bucket | b64enc }}
-  database-bucket: {{.Values.oss.database_bucket | b64enc }}
+  builder-bucket: {{ .Values.oss.builderBucket | b64enc }}
+  registry-bucket: {{.Values.oss.registryBucket | b64enc }}
+  database-bucket: {{.Values.oss.databaseBucket | b64enc }}
 {{else if eq .Values.global.storage "minio"}}
   accesskey: {{ .Values.minio.accesskey | b64enc }}
   secretkey: {{ .Values.minio.secretkey | b64enc }}
-  builder-bucket: {{ .Values.minio.builder_bucket | b64enc }}
-  registry-bucket: {{.Values.minio.registry_bucket | b64enc }}
-  database-bucket: {{.Values.minio.database_bucket | b64enc }}
+  builder-bucket: {{ .Values.minio.builderBucket | b64enc }}
+  registry-bucket: {{.Values.minio.registryBucket | b64enc }}
+  database-bucket: {{.Values.minio.databaseBucket | b64enc }}
 {{ end }}

charts/workflow/templates/registry-secret.yaml

@@ -1,12 +1,12 @@
-{{- if ne .Values.global.registry_location "on-cluster" }}
+{{- if ne .Values.global.registryLocation "on-cluster" }}
 apiVersion: v1
 kind: Secret
 metadata:
   name: registry-secret
   labels:
     heritage: drycc
   annotations:
-    drycc.cc/registry-location: "{{ .Values.global.registry_location }}"
+    drycc.cc/registry-location: "{{ .Values.global.registryLocation }}"
 type: Opaque
 data:
   hostname: {{ .Values.registry.hostname | b64enc }}

charts/workflow/values.yaml

@@ -20,42 +20,42 @@ global:
   #   automatically; backups are sent to object storage
   #   configured above)
   # - off-cluster: Run PostgreSQL outside the Kubernetes cluster (configure in database section)
-  database_location: "on-cluster"
+  databaseLocation: "on-cluster"
 
   # Set the location of Workflow's Redis instance
   #
   # Valid values are:
   # - on-cluster: Run Redis within the Kubernetes cluster
   # - off-cluster: Run Redis outside the Kubernetes cluster (configure in redis section)
-  redis_location: "on-cluster"
+  redisLocation: "on-cluster"
   # Set the location of Workflow's rabbitmq instance
   # Valid values are:
   # - on-cluster: Run Rabbitmq within the Kubernetes cluster
   # - off-cluster: Run Rabbitmq outside the Kubernetes cluster (configure in controller section)
-  rabbitmq_location: "on-cluster"
+  rabbitmqLocation: "on-cluster"
   # Set the location of Workflow's influxdb cluster
   #
   # Valid values are:
   # - on-cluster: Run Influxdb within the Kubernetes cluster
   # - off-cluster: Influxdb is running outside of the cluster and credentials and connection information will be provided.
-  influxdb_location: "on-cluster"
+  influxdbLocation: "on-cluster"
   # Set the location of Workflow's grafana instance
   #
   # Valid values are:
   # - on-cluster: Run Grafana within the Kubernetes cluster
   # - off-cluster: Grafana is running outside of the cluster
-  grafana_location: "on-cluster"
+  grafanaLocation: "on-cluster"
 
   # Set the location of Workflow's Registry
   #
   # Valid values are:
   # - on-cluster: Run registry within the Kubernetes cluster
   # - off-cluster: Use registry outside the Kubernetes cluster (example: dockerhub,quay.io,self-hosted)
-  registry_location: "on-cluster"
+  registryLocation: "on-cluster"
   # Prefix for the imagepull secret created when using private registry
-  registry_secret_prefix: "private-registry"
+  registrySecretPrefix: "private-registry"
   # The host port to which registry proxy binds to
-  registry_proxy_port: 5555
+  registryProxyPort: 5555
   # If the Kubernetes cluster uses CNI
   # use_cni: true
   # Set the `listen` variable for registry-proxy's NGINX
@@ -72,31 +72,31 @@ global:
   # Valid values are:
   # - true: all RBAC-related manifests will be installed (in case your cluster supports RBAC)
   # - false: no RBAC-related manifests will be installed
-  use_rbac: true
+  rbac: true
   # Please check `kubernetes.io/ingress.class`
   # The cert-manager component must be installed
   # If you want to use HTTPSEnforced or allowlist functions, you must specify:
   # - nginx
   # - traefik
   # Only the above options have been supported so far
-  ingress_class: ""
+  ingressClass: ""
   # A domain name consists of one or more parts.
   # Periods (.) are used to separate these parts.
   # Each part must be 1 to 63 characters in length and can contain lowercase letters, digits, and hyphens (-).
   # It must start and end with a lowercase letter or digit.
-  cluster_domain: "cluster.local"
+  clusterDomain: "cluster.local"
   # The publicly resolvable hostname to build your cluster with.
   #
   # This will be the hostname that is used to build endpoints such as "drycc.$HOSTNAME"
-  platform_domain: ""
+  platformDomain: ""
   # Whether cert_manager is enabled to automatically generate drycc certificates
-  cert_manager_enabled: true
+  certManagerEnabled: true
   # Set the location of Workflow's passport
   #
   # Valid values are:
   # - on-cluster: Run passport within the Kubernetes cluster
   # - off-cluster: Use passport outside the Kubernetes cluster
-  passport_location: "on-cluster"
+  passportLocation: "on-cluster"
 
 s3:
   # Your AWS access key. Leave it empty if you want to use IAM credentials.
@@ -106,43 +106,43 @@ s3:
   # Any S3 region
   endpoint: "your-s3-endpoint"
   # Your buckets.
-  builder_bucket: "your-builder-bucket-name"
-  registry_bucket: "your-registry-bucket-name"
-  database_bucket: "your-database-bucket-name"
+  builderBucket: "your-builder-bucket-name"
+  registryBucket: "your-registry-bucket-name"
+  databaseBucket: "your-database-bucket-name"
 
 oss:
   accesskey: ""
   secretkey: ""
   endpoint: "your-oos-endpoint"
-  builder_bucket: "your-builder-bucket-name"
-  registry_bucket: "your-registry-bucket-name"
-  database_bucket: "your-database-bucket-name"
+  builderBucket: "your-builder-bucket-name"
+  registryBucket: "your-registry-bucket-name"
+  databaseBucket: "your-database-bucket-name"
 
 azure:
   accesskey: "YOUR ACCOUNT NAME"
   secretkey: "YOUR ACCOUNT KEY"
   endpoint: "your-azure-endpoint"
-  builder_bucket: "your-builder-container-name"
-  registry_bucket: "your-registry-container-name"
-  database_bucket: "your-database-container-name"
+  builderBucket: "your-builder-container-name"
+  registryBucket: "your-registry-container-name"
+  databaseBucket: "your-database-container-name"
 
 gcs:
-  # key_json is expanded into a JSON file on the remote server. It must be
+  # keyJson is expanded into a JSON file on the remote server. It must be
   # well-formatted JSON data.
   accesskey: "your accessKey for minio gateway"
   secretkey: "your secretkey for minio gateway"
-  key_json: <base64-encoded JSON data>
+  keyJson: <base64-encoded JSON data>
   projectid: "your-gcs-projectid"
-  builder_bucket: "your-builder-bucket-name"
-  registry_bucket: "your-registry-bucket-name"
-  database_bucket: "your-database-bucket-name"
+  builderBucket: "your-builder-bucket-name"
+  registryBucket: "your-registry-bucket-name"
+  databaseBucket: "your-database-bucket-name"
 
 minio:
   accesskey: "8TZRY2JRWMPT6UMXR6I5"
   secretkey: "gbstrOvotMMcg2sMfGUhA5a6Et/EI5ALtIHsobYk"
-  builder_bucket: "0fad60517a9e4225a07d77d7b9b58629"
-  registry_bucket: "c2da53f11c7a455db35797c3ba625d80"
-  database_bucket: "e95eb5c54c3a4047abe5269a68fa9a67"
+  builderBucket: "0fad60517a9e4225a07d77d7b9b58629"
+  registryBucket: "c2da53f11c7a455db35797c3ba625d80"
+  databaseBucket: "e95eb5c54c3a4047abe5269a68fa9a67"
   # Configure the following ONLY if you want persistence for on-cluster minio
   persistence:
     enabled: false # Set to true to enable persistence
@@ -181,23 +181,23 @@ passport:
   # Set passport deployment replicas
   replicas: 1
   # Configuring this will no longer use the built-in database component
-  database_url: ""
+  databaseUrl: ""
 
 controller:
-  app_image_pull_policy: "IfNotPresent"
+  appImagePullPolicy: "IfNotPresent"
   # Possible values are:
   # enabled - allows for open registration
   # disabled - turns off open registration
   # admin_only - allows for registration by an admin only.
-  registration_mode: "admin_only"
+  registrationMode: "admin_only"
   # Set storageClassName, It is used for application mount.
-  app_storage_class: ""
+  appStorageClass: ""
   # Set controller deployment  replicas
   replicas: 1
   # Set celery replicas
-  celery_replicas: 1
+  celeryReplicas: 1
   # Configuring this will no longer use the built-in database component
-  database_url: ""
+  databaseUrl: ""
 
 database:
   # The username and password to be used by the on-cluster database.

src/applications/deploying-apps.md

@@ -60,7 +60,7 @@ It is possible to configure a few of the [globally tunable](../applications/mana
 
 Setting                                         | Description
 ----------------------------------------------- | ---------------------------------
-DRYCC_DISABLE_CACHE                             | if set, this will disable the [slugbuilder cache][] (default: not set)
+DRYCC_DISABLE_CACHE                             | if set, this will disable the [imagebuilder cache][] (default: not set)
 DRYCC_DEPLOY_BATCHES                            | the number of pods to bring up and take down sequentially during a scale (default: number of available nodes)
 DRYCC_DEPLOY_TIMEOUT                            | deploy timeout in seconds per deploy batch (default: 120)
 IMAGE_PULL_POLICY                               | the kubernetes [image pull policy][pull-policy] for application images (default: "IfNotPresent") (allowed values: "Always", "IfNotPresent")

src/applications/managing-app-volumes.md

@@ -2,7 +2,7 @@
 
 We can use the blow command to create volumes and mount the created volumes.
 Drycc create volume support [ReadWriteMany](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes), so before deploying drycc, you need to have a StorageClass ready which can support ReadWriteMany.
-Deploying drycc, set controller.app_storage_class to this StorageClass.
+Deploying drycc, set controller.appStorageClass to this StorageClass.
 
 
 Use `drycc volumes` to mount a volume for a deployed application's processes.

src/changelogs/v1.1.0.md

@@ -37,13 +37,13 @@
 - [`62a9b7d`](https://api.github.com/repos/drycc/builder/git/trees/62a9b7de4e61bc5b47d150838069b5d6ab35411b) (builder) - workflow: change experimental_native_ingress to use_native_ingress
 - [`39e9cec`](https://api.github.com/repos/drycc/builder/git/trees/39e9cec79cbd6108322eed201ecfddaa8081f49e) (builder) - ingress: renmae use_native_ingress to use_ingress
 - [`7fa8134`](https://api.github.com/repos/drycc/builder/git/trees/7fa81340df8cf31502e546da8becb95192760ff0) (builder) - ingress: change global.use_ingress to ingress.enabled
-- [`e245c31`](https://api.github.com/repos/drycc/builder/git/trees/e245c31aa20af4f0883e95ecd2f21b9cebe485c4) (builder) - ingress: use ingress_class
+- [`e245c31`](https://api.github.com/repos/drycc/builder/git/trees/e245c31aa20af4f0883e95ecd2f21b9cebe485c4) (builder) - ingress: use ingressClass
 - [`18b330d`](https://api.github.com/repos/drycc/builder/git/trees/18b330d9c8cab13966b7dd46a7888add435b3c0e) (builder) - service: no longer dependent on ingress switches
 - [`95f4d3d`](https://api.github.com/repos/drycc/controller/git/trees/95f4d3de1cb61a35997037f0e620ddd365954e87) (controller) - django: upgrade to django version 1.11.20 latest patch
 - [`6bcd79b`](https://api.github.com/repos/drycc/controller/git/trees/6bcd79b82ddee66ca08f84a9022853b6367f5d8e) (controller) - workflow: change experimental_native_ingress to use_native_ingress
 - [`781229a`](https://api.github.com/repos/drycc/controller/git/trees/781229a050322e137f5938549411b72b41eb38b8) (controller) - ingress: renmae use_native_ingress to use_ingress
 - [`b96b4db`](https://api.github.com/repos/drycc/controller/git/trees/b96b4dbf4abacbb5977df41d69b46785f03cda85) (controller) - ingress: change global.use_ingress to ingress.enabled
-- [`e1b124f`](https://api.github.com/repos/drycc/controller/git/trees/e1b124f3e5b7613a2ff8a42ebfc9e00a3db6b4fc) (controller) - ingress: use ingress_class
+- [`e1b124f`](https://api.github.com/repos/drycc/controller/git/trees/e1b124f3e5b7613a2ff8a42ebfc9e00a3db6b4fc) (controller) - ingress: use ingressClass
 - [`fee0554`](https://api.github.com/repos/drycc/controller/git/trees/fee05541fdfc00bfdd9747f9f24f0aa8a2b3e392) (controller) - ingress: delete ingress judgment
 - [`5cd10f3`](https://api.github.com/repos/drycc/controller/git/trees/5cd10f3318fd4515e7e675422077f4e16a563d25) (controller) - ingress: Ingress_class can be empty
 - [`fa312bb`](https://api.github.com/repos/drycc/postgres/git/trees/fa312bb7f57f5f8638484bc4d9825aa962031a25) (database) - postgres: set max_connections = 1024

src/changelogs/v1.2.0.md

@@ -25,13 +25,13 @@
 - [`ff7a16f`](https://api.github.com/repos/drycc/builder/git/trees/ff7a16f53ac78dac0c334a9718cdc76c65400732) (builder) - registry: remove ecr and gcr registry
 - [`ad13683`](https://api.github.com/repos/drycc/builder/git/trees/ad13683ce634c9b4835f45d2b474bac16ca52baa) (builder) - builder: change DRYCC_BUILD_TYPE to DRYCC_STACK
 - [`6def637`](https://api.github.com/repos/drycc/builder/git/trees/6def637d5331330940d0a94cf6313a4bcb67fec0) (builder) - registry: rename DRYCC_REGISTRY_SERVICE to DRYCC_REGISTRY_PROXY
-- [`5044e22`](https://api.github.com/repos/drycc/builder/git/trees/5044e223a56ee6283ac8d68a1442a6430b18dd99) (builder) - registry: remove registry_secret_prefix
+- [`5044e22`](https://api.github.com/repos/drycc/builder/git/trees/5044e223a56ee6283ac8d68a1442a6430b18dd99) (builder) - registry: remove registrySecretPrefix
 - [`2ea39cc`](https://api.github.com/repos/drycc/builder/git/trees/2ea39cc0a9dd68fa1baca4b3725a00b9bcf7f89a) (builder) - controller-go-sdk: upgrade controller-go-sdk
 - [`6aee0d7`](https://api.github.com/repos/drycc/builder/git/trees/6aee0d7f092b53c37c70d05db076eaae1bbcff44) (builder) - registry: optimizing variable naming
 - [`f9c62d9`](https://api.github.com/repos/drycc/controller/git/trees/f9c62d9db809bfe03af33092e71a16e56fc35483) (controller) - domain: added reserved domain check
 - [`f5a135b`](https://api.github.com/repos/drycc/controller/git/trees/f5a135be6aa2b319e623fd59bb711705d1cfe13f) (controller) - migrations: clean old migrations
 - [`4369b2c`](https://api.github.com/repos/drycc/controller/git/trees/4369b2c2fb6ef861978588a61efa1bfc6a4572ec) (controller) - registry: rename DRYCC_REGISTRY_SERVICE to DRYCC_REGISTRY_PROXY
-- [`1057ca5`](https://api.github.com/repos/drycc/controller/git/trees/1057ca59c3ae6bbd85d772f6b49b0c542d7d18c4) (controller) - registry: remove registry_secret_prefix
+- [`1057ca5`](https://api.github.com/repos/drycc/controller/git/trees/1057ca59c3ae6bbd85d772f6b49b0c542d7d18c4) (controller) - registry: remove registrySecretPrefix
 - [`d114b3e`](https://api.github.com/repos/drycc/controller/git/trees/d114b3e93544624a5f01b1ca71db92d0b33f4e0d) (controller) - docker: update docker client
 - [`edbe963`](https://api.github.com/repos/drycc/imagebuilder/git/trees/edbe9631dcfb34ed50d9e931d36506fa262b6299) (imagebuilder) - dockerfile: change base image to alpine
 - [`fb35baf`](https://api.github.com/repos/drycc/imagebuilder/git/trees/fb35baf913ff846e08ba79d9ad8195fca1411684) (imagebuilder) - registry: rename DRYCC_REGISTRY_SERVICE to DRYCC_REGISTRY_PROXY