From 30f25b7c106d92d7b4593795ea08c201b0b9ba59 Mon Sep 17 00:00:00 2001 From: Stepan Stipl Date: Fri, 26 Apr 2019 12:18:29 +0100 Subject: [PATCH] GPII-3221: Remove ingress and certificate from gpii-preferences Helm chart --- shared/charts/gpii-preferences/Chart.yaml | 2 +- shared/charts/gpii-preferences/README.md | 4 ---- .../templates/certificate.yaml | 18 ------------------ .../gpii-preferences/templates/ingress.yaml | 18 ------------------ .../gpii-preferences/templates/issuer.yaml | 17 ----------------- shared/charts/gpii-preferences/values.yaml | 8 -------- 6 files changed, 1 insertion(+), 66 deletions(-) delete mode 100644 shared/charts/gpii-preferences/templates/certificate.yaml delete mode 100644 shared/charts/gpii-preferences/templates/ingress.yaml delete mode 100644 shared/charts/gpii-preferences/templates/issuer.yaml diff --git a/shared/charts/gpii-preferences/Chart.yaml b/shared/charts/gpii-preferences/Chart.yaml index b3994bfa..10d23cb2 100644 --- a/shared/charts/gpii-preferences/Chart.yaml +++ b/shared/charts/gpii-preferences/Chart.yaml @@ -1,5 +1,5 @@ name: gpii-preferences -version: 0.1.0 +version: 0.2.0 appVersion: 57d0a17da505c8bc28c221c88b8de54447c78dc873c355d0bfd435d28f8b09ee home: https://github.com/gpii-ops/gpii-infra description: GPII Preferences Service. diff --git a/shared/charts/gpii-preferences/README.md b/shared/charts/gpii-preferences/README.md index d74a3f72..b63922a9 100644 --- a/shared/charts/gpii-preferences/README.md +++ b/shared/charts/gpii-preferences/README.md @@ -45,13 +45,9 @@ The command removes all the Kubernetes components associated with the chart and The following table lists the configurable parameters of the gpii-preferences chart and their default values. | Parameter | Description | Default | -| `acme.clouddnsProject` | required GCP project id to use for CLoudDNS | - | -| `acme.email` | optional email to use for registration with certificate issuer | `dev-null@raisingthefloor.org` | -| `acme.server | optional ACME server for certificate issuer | `https://acme-staging-v02.api.letsencrypt.org/directory` | | `datasourceHostname` | data source hostname for preferences service | `http://admin:password@couchdb-svc-couchdb.gpii.svc.cluster.local` | | `datasourceListenPort` | data source port for preferences service | `5984` | | `disableSslRedirect` | disable nginx-ingress redirection to HTTPS | `false` | -| `dnsNames` | list of host names for nginx-ingress controller | `preferences.test.local` | | `enableStackdriverTrace` | enable [GCP Stackdriver Trace](https://cloud.google.com/trace/) | `false` | | `image.checksum` | container image checksum | `sha256:f279c6ab7fa1c19e5f358a6a3d87a970eaf8d615c8b6181851fa086b6229b3a1` | | `image.pullPolicy` | container image pullPolicy | `IfNotPresent` | diff --git a/shared/charts/gpii-preferences/templates/certificate.yaml b/shared/charts/gpii-preferences/templates/certificate.yaml deleted file mode 100644 index f9979161..00000000 --- a/shared/charts/gpii-preferences/templates/certificate.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: certmanager.k8s.io/v1alpha1 -kind: Certificate -metadata: - namespace: {{ .Release.Namespace | quote }} - name: {{ template "preferences.name" . }}-cert -spec: - secretName: {{ template "preferences.name" . }}-tls - issuerRef: - name: letsencrypt-{{ template "preferences.name" . }} - kind: Issuer - dnsNames: - {{ toYaml .Values.dnsNames | indent 2 }} - acme: - config: - - dns01: - provider: default - domains: - {{ toYaml .Values.dnsNames | indent 6 }} diff --git a/shared/charts/gpii-preferences/templates/ingress.yaml b/shared/charts/gpii-preferences/templates/ingress.yaml deleted file mode 100644 index 0e5ef8ba..00000000 --- a/shared/charts/gpii-preferences/templates/ingress.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Ingress -metadata: - namespace: {{ .Release.Namespace | quote }} - name: {{ template "preferences.name" . }}-ingress -spec: - tls: - - hosts: - {{ toYaml .Values.dnsNames | indent 6 }} - secretName: {{ template "preferences.name" . }}-tls - rules: - - host: {{ .Values.dnsNames | first }} - http: - paths: - - path: / - backend: - serviceName: {{ template "preferences.name" . }} - servicePort: {{ .Values.svcListenPort }} diff --git a/shared/charts/gpii-preferences/templates/issuer.yaml b/shared/charts/gpii-preferences/templates/issuer.yaml deleted file mode 100644 index f42539a7..00000000 --- a/shared/charts/gpii-preferences/templates/issuer.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: certmanager.k8s.io/v1alpha1 -kind: Issuer -metadata: - name: letsencrypt-{{ template "preferences.name" . }} - labels: - app: {{ template "preferences.name" . }} -spec: - acme: - server: {{ .Values.acme.server }} - email: {{ .Values.acme.email }} - privateKeySecretRef: - name: letsencrypt-{{ template "preferences.name" . }} - dns01: - providers: - - name: default - clouddns: - project: {{ required "A valid GCP Project id required for acme.clouddnsProject!" .Values.acme.clouddnsProject }} diff --git a/shared/charts/gpii-preferences/values.yaml b/shared/charts/gpii-preferences/values.yaml index 50a5e01d..41f25040 100644 --- a/shared/charts/gpii-preferences/values.yaml +++ b/shared/charts/gpii-preferences/values.yaml @@ -21,14 +21,6 @@ rollingUpdate: maxSurge: 25% maxUnavailable: 25% -acme: - server: https://acme-staging-v02.api.letsencrypt.org/directory - email: dev-null@raisingthefloor.org - clouddnsProject: - -dnsNames: -- preferences.test.local - nameOverride: preferences ## Optional resource requests and limits for deployment