Commit 8819477e by Guangbo Chen

added group to charts and disable ingress for some charts

parent 33e3b12f
...@@ -8,6 +8,7 @@ questions: ...@@ -8,6 +8,7 @@ questions:
label: Use Default Image label: Use Default Image
type: boolean type: boolean
show_subquestion_if: false show_subquestion_if: false
group: "Container Images"
subquestions: subquestions:
- variable: etcdCluster.image.repository - variable: etcdCluster.image.repository
default: "quay.io/coreos/etcd" default: "quay.io/coreos/etcd"
...@@ -56,6 +57,7 @@ questions: ...@@ -56,6 +57,7 @@ questions:
label: Deploy the etcd Cluster Operator label: Deploy the etcd Cluster Operator
type: boolean type: boolean
show_subquestion_if: true show_subquestion_if: true
group: "Etcd Operator"
subquestions: subquestions:
- variable: etcdOperator.clusterwide.enabled - variable: etcdOperator.clusterwide.enabled
default: false default: false
...@@ -75,6 +77,7 @@ questions: ...@@ -75,6 +77,7 @@ questions:
label: Deploy the etcd Backup Operator label: Deploy the etcd Backup Operator
type: boolean type: boolean
show_subquestion_if: true show_subquestion_if: true
group: "Backup Operator"
subquestions: subquestions:
- variable: backupOperator.name - variable: backupOperator.name
default: "etcd-backup-operator" default: "etcd-backup-operator"
...@@ -107,6 +110,7 @@ questions: ...@@ -107,6 +110,7 @@ questions:
description: "Deploy the etcd restore operator, one time deployment, delete once completed" description: "Deploy the etcd restore operator, one time deployment, delete once completed"
label: Deploy the etcd Restore Operator label: Deploy the etcd Restore Operator
type: boolean type: boolean
group: "Restore Operator"
show_subquestion_if: true show_subquestion_if: true
subquestions: subquestions:
- variable: restoreOperator.name - variable: restoreOperator.name
...@@ -133,6 +137,7 @@ questions: ...@@ -133,6 +137,7 @@ questions:
label: Create Kubernetes Custom Resources (EtcdCluster, EtcdBackup, EtcdRestore) label: Create Kubernetes Custom Resources (EtcdCluster, EtcdBackup, EtcdRestore)
type: boolean type: boolean
show_subquestion_if: true show_subquestion_if: true
group: "Etcd Cluster"
subquestions: subquestions:
- variable: customResources.createEtcdClusterCRD - variable: customResources.createEtcdClusterCRD
default: "true" default: "true"
...@@ -159,11 +164,13 @@ questions: ...@@ -159,11 +164,13 @@ questions:
type: string type: string
required: true required: true
show_if: "createCustomResources=true" show_if: "createCustomResources=true"
group: "Etcd Cluster"
- variable: etcdCluster.size - variable: etcdCluster.size
default: "3" default: "3"
description: "etcd cluster size" description: "etcd cluster size"
label: Etcd Cluster Size label: Etcd Cluster Size
type: enum type: enum
group: "Etcd Cluster"
options: options:
- "3" - "3"
- "5" - "5"
...@@ -179,6 +186,7 @@ questions: ...@@ -179,6 +186,7 @@ questions:
type: string type: string
show_if: "createCustomResources=true" show_if: "createCustomResources=true"
required: true required: true
group: "Etcd Cluster"
- variable: etcdCluster.enableTLS - variable: etcdCluster.enableTLS
default: "false" default: "false"
description: "Enable use of TLS" description: "Enable use of TLS"
...@@ -187,6 +195,7 @@ questions: ...@@ -187,6 +195,7 @@ questions:
show_subquestion_if: true show_subquestion_if: true
show_if: "createCustomResources=true" show_if: "createCustomResources=true"
required: true required: true
group: "Etcd Cluster"
subquestions: subquestions:
- variable: etcdCluster.tls.static.member.peerSecret - variable: etcdCluster.tls.static.member.peerSecret
default: "" default: ""
......
...@@ -7,6 +7,7 @@ questions: ...@@ -7,6 +7,7 @@ questions:
label: Use Default Images label: Use Default Images
type: boolean type: boolean
show_subquestion_if: false show_subquestion_if: false
group: "Container Images"
subquestions: subquestions:
- variable: image.registry - variable: image.registry
default: "docker.io" default: "docker.io"
...@@ -29,29 +30,34 @@ questions: ...@@ -29,29 +30,34 @@ questions:
type: string type: string
label: Magento Host URL label: Magento Host URL
required: true required: true
group: "Magento Settings"
- variable: magentoUsername - variable: magentoUsername
default: "user" default: "user"
description: "Username for the application" description: "Username for the application"
type: string type: string
label: Magento Username label: Magento Username
required: true required: true
group: "Magento Settings"
- variable: magentoPassword - variable: magentoPassword
default: "" default: ""
description: "Application password(defualt random 10 character long alphanumeric string if not set)" description: "Application password(defualt random 10 character long alphanumeric string if not set)"
type: password type: password
label: Magento User Password label: Magento User Password
group: "Magento Settings"
- variable: magentoEmail - variable: magentoEmail
default: "user@example.com" default: "user@example.com"
description: "Admin email" description: "Admin email"
label: Magento Email label: Magento Email
type: string type: string
required: true required: true
group: "Magento Settings"
- variable: mariadb.enabled - variable: mariadb.enabled
default: "true" 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" 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: boolean type: boolean
required: true required: true
label: Install MariaDB label: Install MariaDB
group: "Database Settings"
subquestions: subquestions:
- variable: mariadb.mariadbDatabase - variable: mariadb.mariadbDatabase
default: "magento" default: "magento"
...@@ -75,30 +81,35 @@ questions: ...@@ -75,30 +81,35 @@ questions:
label: External Database Host label: External Database Host
show_if: "mariadb.enabled=false" show_if: "mariadb.enabled=false"
subquestions: subquestions:
group: "Database Settings"
- variable: externalDatabase.user - variable: externalDatabase.user
default: "" default: ""
description: "Existing username in the external DB" description: "Existing username in the external DB"
type: string type: string
label: External Database Username label: External Database Username
show_if: "mariadb.enabled=false" show_if: "mariadb.enabled=false"
group: "Database Settings"
- variable: externalDatabase.password - variable: externalDatabase.password
default: "" default: ""
description: "External database password" description: "External database password"
type: password type: password
label: External Database Password label: External Database Password
show_if: "mariadb.enabled=false" show_if: "mariadb.enabled=false"
group: "Database Settings"
- variable: externalDatabase.database - variable: externalDatabase.database
default: "" default: ""
description: "Name of the existing database" description: "Name of the existing database"
type: string type: string
label: External Database label: External Database
show_if: "mariadb.enabled=false" show_if: "mariadb.enabled=false"
group: "Database Settings"
- variable: externalDatabase.port - variable: externalDatabase.port
default: "3306" default: "3306"
description: "External database port number " description: "External database port number "
type: string type: string
label: External Database Port label: External Database Port
show_if: "mariadb.enabled=false" show_if: "mariadb.enabled=false"
group: "Database Settings"
- variable: mariadb.persistence.enabled - variable: mariadb.persistence.enabled
default: "false" default: "false"
description: "Enable persistence using PVC of MariaDB" description: "Enable persistence using PVC of MariaDB"
...@@ -107,6 +118,7 @@ questions: ...@@ -107,6 +118,7 @@ questions:
label: MariaDB Persistent Volume Enabled label: MariaDB Persistent Volume Enabled
show_if: "mariadb.enabled=true" show_if: "mariadb.enabled=true"
show_subquestion_if: true show_subquestion_if: true
group: "Database Settings"
subquestions: subquestions:
- variable: mariadb.persistence.size - variable: mariadb.persistence.size
default: "8Gi" default: "8Gi"
...@@ -122,6 +134,7 @@ questions: ...@@ -122,6 +134,7 @@ questions:
- variable: serviceType - variable: serviceType
default: "ClusterIP" default: "ClusterIP"
description: "Magento Service type" description: "Magento Service type"
group: "Magento Settings"
type: enum type: enum
options: options:
- "ClusterIP" - "ClusterIP"
...@@ -139,6 +152,7 @@ questions: ...@@ -139,6 +152,7 @@ questions:
default: "default" default: "default"
description: "Magento mode options: default, production, developer." description: "Magento mode options: default, production, developer."
type: enum type: enum
group: "Magento Settings"
options: options:
- "default" - "default"
- "production" - "production"
...@@ -151,6 +165,7 @@ questions: ...@@ -151,6 +165,7 @@ questions:
required: true required: true
label: Magento Persistent Volume Enabled label: Magento Persistent Volume Enabled
show_subquestion_if: true show_subquestion_if: true
group: "Magento Settings"
subquestions: subquestions:
- variable: persistence.magento.size - variable: persistence.magento.size
default: "8Gi" default: "8Gi"
......
...@@ -8,6 +8,7 @@ questions: ...@@ -8,6 +8,7 @@ questions:
label: Use Default Image label: Use Default Image
type: boolean type: boolean
show_subquestion_if: false show_subquestion_if: false
group: "Container Images"
subquestions: subquestions:
- variable: image.repository - variable: image.repository
default: "bitnami/mariadb" default: "bitnami/mariadb"
...@@ -38,6 +39,7 @@ questions: ...@@ -38,6 +39,7 @@ questions:
required: true required: true
label: Enable Authentication label: Enable Authentication
show_subquestion_if: true show_subquestion_if: true
group: "MariaDB Settings"
subquestions: subquestions:
- variable: mariadbUser - variable: mariadbUser
default: "admin" default: "admin"
...@@ -56,6 +58,7 @@ questions: ...@@ -56,6 +58,7 @@ questions:
type: string type: string
label: MariaDB Database label: MariaDB Database
required: true required: true
group: "MariaDB Settings"
- variable: service.type - variable: service.type
default: "ClusterIP" default: "ClusterIP"
description: "MariaDB K8s Service type" description: "MariaDB K8s Service type"
...@@ -65,8 +68,9 @@ questions: ...@@ -65,8 +68,9 @@ questions:
- "NodePort" - "NodePort"
required: true required: true
label: MariaDB Service Type label: MariaDB Service Type
show_if: "ingress.enabled=false" # show_if: "ingress.enabled=false"
show_subquestion_if: "NodePort" show_subquestion_if: "NodePort"
group: "MariaDB Settings"
subquestions: subquestions:
- variable: service.nodePort - variable: service.nodePort
default: "" default: ""
...@@ -82,6 +86,7 @@ questions: ...@@ -82,6 +86,7 @@ questions:
required: true required: true
label: Enable MariaDB Persistent Volume label: Enable MariaDB Persistent Volume
show_subquestion_if: true show_subquestion_if: true
group: "Persistent Volume"
subquestions: subquestions:
- variable: persistence.size - variable: persistence.size
default: "8Gi" default: "8Gi"
...@@ -100,16 +105,18 @@ questions: ...@@ -100,16 +105,18 @@ questions:
type: boolean type: boolean
required: true required: true
label: Enable Metrics label: Enable Metrics
- variable: ingress.enabled group: "MariaDB Settings"
default: "true" # - variable: ingress.enabled
description: "Expose app using Layer 7 Load Balancer - ingress" # default: "true"
type: boolean # description: "Expose app using Layer 7 Load Balancer - ingress"
label: Expose app using Layer 7 Load Balancer # type: boolean
show_subquestion_if: true # label: Expose app using Layer 7 Load Balancer
subquestions: # show_subquestion_if: true
- variable: ingress.host # group: "Layer 7 Load Balancer"
default: "xip.io" # subquestions:
description: "layer 7 Load Balancer hostname" # - variable: ingress.host
type: hostname # default: "xip.io"
required: true # description: "layer 7 Load Balancer hostname"
label: Layer 7 Load Balancer Hostname # type: hostname
# required: true
# label: Layer 7 Load Balancer Hostname
...@@ -7,6 +7,7 @@ questions: ...@@ -7,6 +7,7 @@ questions:
label: Use Default Images label: Use Default Images
type: boolean type: boolean
show_subquestion_if: false show_subquestion_if: false
group: "Container Images"
subquestions: subquestions:
- variable: image - variable: image
default: "memcached" default: "memcached"
...@@ -24,6 +25,7 @@ questions: ...@@ -24,6 +25,7 @@ questions:
type: string type: string
required: true required: true
label: Memcached Replicas label: Memcached Replicas
group: "Memcached Settings"
- variable: AntiAffinity - variable: AntiAffinity
default: "soft" default: "soft"
description: "Select AnitAffinity as either hard or soft, default is soft" description: "Select AnitAffinity as either hard or soft, default is soft"
...@@ -33,12 +35,14 @@ questions: ...@@ -33,12 +35,14 @@ questions:
- "hard" - "hard"
required: true required: true
label: AnitAffinity label: AnitAffinity
group: "Memcached Settings"
- variable: showMemcachedOptions - variable: showMemcachedOptions
default: "false" default: "false"
description: "Show memcached configurations(ref: https://github.com/memcached/memcached/wiki/ConfiguringServer#commandline-arguments)" description: "Show memcached configurations(ref: https://github.com/memcached/memcached/wiki/ConfiguringServer#commandline-arguments)"
label: Set Advanced Memcached Configurations label: Set Advanced Memcached Configurations
type: boolean type: boolean
show_subquestion_if: true show_subquestion_if: true
group: "Memcached Settings"
subquestions: subquestions:
- variable: memcached.maxItemMemory - variable: memcached.maxItemMemory
default: "64" default: "64"
...@@ -56,16 +60,17 @@ questions: ...@@ -56,16 +60,17 @@ questions:
- "vv" - "vv"
- "vvv" - "vvv"
required: true required: true
- variable: ingress.enabled # - variable: ingress.enabled
default: "true" # default: "true"
description: "Expose app using Layer 7 Load Balancer - ingress" # description: "Expose app using Layer 7 Load Balancer - ingress"
type: boolean # type: boolean
label: Expose app using Layer 7 Load Balancer # label: Expose app using Layer 7 Load Balancer
show_subquestion_if: true # show_subquestion_if: true
subquestions: # group: "Layer 7 Load Balancer"
- variable: ingress.host # subquestions:
default: "xip.io" # - variable: ingress.host
description: "layer 7 Load Balancer hostname" # default: "xip.io"
type: hostname # description: "layer 7 Load Balancer hostname"
required: true # type: hostname
label: Layer 7 Load Balancer Hostname # required: true
# label: Layer 7 Load Balancer Hostname
...@@ -8,6 +8,7 @@ questions: ...@@ -8,6 +8,7 @@ questions:
label: Use Default Images label: Use Default Images
type: boolean type: boolean
show_subquestion_if: false show_subquestion_if: false
group: "Container Images"
subquestions: subquestions:
- variable: installImage.repository - variable: installImage.repository
default: "k8s.gcr.io/mongodb-install" default: "k8s.gcr.io/mongodb-install"
...@@ -35,18 +36,21 @@ questions: ...@@ -35,18 +36,21 @@ questions:
type: string type: string
label: Number of Replicas label: Number of Replicas
required: true required: true
group: "MongoDB Settings"
- variable: port - variable: port
default: "27017" default: "27017"
description: "MongoDB port" description: "MongoDB port"
type: string type: string
label: MongoDB port label: MongoDB port
required: true required: true
group: "MongoDB Settings"
- variable: replicaSetName - variable: replicaSetName
default: "rs0" default: "rs0"
description: "The name of the replica set" description: "The name of the replica set"
type: string type: string
label: ReplicaSet Name label: ReplicaSet Name
required: true required: true
group: "MongoDB Settings"
- variable: auth.enabled - variable: auth.enabled
default: "false" default: "false"
description: "If true, keyfile access control is enabled" description: "If true, keyfile access control is enabled"
...@@ -54,6 +58,7 @@ questions: ...@@ -54,6 +58,7 @@ questions:
label: Enable Auth label: Enable Auth
required: true required: true
show_subquestion_if: true show_subquestion_if: true
group: "MongoDB Settings"
subquestions: subquestions:
- variable: auth.key - variable: auth.key
default: "my secret key" default: "my secret key"
...@@ -80,6 +85,7 @@ questions: ...@@ -80,6 +85,7 @@ questions:
required: true required: true
label: MongoDB Persistent Volume Enabled label: MongoDB Persistent Volume Enabled
show_subquestion_if: true show_subquestion_if: true
group: "Persistent Volume"
subquestions: subquestions:
- variable: persistentVolume.size - variable: persistentVolume.size
default: "10Gi" default: "10Gi"
......
...@@ -8,6 +8,7 @@ questions: ...@@ -8,6 +8,7 @@ questions:
label: Use Default Images label: Use Default Images
type: boolean type: boolean
show_subquestion_if: false show_subquestion_if: false
group: "Container Images"
subquestions: subquestions:
- variable: image.repository - variable: image.repository
default: "bitnami/mongodb" default: "bitnami/mongodb"
...@@ -26,6 +27,7 @@ questions: ...@@ -26,6 +27,7 @@ questions:
label: Enable Auth label: Enable Auth
required: true required: true
show_subquestion_if: true show_subquestion_if: true
group: "MongoDB Settings"
subquestions: subquestions:
- variable: mongodbUsername - variable: mongodbUsername
default: "admin" default: "admin"
...@@ -48,12 +50,13 @@ questions: ...@@ -48,12 +50,13 @@ questions:
default: "ClusterIP" default: "ClusterIP"
description: "MongoDB K8s Service type" description: "MongoDB K8s Service type"
type: enum type: enum
group: "MongoDB Settings"
options: options:
- "ClusterIP" - "ClusterIP"
- "NodePort" - "NodePort"
required: true required: true
label: MongoDB Service Type label: MongoDB Service Type
show_if: "ingress.enabled=false" # show_if: "ingress.enabled=false"
show_subquestion_if: "NodePort" show_subquestion_if: "NodePort"
subquestions: subquestions:
- variable: service.nodePort - variable: service.nodePort
...@@ -70,6 +73,7 @@ questions: ...@@ -70,6 +73,7 @@ questions:
required: true required: true
label: MongoDB Persistent Volume Enabled label: MongoDB Persistent Volume Enabled
show_subquestion_if: true show_subquestion_if: true
group: "Persistent Volume"
subquestions: subquestions:
- variable: persistence.size - variable: persistence.size
default: "8Gi" default: "8Gi"
...@@ -82,16 +86,17 @@ questions: ...@@ -82,16 +86,17 @@ questions:
description: "If undefined or set to null, using the default storageClass. Defaults to null." description: "If undefined or set to null, using the default storageClass. Defaults to null."
type: storageclass type: storageclass
label: Storage Class for MongoDB label: Storage Class for MongoDB
- variable: ingress.enabled # - variable: ingress.enabled
default: "true" # default: "true"
description: "Expose app using Layer 7 Load Balancer - ingress" # description: "Expose app using Layer 7 Load Balancer - ingress"
type: boolean # type: boolean
label: Expose app using Layer 7 Load Balancer # label: Expose app using Layer 7 Load Balancer
show_subquestion_if: true # show_subquestion_if: true
subquestions: # group: "Layer 7 Load Balancer"
- variable: ingress.host # subquestions:
default: "xip.io" # - variable: ingress.host
description: "layer 7 Load Balancer hostname" # default: "xip.io"
type: hostname # description: "layer 7 Load Balancer hostname"
required: true # type: hostname
label: Layer 7 Load Balancer Hostname # required: true
# label: Layer 7 Load Balancer Hostname
...@@ -8,6 +8,7 @@ questions: ...@@ -8,6 +8,7 @@ questions:
label: Use Default Images label: Use Default Images
type: boolean type: boolean
show_subquestion_if: false show_subquestion_if: false
group: "Container Images"
subquestions: subquestions:
- variable: image - variable: image
default: "mysql" default: "mysql"
...@@ -25,17 +26,20 @@ questions: ...@@ -25,17 +26,20 @@ questions:
type: string type: string
required: true required: true
label: MySQL Database label: MySQL Database
group: "MySQL Settings"
- variable: mysqlUser - variable: mysqlUser
default: "" default: ""
description: "Username of user to create" description: "Username of user to create"
type: string type: string
required: true required: true
label: MySQL Username label: MySQL Username
group: "MySQL Settings"
- variable: mysqlPassword - variable: mysqlPassword
default: "" default: ""
description: "MySQL Password for the new user, defaults to a random 10-character alphanumeric string if not set" description: "MySQL Password for the new user, defaults to a random 10-character alphanumeric string if not set"
type: password type: password
label: MySQL Password label: MySQL Password
group: "MySQL Settings"
- variable: persistence.enabled - variable: persistence.enabled
default: "false" default: "false"
description: "Enable persistence using PVC" description: "Enable persistence using PVC"
...@@ -43,6 +47,7 @@ questions: ...@@ -43,6 +47,7 @@ questions:
required: true required: true
label: Persistent Volume Enabled label: Persistent Volume Enabled
show_subquestion_if: true show_subquestion_if: true
group: "Persistent Volume"
subquestions: subquestions:
- variable: persistence.size - variable: persistence.size
default: "8Gi" default: "8Gi"
...@@ -61,16 +66,18 @@ questions: ...@@ -61,16 +66,18 @@ questions:
type: string type: string
label: MySQL NodePort number label: MySQL NodePort number
required: true required: true
group: "MySQL Settings"
- variable: service.type - variable: service.type
default: "ClusterIP" default: "ClusterIP"
description: "MySQL K8s Service type" description: "MySQL K8s Service type"
type: enum type: enum
group: "MySQL Settings"
options: options:
- "ClusterIP" - "ClusterIP"
- "NodePort" - "NodePort"
required: true required: true
label: MySQL Service Type label: MySQL Service Type
show_if: "ingress.enabled=false" # show_if: "ingress.enabled=false"
show_subquestion_if: "NodePort" show_subquestion_if: "NodePort"
subquestions: subquestions:
- variable: service.nodePort - variable: service.nodePort
...@@ -80,16 +87,17 @@ questions: ...@@ -80,16 +87,17 @@ questions:
min: 30000 min: 30000
max: 32767 max: 32767
label: Service NodePort number label: Service NodePort number
- variable: ingress.enabled # - variable: ingress.enabled
default: "true" # default: "true"
description: "Expose app using Layer 7 Load Balancer - ingress" # description: "Expose app using Layer 7 Load Balancer - ingress"
type: boolean # type: boolean
label: Expose app using Layer 7 Load Balancer # label: Expose app using Layer 7 Load Balancer
show_subquestion_if: true # show_subquestion_if: true
subquestions: # group: "Layer 7 Load Balancer"
- variable: ingress.host # subquestions:
default: "xip.io" # - variable: ingress.host
description: "layer 7 Load Balancer hostname" # default: "xip.io"
type: hostname # description: "layer 7 Load Balancer hostname"
required: true # type: hostname
label: Layer 7 Load Balancer Hostname # required: true
# label: Layer 7 Load Balancer Hostname
...@@ -8,23 +8,37 @@ questions: ...@@ -8,23 +8,37 @@ questions:
label: Use Default Images label: Use Default Images
type: boolean type: boolean
show_subquestion_if: false show_subquestion_if: false
group: "Container Images"
subquestions: subquestions:
- variable: image.repository - variable: image.repository
default: "bitnami/redis" default: "bitnami/redis"
description: "Docker image name" description: "Redis image name"
type: string type: string
label: Redis Image Name label: Redis Image Name
- variable: image.tag - variable: image.tag
default: "4.0.9" default: "4.0.9"
description: "Docker image tag" description: "Redis image tag"
type: string type: string
label: Redis Image Tag label: Redis Image Tag
- variable: metrics.repository
default: "oliver006/redis_exporter"
description: "Metrics image name"
type: string
label: Metrics Image Name
show_if: "metrics.enabled=true"
- variable: image.tag
default: "v0.11"
description: "Metrics image tag"
type: string
label: Metrics Image Tag
show_if: "metrics.enabled=true"
- variable: cluster.enabled - variable: cluster.enabled
default: "true" default: "true"
description: "Use leader-follower topology" description: "Use leader-follower topology"
label: Clustered Topology label: Clustered Topology
type: boolean type: boolean
show_subquestion_if: true show_subquestion_if: true
group: "Redis Slave Settings"
subquestions: subquestions:
- variable: cluster.slaveCount - variable: cluster.slaveCount
default: "3" default: "3"
...@@ -38,6 +52,7 @@ questions: ...@@ -38,6 +52,7 @@ questions:
required: true required: true
label: Enable Redis Password label: Enable Redis Password
show_subquestion_if: true show_subquestion_if: true
group: "Redis Master Settings"
subquestions: subquestions:
- variable: password - variable: password
default: "" default: ""
...@@ -51,6 +66,7 @@ questions: ...@@ -51,6 +66,7 @@ questions:
required: true required: true
label: Persistent Volume Enabled label: Persistent Volume Enabled
show_subquestion_if: true show_subquestion_if: true
group: "Redis Master Settings"
subquestions: subquestions:
- variable: master.persistence.size - variable: master.persistence.size
default: "8Gi" default: "8Gi"
...@@ -67,29 +83,31 @@ questions: ...@@ -67,29 +83,31 @@ questions:
description: "If undefined or null, uses the default StorageClass. Defaults to null." description: "If undefined or null, uses the default StorageClass. Defaults to null."
type: storageclass type: storageclass
label: Default Storage Class label: Default Storage Class
- variable: ingress.enabled # - variable: ingress.enabled
default: "true" # default: "true"
description: "Expose app using Layer 7 Load Balancer - ingress" # description: "Expose app using Layer 7 Load Balancer - ingress"
type: boolean # type: boolean
label: Expose app using Layer 7 Load Balancer # label: Expose app using Layer 7 Load Balancer
show_subquestion_if: true # show_subquestion_if: true
subquestions: # group: "Layer 7 Load Balancer"
- variable: ingress.host # subquestions:
default: "xip.io" # - variable: ingress.host
description: "layer 7 Load Balancer hostname" # default: "xip.io"
type: hostname # description: "layer 7 Load Balancer hostname"
required: true # type: hostname
label: Layer 7 Load Balancer Hostname # required: true
# label: Layer 7 Load Balancer Hostname
- variable: slave.service.type - variable: slave.service.type
default: "ClusterIP" default: "ClusterIP"
description: "Redis slave service type" description: "Redis slave service type"
type: enum type: enum
group: "Redis Slave Settings"
options: options:
- "ClusterIP" - "ClusterIP"
- "NodePort" - "NodePort"
required: true required: true
label: Redis Slave Service Type label: Redis Slave Service Type
show_if: "ingress.enabled=false" # show_if: "ingress.enabled=false"
show_subquestion_if: "NodePort" show_subquestion_if: "NodePort"
subquestions: subquestions:
- variable: slave.service.nodePort - variable: slave.service.nodePort
...@@ -103,12 +121,13 @@ questions: ...@@ -103,12 +121,13 @@ questions:
default: "ClusterIP" default: "ClusterIP"
description: "Redis master service type" description: "Redis master service type"
type: enum type: enum
group: "Redis Master Settings"
options: options:
- "ClusterIP" - "ClusterIP"
- "NodePort" - "NodePort"
required: true required: true
label: Redis Master Service Type label: Redis Master Service Type
show_if: "ingress.enabled=false" # show_if: "ingress.enabled=false"
show_subquestion_if: "NodePort" show_subquestion_if: "NodePort"
subquestions: subquestions:
- variable: master.service.nodePort - variable: master.service.nodePort
......
...@@ -27,7 +27,7 @@ metrics: ...@@ -27,7 +27,7 @@ metrics:
# prometheus.io/scrape: "true" # prometheus.io/scrape: "true"
# prometheus.io/port: "9121" # prometheus.io/port: "9121"
image: image:
registry: docker.io # registry: docker.io
repository: oliver006/redis_exporter repository: oliver006/redis_exporter
tag: v0.11 tag: v0.11
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
......
...@@ -8,6 +8,7 @@ questions: ...@@ -8,6 +8,7 @@ questions:
label: Use Default Image label: Use Default Image
type: boolean type: boolean
show_subquestion_if: false show_subquestion_if: false
group: "Container Images"
subquestions: subquestions:
- variable: image.repository - variable: image.repository
default: "bitnami/wordpress" default: "bitnami/wordpress"
...@@ -35,17 +36,20 @@ questions: ...@@ -35,17 +36,20 @@ questions:
type: string type: string
required: true required: true
label: WordPress Usernname label: WordPress Usernname
group: "WordPress Settings"
- variable: wordpressPassword - variable: wordpressPassword
default: "" default: ""
description: "Application Password(defualt random 10 character long alphanumeric string if not set)" description: "Application Password(defualt random 10 character long alphanumeric string if not set)"
type: password type: password
label: WordPress Password label: WordPress Password
group: "WordPress Settings"
- variable: wordpressEmail - variable: wordpressEmail
default: "user@example.com" default: "user@example.com"
description: "Admin email" description: "Admin email"
type: string type: string
required: true required: true
label: WordPress Admin Email label: WordPress Admin Email
group: "WordPress Settings"
- variable: mariadb.enabled - variable: mariadb.enabled
default: "true" default: "true"
description: "Deploy a database server as part of this deployment, or set to false and configure an external database connection." description: "Deploy a database server as part of this deployment, or set to false and configure an external database connection."
...@@ -53,6 +57,7 @@ questions: ...@@ -53,6 +57,7 @@ questions:
required: true required: true
label: Install MariaDB label: Install MariaDB
show_subquestion_if: true show_subquestion_if: true
group: "Database Settings"
subquestions: subquestions:
- variable: mariadb.mariadbDatabase - variable: mariadb.mariadbDatabase
default: "wordpress" default: "wordpress"
...@@ -75,30 +80,35 @@ questions: ...@@ -75,30 +80,35 @@ questions:
type: string type: string
label: External Database Host label: External Database Host
show_if: "mariadb.enabled=false" show_if: "mariadb.enabled=false"
group: "Database Settings"
- variable: externalDatabase.user - variable: externalDatabase.user
default: "" default: ""
description: "Existing username in the external DB" description: "Existing username in the external DB"
type: string type: string
label: External Database username label: External Database username
show_if: "mariadb.enabled=false" show_if: "mariadb.enabled=false"
group: "Database Settings"
- variable: externalDatabase.password - variable: externalDatabase.password
default: "" default: ""
description: "External database password" description: "External database password"
type: password type: password
label: External Database password label: External Database password
show_if: "mariadb.enabled=false" show_if: "mariadb.enabled=false"
group: "Database Settings"
- variable: externalDatabase.database - variable: externalDatabase.database
default: "" default: ""
description: "Name of the existing database" description: "Name of the existing database"
type: string type: string
label: External Database label: External Database
show_if: "mariadb.enabled=false" show_if: "mariadb.enabled=false"
group: "Database Settings"
- variable: externalDatabase.port - variable: externalDatabase.port
default: "3306" default: "3306"
description: "External database port number" description: "External database port number"
type: string type: string
label: External Database Port label: External Database Port
show_if: "mariadb.enabled=false" show_if: "mariadb.enabled=false"
group: "Database Settings"
- variable: mariadb.persistence.enabled - variable: mariadb.persistence.enabled
default: "false" default: "false"
description: "Enable persistent volume for MariaDB" description: "Enable persistent volume for MariaDB"
...@@ -107,6 +117,7 @@ questions: ...@@ -107,6 +117,7 @@ questions:
label: MariaDB Persistent Volume Enabled label: MariaDB Persistent Volume Enabled
show_if: "mariadb.enabled=true" show_if: "mariadb.enabled=true"
show_subquestion_if: true show_subquestion_if: true
group: "Database Settings"
subquestions: subquestions:
- variable: mariadb.persistence.size - variable: mariadb.persistence.size
default: "8Gi" default: "8Gi"
...@@ -125,6 +136,7 @@ questions: ...@@ -125,6 +136,7 @@ questions:
required: true required: true
label: WordPress Persistent Volume Enabled label: WordPress Persistent Volume Enabled
show_subquestion_if: true show_subquestion_if: true
group: "WordPress Settings"
subquestions: subquestions:
- variable: persistence.size - variable: persistence.size
default: "10Gi" default: "10Gi"
...@@ -148,6 +160,7 @@ questions: ...@@ -148,6 +160,7 @@ questions:
required: true required: true
label: WordPress Service Type label: WordPress Service Type
show_subquestion_if: "NodePort" show_subquestion_if: "NodePort"
group: "WordPress Settings"
subquestions: subquestions:
- variable: nodePorts.http - variable: nodePorts.http
default: "" default: ""
...@@ -169,6 +182,7 @@ questions: ...@@ -169,6 +182,7 @@ questions:
type: boolean type: boolean
label: Expose app using Layer 7 Load Balancer label: Expose app using Layer 7 Load Balancer
show_subquestion_if: true show_subquestion_if: true
group: "Layer 7 Load Balancer"
subquestions: subquestions:
- variable: ingress.hosts[0].name - variable: ingress.hosts[0].name
default: "xip.io" default: "xip.io"
......
categories: categories:
- storage - storage
questions: questions:
- variable: defaultImage
default: "true"
description: "Use default Docker image"
label: Use Default Image
type: enum
group: "Container Images"
options:
- "true"
- "false"
show_subquestion_if: false
subquestions:
- variable: image.longhorn.engine
default: "rancher/longhorn-engine"
description: "longhorn engine image name"
type: string
label: Longhorn Engine Image Name
- variable: image.longhorn.engineTag
default: "de88734"
description: "longhorn engineTag image tag"
type: string
label: Longhorn Engine Image Tag
- variable: image.longhorn.manager
default: "rancher/longhorn-manager"
description: "longhorn manager image name"
type: string
label: Longhorn Manager Image Name
- variable: image.longhorn.managerTag
default: "de88734"
description: "longhorn managerTag image tag"
type: string
label: Longhorn Manager Image Tag
- variable: image.longhorn.ui
default: "rancher/longhorn-ui"
description: "longhorn ui image name"
type: string
label: Longhorn UI Image Name
- variable: image.longhorn.uiTag
default: "de88734"
description: "longhorn uiTag image tag"
type: string
label: Longhorn UI Image Tag
- variable: service.ui.type - variable: service.ui.type
default: "ClusterIP" default: "ClusterIP"
description: "Define Longhorn UI service type" description: "Define Longhorn UI service type"
...@@ -11,6 +52,7 @@ questions: ...@@ -11,6 +52,7 @@ questions:
- "LoadBalancer" - "LoadBalancer"
label: Longhorn UI Service label: Longhorn UI Service
show_if: "ingress.enabled=false" show_if: "ingress.enabled=false"
group: "Longhorn Settings"
- variable: service.ui.nodePort - variable: service.ui.nodePort
default: "" default: ""
description: "NodePort port number(to set explicitly, choose port between 30000-32767)" description: "NodePort port number(to set explicitly, choose port between 30000-32767)"
...@@ -19,6 +61,7 @@ questions: ...@@ -19,6 +61,7 @@ questions:
max: 32767 max: 32767
show_if: "service.ui.type=NodePort" show_if: "service.ui.type=NodePort"
label: UI Service NodePort number label: UI Service NodePort number
group: "Longhorn Settings"
- variable: service.manager.type - variable: service.manager.type
default: "ClusterIP" default: "ClusterIP"
description: "Define Longhorn manager service type" description: "Define Longhorn manager service type"
...@@ -27,17 +70,20 @@ questions: ...@@ -27,17 +70,20 @@ questions:
- "ClusterIP" - "ClusterIP"
- "NodePort" - "NodePort"
label: Longhorn Manager Service label: Longhorn Manager Service
- variable: service.manager.nodePort show_subquestion_if: "NodePort"
default: "" group: "Longhorn Settings"
description: "NodePort port number(to set explicitly, choose port between 30000-32767)" subquestions:
type: int - variable: service.manager.nodePort
min: 30000 default: ""
max: 32767 description: "NodePort port number(to set explicitly, choose port between 30000-32767)"
show_if: "service.manager.type=NodePort" type: int
label: Manager Service NodePort number min: 30000
max: 32767
label: Manager Service NodePort number
- variable: persistence.defaultClass - variable: persistence.defaultClass
default: "true" default: "true"
description: "Set as default StorageClass" description: "Set as default StorageClass"
group: "Longhorn Settings"
type: enum type: enum
options: options:
- "true" - "true"
...@@ -49,10 +95,12 @@ questions: ...@@ -49,10 +95,12 @@ questions:
description: "For GKE uses `/home/kubernetes/flexvolume/` instead, users 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." description: "For GKE uses `/home/kubernetes/flexvolume/` instead, users 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 type: string
label: Longhorn Flexvolume Path label: Longhorn Flexvolume Path
group: "Longhorn Settings"
- variable: ingress.enabled - variable: ingress.enabled
default: "true" default: "true"
description: "Expose app using Layer 7 Load Balancer - ingress" description: "Expose app using Layer 7 Load Balancer - ingress"
type: boolean type: boolean
group: "Layer 7 Load Balancer"
label: Expose app using Layer 7 Load Balancer label: Expose app using Layer 7 Load Balancer
show_subquestion_if: true show_subquestion_if: true
subquestions: subquestions:
......
...@@ -13,14 +13,14 @@ spec: ...@@ -13,14 +13,14 @@ spec:
spec: spec:
initContainers: initContainers:
- name: init-container - name: init-container
image: {{ .Values.image.longhorn.engine }} image: "{{ .Values.image.longhorn.engine }}:{{ .Values.image.longhorn.engineTag }}"
command: ['sh', '-c', 'cp /usr/local/bin/* /data/'] command: ['sh', '-c', 'cp /usr/local/bin/* /data/']
volumeMounts: volumeMounts:
- name: execbin - name: execbin
mountPath: /data/ mountPath: /data/
containers: containers:
- name: longhorn-manager - name: longhorn-manager
image: {{ .Values.image.longhorn.manager }} image: "{{ .Values.image.longhorn.manager }}:{{ .Values.image.longhorn.managerTag }}"
imagePullPolicy: Always imagePullPolicy: Always
securityContext: securityContext:
privileged: true privileged: true
...@@ -29,9 +29,9 @@ spec: ...@@ -29,9 +29,9 @@ spec:
- -d - -d
- daemon - daemon
- --engine-image - --engine-image
- {{ .Values.image.longhorn.engine }} - "{{ .Values.image.longhorn.engine }}:{{ .Values.image.longhorn.engineTag }}"
- --manager-image - --manager-image
- {{ .Values.image.longhorn.manager }} - "{{ .Values.image.longhorn.manager }}:{{ .Values.image.longhorn.managerTag }}"
- --service-account - --service-account
- longhorn-service-account - longhorn-service-account
ports: ports:
......
...@@ -12,14 +12,14 @@ spec: ...@@ -12,14 +12,14 @@ spec:
spec: spec:
containers: containers:
- name: longhorn-flexvolume-driver-deployer - name: longhorn-flexvolume-driver-deployer
image: {{ .Values.image.longhorn.manager }} image: "{{ .Values.image.longhorn.manager }}:{{ .Values.image.longhorn.managerTag }}"
imagePullPolicy: Always imagePullPolicy: Always
command: command:
- longhorn-manager - longhorn-manager
- -d - -d
- deploy-flexvolume-driver - deploy-flexvolume-driver
- --manager-image - --manager-image
- {{ .Values.image.longhorn.manager }} - "{{ .Values.image.longhorn.manager }}:{{ .Values.image.longhorn.managerTag }}"
env: env:
- name: POD_NAMESPACE - name: POD_NAMESPACE
valueFrom: valueFrom:
......
...@@ -14,7 +14,7 @@ spec: ...@@ -14,7 +14,7 @@ spec:
spec: spec:
containers: containers:
- name: longhorn-ui - name: longhorn-ui
image: {{ .Values.image.longhorn.ui }} image: "{{ .Values.image.longhorn.ui }}:{{ .Values.image.longhorn.uiTag }}"
ports: ports:
- containerPort: 8000 - containerPort: 8000
name: longhorn-ui name: longhorn-ui
......
...@@ -3,9 +3,12 @@ ...@@ -3,9 +3,12 @@
# Declare variables to be passed into your templates. # Declare variables to be passed into your templates.
image: image:
longhorn: longhorn:
engine: rancher/longhorn-engine:de88734 engine: rancher/longhorn-engine
manager: rancher/longhorn-manager:1ebf5cb engineTag: de88734
ui: rancher/longhorn-ui:1455f4f manager: rancher/longhorn-manager
managerTag: 1ebf5cb
ui: rancher/longhorn-ui
uiTag: 1455f4f
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
service: service:
......
...@@ -6,6 +6,7 @@ questions: ...@@ -6,6 +6,7 @@ questions:
description: "Use default Docker image" description: "Use default Docker image"
label: Use Default Image label: Use Default Image
type: enum type: enum
group: "Container Images"
options: options:
- "true" - "true"
- "false" - "false"
...@@ -30,15 +31,18 @@ questions: ...@@ -30,15 +31,18 @@ questions:
- "false" - "false"
required: true required: true
label: Set NFS to Default StorageClass label: Set NFS to Default StorageClass
group: "NFS Settings"
- variable: persistence.hostPath - variable: persistence.hostPath
default: "" default: "/srv"
description: "for GKE uses /home/kubernetes/nfs/ instead, custom nfs host path read and write permission are required, default to /srv" description: "for GKE uses /home/kubernetes/nfs/ instead, custom nfs host path read and write permission are required, default to /srv"
type: string type: string
label: NFS Host Path label: NFS Host Path
required: true required: true
group: "NFS Settings"
- variable: nfs.hostPort - variable: nfs.hostPort
default: "" default: "2049"
required: true required: true
description: "specify the host port used for nfs-provisioner server" description: "specify the host port used for nfs-provisioner server"
type: int type: int
label: NFS Host Port label: NFS Host Port
group: "NFS Settings"
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