From ea27a1bddc9ed4414ef0ed9bd590aa18aecd5044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 3 Dec 2020 17:15:44 +0100 Subject: [PATCH] Rename several MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - mailserver.human-connection —> mail.ocelot.social - letsencrypt-staging —> letsencrypt-develop - letsencrypt-prod —> letsencrypt-production - Renamed files. --- deployment/digital-ocean/https/README.md | 2 +- .../digital-ocean/https/templates/ingress.template.yaml | 9 ++++----- .../digital-ocean/https/templates/issuer.template.yaml | 8 ++++---- ...letsencrypt-staging.yaml => letsencrypt-develop.yaml} | 4 ++-- ...letsencrypt-prod.yaml => letsencrypt-production.yaml} | 4 ++-- deployment/helm/ocelot.social/values.yaml | 2 +- .../ocelot-social/templates/configmap.template.yaml | 2 +- deployment/ocelot-social/templates/secrets.template.yaml | 9 ++++----- 8 files changed, 19 insertions(+), 21 deletions(-) rename deployment/helm/ocelot.social/templates/cluster-issuers/{letsencrypt-staging.yaml => letsencrypt-develop.yaml} (90%) rename deployment/helm/ocelot.social/templates/cluster-issuers/{letsencrypt-prod.yaml => letsencrypt-production.yaml} (89%) diff --git a/deployment/digital-ocean/https/README.md b/deployment/digital-ocean/https/README.md index 855a7facf..347582e5b 100644 --- a/deployment/digital-ocean/https/README.md +++ b/deployment/digital-ocean/https/README.md @@ -53,7 +53,7 @@ $ kubectl describe --namespace=human-connection certificate tls $ kubectl describe --namespace=human-connection secret tls ``` -If everything looks good, update the issuer of your ingress. Change the annotation `certmanager.k8s.io/issuer` from `letsencrypt-staging` to `letsencrypt-prod` in your ingress configuration in `ingress.yaml`. +If everything looks good, update the issuer of your ingress. Change the annotation `certmanager.k8s.io/issuer` from `letsencrypt-develop` to `letsencrypt-production` in your ingress configuration in `ingress.yaml`. ```bash # in folder deployment/digital-ocean/https/ diff --git a/deployment/digital-ocean/https/templates/ingress.template.yaml b/deployment/digital-ocean/https/templates/ingress.template.yaml index 1661c1445..6bbaec7df 100644 --- a/deployment/digital-ocean/https/templates/ingress.template.yaml +++ b/deployment/digital-ocean/https/templates/ingress.template.yaml @@ -5,24 +5,23 @@ metadata: namespace: ocelot-social annotations: kubernetes.io/ingress.class: "nginx" - certmanager.k8s.io/issuer: "letsencrypt-staging" + certmanager.k8s.io/issuer: "letsencrypt-develop" certmanager.k8s.io/acme-challenge-type: http01 nginx.ingress.kubernetes.io/proxy-body-size: 6m spec: tls: - hosts: - # - nitro-mailserver.human-connection.org - - develop.human-connection.org + - develop-k8s.ocelot.social secretName: tls rules: - - host: develop.human-connection.org + - host: develop-k8s.ocelot.social http: paths: - path: / backend: serviceName: web servicePort: 3000 - - host: mailserver.human-connection.org + - host: mail.ocelot.social http: paths: - path: / diff --git a/deployment/digital-ocean/https/templates/issuer.template.yaml b/deployment/digital-ocean/https/templates/issuer.template.yaml index 9a6fe19c6..785b083ff 100644 --- a/deployment/digital-ocean/https/templates/issuer.template.yaml +++ b/deployment/digital-ocean/https/templates/issuer.template.yaml @@ -2,7 +2,7 @@ apiVersion: certmanager.k8s.io/v1alpha1 kind: Issuer metadata: - name: letsencrypt-staging + name: letsencrypt-develop namespace: ocelot-social spec: acme: @@ -12,14 +12,14 @@ email: user@example.com # Name of a secret used to store the ACME account private key privateKeySecretRef: - name: letsencrypt-staging + name: letsencrypt-develop # Enable the HTTP-01 challenge provider http01: {} --- apiVersion: certmanager.k8s.io/v1alpha1 kind: Issuer metadata: - name: letsencrypt-prod + name: letsencrypt-production namespace: ocelot-social spec: acme: @@ -29,6 +29,6 @@ email: user@example.com # Name of a secret used to store the ACME account private key privateKeySecretRef: - name: letsencrypt-prod + name: letsencrypt-production # Enable the HTTP-01 challenge provider http01: {} diff --git a/deployment/helm/ocelot.social/templates/cluster-issuers/letsencrypt-staging.yaml b/deployment/helm/ocelot.social/templates/cluster-issuers/letsencrypt-develop.yaml similarity index 90% rename from deployment/helm/ocelot.social/templates/cluster-issuers/letsencrypt-staging.yaml rename to deployment/helm/ocelot.social/templates/cluster-issuers/letsencrypt-develop.yaml index 531b2075b..d469fee83 100644 --- a/deployment/helm/ocelot.social/templates/cluster-issuers/letsencrypt-staging.yaml +++ b/deployment/helm/ocelot.social/templates/cluster-issuers/letsencrypt-develop.yaml @@ -1,7 +1,7 @@ apiVersion: cert-manager.io/v1alpha2 kind: ClusterIssuer metadata: - name: letsencrypt-staging + name: letsencrypt-develop labels: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} @@ -13,7 +13,7 @@ spec: server: https://acme-staging-v02.api.letsencrypt.org/directory email: {{ .Values.supportEmail }} privateKeySecretRef: - name: letsencrypt-staging + name: letsencrypt-develop solvers: - http01: ingress: diff --git a/deployment/helm/ocelot.social/templates/cluster-issuers/letsencrypt-prod.yaml b/deployment/helm/ocelot.social/templates/cluster-issuers/letsencrypt-production.yaml similarity index 89% rename from deployment/helm/ocelot.social/templates/cluster-issuers/letsencrypt-prod.yaml rename to deployment/helm/ocelot.social/templates/cluster-issuers/letsencrypt-production.yaml index e46c1f0b3..2a297cad2 100644 --- a/deployment/helm/ocelot.social/templates/cluster-issuers/letsencrypt-prod.yaml +++ b/deployment/helm/ocelot.social/templates/cluster-issuers/letsencrypt-production.yaml @@ -1,7 +1,7 @@ apiVersion: cert-manager.io/v1alpha2 kind: ClusterIssuer metadata: - name: letsencrypt-prod + name: letsencrypt-production labels: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} @@ -13,7 +13,7 @@ spec: server: https://acme-v02.api.letsencrypt.org/directory email: {{ .Values.supportEmail }} privateKeySecretRef: - name: letsencrypt-prod + name: letsencrypt-production solvers: - http01: ingress: diff --git a/deployment/helm/ocelot.social/values.yaml b/deployment/helm/ocelot.social/values.yaml index 42eed0c7b..259464a9f 100644 --- a/deployment/helm/ocelot.social/values.yaml +++ b/deployment/helm/ocelot.social/values.yaml @@ -19,7 +19,7 @@ image: # pullPolicy indicates when, if ever, pods pull a new image from docker hub. pullPolicy: IfNotPresent # letsencryptIssuer is used by cert-manager to set up certificates with the given provider. -letsencryptIssuer: "letsencrypt-prod" +letsencryptIssuer: "letsencrypt-production" # neo4jConfig changes any default neo4j config/adds it. neo4jConfig: # acceptLicenseAgreement is used to agree to the license agreement for neo4j's enterprise edition. diff --git a/deployment/ocelot-social/templates/configmap.template.yaml b/deployment/ocelot-social/templates/configmap.template.yaml index ff105b98e..170ea99d2 100644 --- a/deployment/ocelot-social/templates/configmap.template.yaml +++ b/deployment/ocelot-social/templates/configmap.template.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap data: - SMTP_HOST: "mailserver.human-connection" + SMTP_HOST: "mail.ocelot.social" SMTP_PORT: "25" GRAPHQL_URI: "http://backend.human-connection:4000" NEO4J_URI: "bolt://neo4j.human-connection:7687" diff --git a/deployment/ocelot-social/templates/secrets.template.yaml b/deployment/ocelot-social/templates/secrets.template.yaml index 4e4c18c1b..8309d234e 100644 --- a/deployment/ocelot-social/templates/secrets.template.yaml +++ b/deployment/ocelot-social/templates/secrets.template.yaml @@ -2,13 +2,12 @@ apiVersion: v1 kind: Secret data: JWT_SECRET: "Yi8mJjdiNzhCRiZmdi9WZA==" - MONGODB_PASSWORD: "TU9OR09EQl9QQVNTV09SRA==" PRIVATE_KEY_PASSPHRASE: "YTdkc2Y3OHNhZGc4N2FkODdzZmFnc2FkZzc4" - MAPBOX_TOKEN: "cGsuZXlKMUlqb2lhSFZ0WVc0dFkyOXVibVZqZEdsdmJpSXNJbUVpT2lKamFqbDBjbkJ1Ykdvd2VUVmxNM1Z3WjJsek5UTnVkM1p0SW4wLktaOEtLOWw3MG9talhiRWtrYkhHc1EK" - SMTP_USERNAME: - SMTP_PASSWORD: + MAPBOX_TOKEN: "pk.eyJ1IjoiYnVzZmFrdG9yIiwiYSI6ImNraDNiM3JxcDBhaWQydG1uczhpZWtpOW4ifQ.7TNRTO-o9aK1Y6MyW_Nd4g" NEO4J_USERNAME: NEO4J_PASSWORD: + SMTP_USERNAME: + SMTP_PASSWORD: metadata: name: ocelot-social - namespace: human-connection + namespace: ocelot-social