From ca1ec58bd7a7e5521c27398e208969db9ed6f416 Mon Sep 17 00:00:00 2001 From: Lucas Pirola Date: Sat, 5 Jun 2021 19:32:31 -0300 Subject: [PATCH 1/3] feat: Move env vars to Secret; --- charts/nossas-org/templates/secret.yaml | 14 ++++++++++++++ charts/nossas-org/values.yaml | 15 ++++----------- 2 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 charts/nossas-org/templates/secret.yaml diff --git a/charts/nossas-org/templates/secret.yaml b/charts/nossas-org/templates/secret.yaml new file mode 100644 index 00000000..99fbb17e --- /dev/null +++ b/charts/nossas-org/templates/secret.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: Secret +metadata: + name: nossas-org +type: Opaque +data: + NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY: "" + NEXT_PUBLIC_BONDE_API_GRAPHQL_URL: "d3NzOi8vYXBpLWdyYXBocWwvdjEvZ3JhcGhxbAo=" + BONDE_API_GRAPHQL_URL: "aHR0cHM6Ly9hcGktZ3JhcGhxbC92MS9ncmFwaHFsCg==" + STRIPE_SECRET_KEY: "" + NEXT_PUBLIC_INCUBATIONS_WIDGET_ID: "MjAyOTIK" + NEXT_PUBLIC_MATERIALS_WIDGET_ID: "MjAyOTMK" + NEXT_PUBLIC_DONATION_WIDGET_ID: "MjQxNDYK" + NEXT_PUBLIC_NEWSLETTER_WIDGET_ID: "MjQxNDcK" diff --git a/charts/nossas-org/values.yaml b/charts/nossas-org/values.yaml index a5f0f47a..cf8deac6 100755 --- a/charts/nossas-org/values.yaml +++ b/charts/nossas-org/values.yaml @@ -14,17 +14,10 @@ canary: labels: {} progressDeadlineSeconds: 60 deploymentLabels: {} -env: - PORT: "3003" - NODE_ENV: "production" - NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY: "" - NEXT_PUBLIC_BONDE_API_GRAPHQL_URL: "ws://api-graphql.staging.bonde.org/v1/graphql" - BONDE_API_GRAPHQL_URL: "https://api-graphql.staging.bonde.org/v1/graphql" - STRIPE_SECRET_KEY: "" - NEXT_PUBLIC_INCUBATIONS_WIDGET_ID: "20292" - NEXT_PUBLIC_MATERIALS_WIDGET_ID: "20293" - NEXT_PUBLIC_DONATION_WIDGET_ID: "24146" - NEXT_PUBLIC_NEWSLETTER_WIDGET_ID: "24147" +env: {} +envFrom: + - secretRef: + name: nossas-org hpa: cpuTargetAverageUtilization: 80 enabled: false From f11b84ce826e7149a43a1913ac227824d71385c5 Mon Sep 17 00:00:00 2001 From: Lucas Pirola Date: Sat, 5 Jun 2021 20:46:02 -0300 Subject: [PATCH 2/3] chore: Update ci/cd envfrom --- .lighthouse/jenkins-x/pullrequest.yaml | 24 +++-------------------- .lighthouse/jenkins-x/release.yaml | 26 +++---------------------- charts/nossas-org/templates/secret.yaml | 2 ++ 3 files changed, 8 insertions(+), 44 deletions(-) diff --git a/.lighthouse/jenkins-x/pullrequest.yaml b/.lighthouse/jenkins-x/pullrequest.yaml index b2ad513b..b087674f 100644 --- a/.lighthouse/jenkins-x/pullrequest.yaml +++ b/.lighthouse/jenkins-x/pullrequest.yaml @@ -11,27 +11,9 @@ spec: taskSpec: metadata: {} stepTemplate: - env: - - name: PORT - value: "3003" - - name: NODE_ENV - value: "production" - - name: NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY - value: "" - - name: NEXT_PUBLIC_BONDE_API_GRAPHQL_URL - value: "ws://api-graphql.staging.bonde.org/v1/graphql" - - name: BONDE_API_GRAPHQL_URL - value: "https://api-graphql.staging.bonde.org/v1/graphql" - - name: STRIPE_SECRET_KEY - value: "" - - name: NEXT_PUBLIC_INCUBATIONS_WIDGET_ID - value: "20292" - - name: NEXT_PUBLIC_MATERIALS_WIDGET_ID - value: "20293" - - name: NEXT_PUBLIC_DONATION_WIDGET_ID - value: "24146" - - name: NEXT_PUBLIC_NEWSLETTER_WIDGET_ID - value: "24147" + envFrom: + - secretRef: + name: nossas-org image: uses:jenkins-x/jx3-pipeline-catalog/tasks/typescript/pullrequest.yaml@versionStream name: "" resources: diff --git a/.lighthouse/jenkins-x/release.yaml b/.lighthouse/jenkins-x/release.yaml index fccb4e28..1397703f 100644 --- a/.lighthouse/jenkins-x/release.yaml +++ b/.lighthouse/jenkins-x/release.yaml @@ -11,29 +11,9 @@ spec: taskSpec: metadata: {} stepTemplate: - env: - - name: PORT - value: "3003" - - name: NODE_ENV - value: "production" - - name: NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY - value: "" - - name: NEXT_PUBLIC_BONDE_API_GRAPHQL_URL - value: "ws://api-graphql.staging.bonde.org/v1/graphql" - - name: BONDE_API_GRAPHQL_URL - value: "https://api-graphql.staging.bonde.org/v1/graphql" - - name: STRIPE_SECRET_KEY - value: "" - - name: NEXT_PUBLIC_INCUBATIONS_WIDGET_ID - value: "20292" - - name: NEXT_PUBLIC_MATERIALS_WIDGET_ID - value: "20293" - - name: NEXT_PUBLIC_DONATION_WIDGET_ID - value: "24146" - - name: NEXT_PUBLIC_NEWSLETTER_WIDGET_ID - value: "24147" - - name: NPM_CONFIG_USERCONFIG - value: /tekton/home/npm/.npmrc + envFrom: + - secretRef: + name: nossas-org image: uses:jenkins-x/jx3-pipeline-catalog/tasks/typescript/release.yaml@versionStream name: "" resources: diff --git a/charts/nossas-org/templates/secret.yaml b/charts/nossas-org/templates/secret.yaml index 99fbb17e..5bc9aed3 100644 --- a/charts/nossas-org/templates/secret.yaml +++ b/charts/nossas-org/templates/secret.yaml @@ -4,6 +4,8 @@ metadata: name: nossas-org type: Opaque data: + NODEV_ENV: "cHJvZHVjdGlvbgo=" + PORT: "MzAwMwo=" NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY: "" NEXT_PUBLIC_BONDE_API_GRAPHQL_URL: "d3NzOi8vYXBpLWdyYXBocWwvdjEvZ3JhcGhxbAo=" BONDE_API_GRAPHQL_URL: "aHR0cHM6Ly9hcGktZ3JhcGhxbC92MS9ncmFwaHFsCg==" From 684325dcae89d0f0047a63c5019b723001fe4889 Mon Sep 17 00:00:00 2001 From: Lucas Pirola Date: Sun, 6 Jun 2021 12:48:25 -0300 Subject: [PATCH 3/3] fix: set production env vars into release --- .lighthouse/jenkins-x/release.yaml | 2 +- charts/nossas-org/templates/secret.yaml | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.lighthouse/jenkins-x/release.yaml b/.lighthouse/jenkins-x/release.yaml index 1397703f..bc414c0a 100644 --- a/.lighthouse/jenkins-x/release.yaml +++ b/.lighthouse/jenkins-x/release.yaml @@ -13,7 +13,7 @@ spec: stepTemplate: envFrom: - secretRef: - name: nossas-org + name: nossas-org-prod image: uses:jenkins-x/jx3-pipeline-catalog/tasks/typescript/release.yaml@versionStream name: "" resources: diff --git a/charts/nossas-org/templates/secret.yaml b/charts/nossas-org/templates/secret.yaml index 5bc9aed3..33635e40 100644 --- a/charts/nossas-org/templates/secret.yaml +++ b/charts/nossas-org/templates/secret.yaml @@ -14,3 +14,20 @@ data: NEXT_PUBLIC_MATERIALS_WIDGET_ID: "MjAyOTMK" NEXT_PUBLIC_DONATION_WIDGET_ID: "MjQxNDYK" NEXT_PUBLIC_NEWSLETTER_WIDGET_ID: "MjQxNDcK" +--- +apiVersion: v1 +kind: Secret +metadata: + name: nossas-org-prod +type: Opaque +data: + NODEV_ENV: "cHJvZHVjdGlvbgo=" + PORT: "MzAwMwo=" + NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY: "" + NEXT_PUBLIC_BONDE_API_GRAPHQL_URL: "d3NzOi8vYXBpLWdyYXBocWwvdjEvZ3JhcGhxbAo=" + BONDE_API_GRAPHQL_URL: "aHR0cHM6Ly9hcGktZ3JhcGhxbC92MS9ncmFwaHFsCg==" + STRIPE_SECRET_KEY: "" + NEXT_PUBLIC_INCUBATIONS_WIDGET_ID: "MjAyOTIK" + NEXT_PUBLIC_MATERIALS_WIDGET_ID: "MjAyOTMK" + NEXT_PUBLIC_DONATION_WIDGET_ID: "MjQxNDYK" + NEXT_PUBLIC_NEWSLETTER_WIDGET_ID: "MjQxNDcK" \ No newline at end of file