Commit 5516dce3 by Guangbo Chen

fixed gke ingress with nodeport and updated QA

parent 7ac42d8c
......@@ -7,27 +7,6 @@ Official project documentation found [here](https://github.com/coreos/etcd-opera
- Kubernetes 1.4+ with Beta APIs enabled
- __Suggested:__ PV provisioner support in the underlying infrastructure to support backups
## Installing the Chart
To install the chart with the release name `my-release`:
```bash
$ helm install stable/etcd-operator --name my-release
```
__Note__: If you set `cluster.enabled` on install, it will have no effect.
Before you create an etcd cluster, the TPR must be installed by the operator, so this option is ignored during helm installs, but can be used in upgrades.
## Uninstalling the Chart
To uninstall/delete the `my-release` deployment:
```bash
$ helm delete my-release
```
The command removes all the Kubernetes components EXCEPT the persistent volume.
## Updating
Updating the TPR resource will not result in the cluster being update until `kubectl apply` for
TPRs is fixed see [kubernetes/issues/29542](https://github.com/kubernetes/kubernetes/issues/29542)
......
......@@ -65,12 +65,6 @@ questions:
label: Set EtcdOperator Clusterwide
type: boolean
required: true
- variable: etcdOperator.name
default: "etcd-operator"
description: "Etcd Operator name"
required: true
label: Etcd Operator name
type: string
- variable: deployments.backupOperator
default: "false"
description: "Deploy the etcd backup operator, one time deployment, delete once completed"
......@@ -79,12 +73,6 @@ questions:
show_subquestion_if: true
group: "Backup Operator"
subquestions:
- variable: backupOperator.name
default: "etcd-backup-operator"
description: "Backup operator name"
required: true
label: Backup Operator name
type: string
- variable: backupOperator.spec.storageType
default: "S3"
description: "Storage to use for backup file, currently only S3 supported"
......@@ -113,12 +101,6 @@ questions:
group: "Restore Operator"
show_subquestion_if: true
subquestions:
- variable: restoreOperator.name
default: "etcd-restore-operator"
description: "Restore operator name"
required: true
label: Restore Operator name
type: string
- 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"
......@@ -131,39 +113,26 @@ questions:
label: Kubernetes secrete name of AWS Credentails
type: string
required: true
- variable: createCustomResources
- variable: customResources.createEtcdClusterCRD
default: "true"
description: "Create a custom resource: EtcdCluster"
label: Create a ETCD Cluster
type: boolean
group: "Etcd Cluster"
show_if: "deployments.etcdOperator=true"
- variable: customResources.createBackupCRD
default: "false"
description: "creates Kubernetes custom resources definitions (options: EtcdCluster, EtcdBackup, EtcdRestore)"
label: Create Kubernetes Custom Resources (EtcdCluster, EtcdBackup, EtcdRestore)
description: "Create a custom resource: EtcdBackup"
label: Create a ETCD Backup Cluster
type: boolean
show_subquestion_if: true
show_if: "deployments.backupOperator=true"
group: "Etcd Cluster"
subquestions:
- variable: customResources.createEtcdClusterCRD
default: "true"
description: "Create a custom resource: EtcdCluster"
label: Create a ETCD Cluster
type: boolean
show_if: "deployments.etcdOperator=true"
- variable: customResources.createBackupCRD
default: "false"
description: "Create a custom resource: EtcdBackup"
label: Create a ETCD Backup Cluster
type: boolean
show_if: "deployments.backupOperator=true"
- variable: customResources.createRestoreCRD
default: "false"
description: "Create a custom resource: EtcdRestore"
label: Create a ETCD Restore Cluster
type: boolean
show_if: "deployments.restoreOperator=true"
- variable: etcdCluster.name
default: "etcd-cluster"
description: "etcd cluster name"
label: Etcd Cluster Name
type: string
required: true
show_if: "createCustomResources=true"
- variable: customResources.createRestoreCRD
default: "false"
description: "Create a custom resource: EtcdRestore"
label: Create a ETCD Restore Cluster
type: boolean
show_if: "deployments.restoreOperator=true"
group: "Etcd Cluster"
- variable: etcdCluster.size
default: "3"
......@@ -177,14 +146,12 @@ questions:
- "7"
- "9"
- "11"
show_if: "createCustomResources=true"
required: true
- variable: etcdCluster.version
default: "3.2.10"
description: "etcd cluster version"
label: Etcd Cluster Version
type: string
show_if: "createCustomResources=true"
required: true
group: "Etcd Cluster"
- variable: etcdCluster.enableTLS
......@@ -193,7 +160,6 @@ questions:
label: Enable use of TLS
type: boolean
show_subquestion_if: true
show_if: "createCustomResources=true"
required: true
group: "Etcd Cluster"
subquestions:
......
......@@ -10,6 +10,7 @@ metadata:
app: {{ template "etcd-backup-operator.name" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
io.cattle.field/appId: {{ .Release.Name }}
spec:
clusterName: {{ .Values.etcdCluster.name }}
{{ toYaml .Values.backupOperator.spec | indent 2 }}
......
......@@ -10,6 +10,7 @@ metadata:
app: {{ template "etcd-operator.name" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
io.cattle.field/appId: {{ .Release.Name }}
{{- if .Values.etcdOperator.clusterwide.enabled }}
annotations:
etcd.database.coreos.com/scope: clusterwide
......
......@@ -11,6 +11,7 @@ metadata:
app: {{ template "etcd-restore-operator.name" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
io.cattle.field/appId: {{ .Release.Name }}
spec:
clusterSpec:
size: {{ .Values.etcdCluster.size }}
......
......@@ -56,7 +56,7 @@ questions:
subquestions:
- variable: password
default: ""
description: "Redis password, defaults to a random 10-character alphanumeric string if not set"
description: "password will be auto-generated if not specified"
type: password
label: Redis Password
- variable: master.persistence.enabled
......
......@@ -39,7 +39,7 @@ questions:
group: "WordPress Settings"
- variable: wordpressPassword
default: ""
description: "Application Password(defualt random 10 character long alphanumeric string if not set)"
description: "password will be auto-generated if not specified"
type: password
label: WordPress Password
group: "WordPress Settings"
......@@ -71,7 +71,7 @@ questions:
label: MariaDB User
- variable: mariadb.mariadbPassword
default: ""
description: "Password for mariadbUser"
description: "password will be auto-generated if not specified"
type: password
label: MariaDB Password
- variable: externalDatabase.host
......@@ -149,7 +149,7 @@ questions:
type: storageclass
label: Default StorageClass for WordPress
- variable: serviceType
default: "ClusterIP"
default: "NodePort"
description: "WordPress Service type"
type: enum
show_if: "ingress.enabled=false"
......
......@@ -67,7 +67,7 @@ questions:
required: true
label: Layer 7 Load Balancer Hostname
- variable: service.ui.type
default: "ClusterIP"
default: "NodePort"
description: "Define Longhorn UI service type"
type: enum
options:
......
......@@ -13,7 +13,7 @@ image:
service:
ui:
type: ClusterIP
type: NodePort
nodePort: ""
manager:
type: ClusterIP
......
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