Commit 19619b01 by Guangbo Chen

update charts bool type and remove test containers

parent 524a0651
......@@ -6,10 +6,7 @@ questions:
default: "true"
description: "Use default Docker image"
label: Use Default Image
type: enum
options:
- "true"
- "false"
type: boolean
show_subquestion_if: false
subquestions:
- variable: etcdCluster.image.repository
......@@ -57,54 +54,26 @@ questions:
description: "Deploy the etcd cluster operator"
required: true
label: Deploy the etcd Cluster Operator
type: enum
options:
- "true"
- "false"
type: boolean
show_subquestion_if: true
subquestions:
- variable: etcdOperator.clusterwide.enabled
default: false
description: "Set etcd operator manage clusters in all namespaces (more details on https://github.com/coreos/etcd-operator/blob/master/doc/user/clusterwide.md)"
label: Set EtcdOperator Clusterwide
type: enum
type: boolean
required: true
options:
- true
- false
- variable: etcdOperator.name
default: "etcd-operator"
description: "Etcd Operator name"
required: true
label: Etcd Operator name
type: string
- variable: etcdOperator.replicaCount
default: "1"
description: "Number of operator replicas to create (only 1 is supported)"
required: true
label: Etcd Operator Replicas
type: enum
options:
- "1"
- variable: etcdOperator.nodeSelector
default: "{}"
description: "Node labels for etcd-operator pod assignment(ref: https://kubernetes.io/docs/user-guide/node-selection/)"
label: Etcd Operator Node Selector
type: string
- variable: etcdOperator.commandArgs
default: "{}"
description: "additional command arguments for etcd operator go here; will be translated to --key=value form e.g., analytics: true"
label: Additional Command Arguments of Etcd Operator
type: string
- variable: deployments.backupOperator
default: "false"
description: "Deploy the etcd backup operator, one time deployment, delete once completed"
required: true
label: Deploy the etcd Backup Operator
type: enum
options:
- "true"
- "false"
type: boolean
show_subquestion_if: true
subquestions:
- variable: backupOperator.name
......@@ -113,14 +82,6 @@ questions:
required: true
label: Backup Operator name
type: string
- variable: backupOperator.replicaCount
default: "1"
description: "Number of operator replicas to create (only 1 is supported)"
required: true
label: Backup Operator Replicas
type: enum
options:
- "1"
- variable: backupOperator.spec.storageType
default: "S3"
description: "Storage to use for backup file, currently only S3 supported"
......@@ -141,25 +102,11 @@ questions:
label: Kubernetes secrete name of AWS Credentails
type: string
required: true
- variable: backupOperator.nodeSelector
default: "{}"
description: "Node labels for etcd backup operator pod assignment(ref: https://kubernetes.io/docs/user-guide/node-selection)"
label: Etcd Operator Node Selector
type: string
- variable: backupOperator.commandArgs
default: "{}"
description: "additional command arguments for etcd backup operator go here; will be translated to --key=value form e.g., analytics: true"
label: Additional command arguments of Etcd Operator
type: string
- variable: deployments.restoreOperator
default: "false"
description: "Deploy the etcd restore operator, one time deployment, delete once completed"
required: true
label: Deploy the etcd Restore Operator
type: enum
options:
- "true"
- "false"
type: boolean
show_subquestion_if: true
subquestions:
- variable: restoreOperator.name
......@@ -168,14 +115,6 @@ questions:
required: true
label: Restore Operator name
type: string
- variable: restoreOperator.replicaCount
default: "1"
description: "Number of operator replicas to create (only 1 is supported)"
required: true
label: Restore Operator Replicas
type: enum
options:
- "1"
- variable: restoreOperator.spec.s3.path
default: ""
description: "Path in S3 bucket containing the backup file, The format of path must be: <s3-bucket-name>/<path-to-backup-file> # e.g: etcd-snapshot-bucket/v1/default/example-etcd-cluster/3.2.10_0000000000000001_etcd.backup"
......@@ -188,53 +127,31 @@ questions:
label: Kubernetes secrete name of AWS Credentails
type: string
required: true
- variable: restoreOperator.nodeSelector
default: "{}"
description: "Node labels for etcd backup operator pod assignment(ref: https://kubernetes.io/docs/user-guide/node-selection)"
label: Etcd Operator Node Selector
type: string
- variable: restoreOperator.commandArgs
default: "{}"
description: "additional command arguments for etcd backup operator go here; will be translated to --key=value form e.g., analytics: true"
label: Additional command arguments of Etcd Operator
type: string
- variable: createCustomResources
default: "false"
description: "creates Kubernetes custom resources definitions (options: EtcdCluster, EtcdBackup, EtcdRestore)"
label: Create Kubernetes Custom Resources (EtcdCluster, EtcdBackup, EtcdRestore)
type: enum
options:
- "true"
- "false"
type: boolean
show_subquestion_if: true
subquestions:
- variable: customResources.createEtcdClusterCRD
default: "false"
default: "true"
description: "Create a custom resource: EtcdCluster"
label: Create a ETCD Cluster
type: enum
type: boolean
show_if: "deployments.etcdOperator=true"
options:
- "true"
- "false"
- variable: customResources.createBackupCRD
default: "false"
description: "Create a custom resource: EtcdBackup"
label: Create a ETCD Backup Cluster
type: enum
type: boolean
show_if: "deployments.backupOperator=true"
options:
- "true"
- "false"
- variable: customResources.createRestoreCRD
default: "false"
description: "Create a custom resource: EtcdRestore"
label: Create a ETCD Restore Cluster
type: enum
type: boolean
show_if: "deployments.restoreOperator=true"
options:
- "true"
- "false"
- variable: etcdCluster.name
default: "etcd-cluster"
description: "etcd cluster name"
......@@ -262,20 +179,11 @@ questions:
type: string
show_if: "createCustomResources=true"
required: true
- variable: etcdCluster.pod.nodeSelector
default: "{}"
description: "node labels for etcd cluster pod assignment, e.g, {disktype: ssd, type: worker}"
label: Node Labels for etcd Pod Assignment
type: string
show_if: "createCustomResources=true"
- variable: etcdCluster.enableTLS
default: "false"
description: "Enable use of TLS"
label: Enable use of TLS
type: enum
options:
- "true"
- "false"
type: boolean
show_subquestion_if: true
show_if: "createCustomResources=true"
required: true
......
......@@ -10,7 +10,7 @@ metadata:
app: {{ template "etcd-operator.name" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
{{ if .Values.etcdOperator.clusterWide.enabled }}
{{- if .Values.etcdOperator.clusterwide.enabled }}
annotations:
etcd.database.coreos.com/scope: clusterwide
{{- end }}
......
......@@ -5,10 +5,7 @@ questions:
default: "true"
description: "Use default Docker image"
label: Use Default Image
type: enum
options:
- "true"
- "false"
type: boolean
show_subquestion_if: false
subquestions:
- variable: image.registry
......@@ -52,10 +49,7 @@ questions:
- variable: mariadb.enabled
default: "true"
description: "Whether to deploy a mariadb server to satisfy the applications database requirements. To use an external database set this to false and configure the externalDatabase parameters"
type: enum
options:
- "true"
- "false"
type: boolean
required: true
label: Install MariaDB
subquestions:
......@@ -80,37 +74,39 @@ questions:
type: string
label: External Database Host
show_if: "mariadb.enabled=false"
required: true
- variable: externalDatabase.user
default: ""
description: "Existing username in the external DB"
type: string
label: External Database username
show_if: "mariadb.enabled=false"
required: true
- variable: externalDatabase.password
default: ""
description: "external database password"
type: password
label: External Database password
show_if: "mariadb.enabled=false"
required: true
- variable: externalDatabase.database
default: ""
description: "Name of the existing database"
type: string
label: External Database
show_if: "mariadb.enabled=false"
required: true
- variable: externalDatabase.port
default: "3306"
description: "External database port number "
type: string
label: External Database Port
show_if: "mariadb.enabled=false"
required: true
- variable: mariadb.persistence.enabled
default: "false"
description: "Enable persistence using PVC of MariaDB"
type: enum
options:
- "true"
- "false"
type: boolean
required: true
label: MariaDB Persistent Volume Enabled
show_if: "mariadb.enabled=true"
......@@ -121,22 +117,32 @@ questions:
description: "MariaDB Persistent Volume Size"
type: string
label: MariaDB Volume Size
required: true
- variable: mariadb.persistence.storageClass
default: ""
description: "If unndefined or set to null, using the default storageClass. default to null"
description: "If unndefined or set to null, using the default storage class."
type: storageclass
label: Default Storage Class for MariaDB
label: Storage Class for MariaDB
- variable: serviceType
default: "LoadBalancer"
default: "ClusterIP"
description: "Magento Service type"
type: enum
options:
- "ClusterIP"
- "NodePort"
- "LoadBalancer"
required: true
label: Magento Service Type
- variable: magentoLoadBalancerIP
default: ""
description: "loadBalancerIP for the magento ServiceMagento Service type"
type: string
required: true
show_if: "serviceType=LoadBalancer"
label: Magento LoadBalancer IP
- variable: magentoMode
default: "default"
description: "Magento mode. Valid values: default, production, developer."
description: "Magento mode options: default, production, developer."
type: enum
options:
- "default"
......@@ -145,31 +151,31 @@ questions:
label: Magento Mode
- variable: persistence.enabled
default: "false"
description: "Enable persistence using PVC of magento and apache"
type: enum
options:
- "true"
- "false"
description: "Enable persistent volume for magento and apache"
type: boolean
required: true
label: Persistent Volume Enabled
label: Magento Persistent Volume Enabled
show_subquestion_if: true
subquestions:
- variable: persistence.magento.size
default: "8Gi"
description: "Persistent Volume Size"
type: string
label: Persistent Volume Size
required: true
label: Magento Persistent Volume Size
- variable: persistence.magento.storageClass
default: ""
description: "If unndefined or set to null, using the default storageClass. default to null"
type: storageclass
label: Default Storage Class for Magento
label: Storage Class for Magento
- variable: persistence.apache.size
default: "1Gi"
description: "Persistent Volume Size"
required: true
type: string
label: Persistent Volume Size
label: Apache Persistent Volume Size
- variable: persistence.apache.storageClass
default: ""
description: "If unndefined or set to null, using the default storageClass. default to null"
type: storageclass
label: Default Storage Class for Apache
label: Storage Class for Apache
......@@ -6,10 +6,7 @@ questions:
default: "true"
description: "Use default Docker image"
label: Use Default Image
type: enum
options:
- "true"
- "false"
type: boolean
show_subquestion_if: false
subquestions:
- variable: image.registry
......@@ -30,10 +27,7 @@ questions:
- variable: usePassword
default: "true"
description: "Enable password authentication"
type: enum
options:
- "true"
- "false"
type: boolean
required: true
label: Enable Password Authentication
show_subquestion_if: true
......@@ -47,10 +41,10 @@ questions:
- variable: mariadbPassword
default: ""
description: "Password for mariadbUser, defaults to a random 10-character alphanumeric string if not set"
type: string
type: password
label: MariaDB Password
- variable: mariadbDatabase
default: "mydb"
default: ""
description: "Database name to create"
type: string
label: MariaDB Database
......@@ -67,10 +61,7 @@ questions:
- variable: persistence.enabled
default: "false"
description: "Enable persistent volume for MariaDB"
type: enum
options:
- "true"
- "false"
type: boolean
required: true
label: MariaDB Persistent Volume Enabled
show_subquestion_if: true
......@@ -80,17 +71,15 @@ questions:
description: "MariaDB Persistent Volume Size"
type: string
label: MariaDB Volume Size
required: true
- variable: persistence.storageClass
default: ""
description: "If unndefined or set to null, using the default storageClass. default to null"
type: string
label: Storage Class
type: storageclass
label: Storage Class for MariaDB
- variable: metrics.enabled
default: "false"
description: "Start a side-car prometheus exporter"
type: enum
options:
- "true"
- "false"
type: boolean
required: true
label: Enable Metrics
apiVersion: v1
kind: Pod
metadata:
name: "{{ template "mariadb.fullname" . }}-test-{{ randAlphaNum 5 | lower }}"
annotations:
"helm.sh/hook": test-success
spec:
initContainers:
- name: "test-framework"
image: "dduportal/bats:0.4.0"
command:
- "bash"
- "-c"
- |
set -ex
# copy bats to tools dir
cp -R /usr/local/libexec/ /tools/bats/
volumeMounts:
- mountPath: /tools
name: tools
containers:
- name: mariadb-test
image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
command: ["/tools/bats/bats", "-t", "/tests/run.sh"]
{{- if .Values.usePassword }}
env:
- name: MARIADB_ROOT_PASSWORD
valueFrom:
secretKeyRef:
name: {{ template "mariadb.fullname" . }}
key: mariadb-root-password
{{- end }}
volumeMounts:
- mountPath: /tests
name: tests
readOnly: true
- mountPath: /tools
name: tools
volumes:
- name: tests
configMap:
name: {{ template "mariadb.fullname" . }}-tests
- name: tools
emptyDir: {}
restartPolicy: Never
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ template "mariadb.fullname" . }}-tests
data:
run.sh: |-
@test "Testing MariaDB is accessible" {
mysql -h {{ template "mariadb.fullname" . }} -uroot {{- if .Values.usePassword }} -p$MARIADB_ROOT_PASSWORD{{ end }} -e 'show databases;'
}
......@@ -5,10 +5,7 @@ questions:
default: "true"
description: "Use default Docker image"
label: Use Default Image
type: enum
options:
- "true"
- "false"
type: boolean
show_subquestion_if: false
subquestions:
- variable: image
......@@ -35,23 +32,22 @@ questions:
default: "false"
description: "show memcached configurations(ref: https://github.com/memcached/memcached/wiki/ConfiguringServer#commandline-arguments)"
label: Set Advanced Memcached Configurations
type: enum
options:
- "true"
- "false"
type: boolean
show_subquestion_if: true
subquestions:
- variable: memcached.maxItemMemory
default: "64"
description: "max memory to use for items(in MB), from 1-65535"
type: string
label: max_memory
label: max_memory(MB)
required: true
- variable: memcached.verbosity
default: "v"
description: "Verbosity level (v, vv, or vvv) "
type: enum
label: verbosity level
label: Verbosity Level
options:
- "v"
- "vv"
- "vvv"
required: true
......@@ -6,10 +6,7 @@ questions:
default: "true"
description: "Use default Docker image"
label: Use Default Image
type: enum
options:
- "true"
- "false"
type: boolean
show_subquestion_if: false
subquestions:
- variable: installImage.repository
......@@ -53,11 +50,8 @@ questions:
- variable: auth.enabled
default: "false"
description: "If true, keyfile access control is enabled"
type: enum
options:
- "true"
- "false"
label: Auth Enabled
type: boolean
label: Enable Auth
required: true
show_subquestion_if: true
subquestions:
......@@ -82,10 +76,7 @@ questions:
- variable: persistentVolume.enabled
default: "false"
description: "Enable persistent volume for MongoDB"
type: enum
options:
- "true"
- "false"
type: boolean
required: true
label: MongoDB Persistent Volume Enabled
show_subquestion_if: true
......@@ -99,4 +90,4 @@ questions:
default: ""
description: "If unndefined or set to null, using the default storageClass. default to null"
type: storageclass
label: Default Storage Class for MongoDB
label: Storage Class for MongoDB
......@@ -6,10 +6,7 @@ questions:
default: "true"
description: "Use default Docker image"
label: Use Default Image
type: enum
options:
- "true"
- "false"
type: boolean
show_subquestion_if: false
subquestions:
- variable: image.registry
......@@ -27,28 +24,31 @@ questions:
description: "MongoDB image tag"
type: string
label: Image Tag
- variable: mongodbRootPassword
default: ""
description: "Password for the root user, defaults to a random 10-character alphanumeric string if not set"
type: password
label: MongoDB Root Password
- variable: mongodbUsername
default: ""
description: "Username of new user to create."
type: string
label: MongoDB User
required: true
- variable: mongodbPassword
default: ""
description: "Password for mongodb user, defaults to a random 10-character alphanumeric string if not set"
type: password
label: MongoDB Password
- variable: mongodbDatabase
default: ""
description: "Database name to create"
type: string
label: MongoDB Database
- variable: auth.enabled
default: "false"
description: "Enabling access control on a MongoDB deployment enforces authentication, requiring users to identify themselves"
type: boolean
label: Enable Auth
required: true
show_subquestion_if: true
subquestions:
- variable: mongodbUsername
default: "admin"
description: "Username of new user to create."
type: string
label: MongoDB User
required: true
- variable: mongodbPassword
default: ""
description: "Password for mongodb user, defaults to a random 10-character alphanumeric string if not set"
type: password
label: MongoDB Password
- variable: mongodbDatabase
default: ""
description: "Database name to create"
type: string
label: MongoDB Database
required: true
- variable: service.type
default: "ClusterIP"
description: "MongoDB K8s Service type"
......@@ -68,10 +68,7 @@ questions:
- variable: persistence.enabled
default: "false"
description: "Enable persistent volume for MongoDB"
type: enum
options:
- "true"
- "false"
type: boolean
required: true
label: MongoDB Persistent Volume Enabled
show_subquestion_if: true
......@@ -81,8 +78,9 @@ questions:
description: "MongoDB Persistent Volume Size"
type: string
label: MongoDB Volume Size
required: true
- variable: persistence.storageClass
default: ""
description: "If unndefined or set to null, using the default storageClass. default to null"
type: storageclass
label: Default Storage Class for MongoDB
label: Storage Class for MongoDB
......@@ -6,10 +6,7 @@ questions:
default: "true"
description: "Use default Docker image"
label: Use Default Image
type: enum
options:
- "true"
- "false"
type: boolean
show_subquestion_if: false
subquestions:
- variable: image
......@@ -47,10 +44,7 @@ questions:
- variable: persistence.enabled
default: "false"
description: "Enable persistence using PVC"
type: enum
options:
- "true"
- "false"
type: boolean
required: true
label: Persistent Volume Enabled
show_subquestion_if: true
......
......@@ -6,10 +6,7 @@ questions:
default: "true"
description: "Use default Docker image"
label: Use Default Image
type: enum
options:
- "true"
- "false"
type: boolean
show_subquestion_if: false
subquestions:
- variable: image
......@@ -32,10 +29,7 @@ questions:
- variable: auth
default: "false"
description: "Configures redis with Auth"
type: enum
options:
- "true"
- "false"
type: boolean
required: true
label: Redis Auth Enabled
show_subquestion_if: true
......
......@@ -6,10 +6,7 @@ questions:
default: "true"
description: "Use default Docker image"
label: Use Default Image
type: enum
options:
- "true"
- "false"
type: boolean
show_subquestion_if: false
subquestions:
- variable: image.registry
......@@ -31,10 +28,7 @@ questions:
default: "true"
description: "Use master-slave topology"
label: Use master-slave topology
type: enum
options:
- "true"
- "false"
type: boolean
show_subquestion_if: true
subquestions:
- variable: cluster.slaveCount
......@@ -45,10 +39,7 @@ questions:
- variable: usePassword
default: "true"
description: "Use password authentication"
type: enum
options:
- "true"
- "false"
type: boolean
required: true
label: Enable Redis Password
show_subquestion_if: true
......@@ -61,10 +52,7 @@ questions:
- variable: master.persistence.enabled
default: "false"
description: "Enable persistence volume for Redis"
type: enum
options:
- "true"
- "false"
type: boolean
required: true
label: Persistent Volume Enabled
show_subquestion_if: true
......
......@@ -6,10 +6,7 @@ questions:
default: "true"
description: "Use default Docker image"
label: Use Default Image
type: enum
options:
- "true"
- "false"
type: boolean
show_subquestion_if: false
subquestions:
- variable: image.registry
......@@ -47,10 +44,7 @@ questions:
- variable: mariadb.enabled
default: "true"
description: "Whether to deploy a mariadb server to satisfy the applications database requirements. To use an external database set this to false and configure the externalDatabase parameters"
type: enum
options:
- "true"
- "false"
type: boolean
required: true
label: Install MariaDB
show_subquestion_if: true
......@@ -103,10 +97,7 @@ questions:
- variable: mariadb.persistence.enabled
default: "false"
description: "Enable persistent volume for MariaDB"
type: enum
options:
- "true"
- "false"
type: boolean
required: true
label: MariaDB Persistent Volume Enabled
show_if: "mariadb.enabled=true"
......@@ -125,10 +116,7 @@ questions:
- variable: persistence.enabled
default: "false"
description: "Enable persistent volume for Wordpress"
type: enum
options:
- "true"
- "false"
type: boolean
required: true
label: Wordpress Persistent Volume Enabled
show_subquestion_if: true
......@@ -144,10 +132,11 @@ questions:
type: storageclass
label: Default Storage Class for WordPress
- variable: serviceType
default: "LoadBalancer"
default: "NodePort"
description: "Wordpress Service type"
type: enum
options:
- "ClusterIP"
- "NodePort"
- "LoadBalancer"
required: true
......@@ -167,10 +156,7 @@ questions:
- variable: ingress.enabled
default: "false"
description: "Enable ingress controller resource"
type: enum
options:
- "true"
- "false"
type: boolean
label: Enable External Access
show_subquestion_if: true
subquestions:
......
{{- if .Values.mariadb.enabled }}
apiVersion: v1
kind: Pod
metadata:
name: "{{ .Release.Name }}-credentials-test"
annotations:
"helm.sh/hook": test-success
spec:
containers:
- name: {{ .Release.Name }}-credentials-test
image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
env:
- name: MARIADB_HOST
value: {{ template "mariadb.fullname" . }}
- name: MARIADB_PORT
value: "3306"
- name: WORDPRESS_DATABASE_NAME
value: {{ default "" .Values.mariadb.mariadbDatabase | quote }}
- name: WORDPRESS_DATABASE_USER
value: {{ default "" .Values.mariadb.mariadbUser | quote }}
- name: WORDPRESS_DATABASE_PASSWORD
valueFrom:
secretKeyRef:
name: {{ template "mariadb.fullname" . }}
key: mariadb-password
command: ["sh", "-c", "mysql --host=$MARIADB_HOST --port=$MARIADB_PORT --user=$WORDPRESS_DATABASE_USER --password=$WORDPRESS_DATABASE_PASSWORD"]
restartPolicy: Never
{{- end }}
......@@ -28,7 +28,7 @@ questions:
required: true
label: Default Storage Class
- variable: persistence.flexvolumePath
default: ""
description: " for GKE uses /home/kubernetes/flexvolume/ instead, User can find the correct directory by running ps aux|grep kubelet on the host and check the --volume-plugin-dir parameter. If there is none, the default /usr/libexec/kubernetes/kubelet-plugins/volume/exec/ will be used."
default: "/usr/libexec/kubernetes/kubelet-plugins/volume/exec/"
description: "for GKE uses /home/kubernetes/flexvolume/ instead, User can find the correct directory by running ps aux|grep kubelet on the host and check the --volume-plugin-dir parameter. If there is none, the default /usr/libexec/kubernetes/kubelet-plugins/volume/exec/ will be used."
type: string
label: Longhorn Flexvolume Path
apiVersion: v1
description: nfs provisioner
name: nfs
description: nfs-provisioner is an out-of-tree dynamic provisioner for Kubernetes.
name: nfs-provisioner
version: 0.1.0
icon: https://cdn1.iconfinder.com/data/icons/bnw/128x128/devices/nfs_mount.png
......@@ -32,6 +32,6 @@ questions:
label: Set to Default StorageClass
- variable: persistence.hostPath
default: "/srv"
description: "nfs host path (read and write permission to the configured path is required)"
description: "for GKE uses /home/kubernetes/nfs/ instead, custom nfs host path read and write permission are required, default to /srv"
type: string
label: NFS Host Path
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment