Merge pull request #493 from stakater-lab/parameterize

parameterize and put back secret

.tekton/main.yaml

@@ -39,13 +39,18 @@ spec:
       value: stakater-lab
     - name: tenant
       value: psg
+    - name: route_subdomain
+      value: apps.tno1-ams.s9nghh76.lab.kubeapp.cloud
   pipelineSpec:
     params:
       - name: repo_url
       - name: git_revision
       - name: repo_path
       - name: image_registry
       - name: helm_registry
+      - name: organization
+      - name: tenant
+      - name: route_subdomain
     workspaces:
       - name: source
       - name: ssh-directory
@@ -131,7 +136,7 @@ spec:
           kind: Task
         params:
           - name: SONAR_HOST_URL
-            value: https://sonarqube-stakater-sonarqube.apps.tno1-ams.s9nghh76.lab.kubeapp.cloud
+            value: https://sonarqube-stakater-sonarqube.$(params.route_subdomain)
 
           - name: SONAR_PROJECT_KEY
             value: $(params.repo_path)
@@ -227,13 +232,13 @@ spec:
           - name: GIT_REVISION
             value: main
           - name: NAMESPACE
-            value: psg-dev
+            value: $(params.tenant)-dev
           - name: ENVIRONMENT
             value: 01-dev
           - name: HELM_REGISTRY
             value: $(params.helm_registry)
           - name: CD_REPO_URL
-            value: [email protected]:stakater/nordmart-apps-gitops-config.git
+            value: [email protected]:$(params.organization)/nordmart-apps-gitops-config.git
         workspaces:
           - name: source
             workspace: source

.tekton/pull_request.yaml

@@ -43,6 +43,10 @@ spec:
         https://nexus-helm-stakater-nexus.apps.tno1-ams.s9nghh76.lab.kubeapp.cloud/repository/helm-charts/
     - name: organization
       value: stakater-lab
+    - name: tenant
+      value: psg
+    - name: route_subdomain
+      value: apps.tno1-ams.s9nghh76.lab.kubeapp.cloud
   pipelineSpec:
     params:
       - name: repo_url
@@ -53,6 +57,7 @@ spec:
       - name: pull_request_number
       - name: organization
       - name: git_branch
+      - name: tenant
 
     workspaces:
       - name: source
@@ -107,15 +112,15 @@ spec:
           - name: PR_NUMBER
             value: $(params.pull_request_number)
           - name: GIT_URL
-            value: https://github.com/stakater-lab/stakater-nordmart-review-api.git
+            value: https://github.com/$(params.organization)/stakater-nordmart-review-api.git
           - name: GIT_BRANCH
             value: $(params.git_branch)
           - name: IMAGE_TAG
             value: $(tasks.create-git-tag.results.GIT_TAG)
           - name: IMAGE_REPO
             value: $(params.image_registry)
           - name: PULL_REQUEST_COMMITS_API
-            value: https://api.github.com/repos/stakater-lab/$(params.repo_path)/pulls/$(params.pull_request_number)/commits
+            value: https://api.github.com/repos/$(params.organization)/$(params.repo_path)/pulls/$(params.pull_request_number)/commits
         workspaces:
           - name: output
             workspace: source
@@ -142,7 +147,7 @@ spec:
           - name: DEPLOYMENT_FILES_PATH
             value: deploy
           - name: NAMESPACE
-            value: psg-build
+            value: $(params.tenant)-build
         workspaces:
           - name: source
             workspace: source
@@ -166,7 +171,7 @@ spec:
           kind: Task
         params:
           - name: SONAR_HOST_URL
-            value: https://sonarqube-stakater-sonarqube.apps.tno1-ams.s9nghh76.lab.kubeapp.cloud
+            value: https://sonarqube-stakater-sonarqube.$(params.route_subdomain)
           - name: SONAR_PROJECT_KEY
             value: $(params.repo_path)
           - name: SONAR_LOGIN
@@ -322,13 +327,13 @@ spec:
           - name: GIT_REVISION
             value: $(params.git_revision)
           - name: NAMESPACE
-            value: psg-dev
+            value: $(params.tenant)-dev
           - name: ENVIRONMENT
             value: dev
           - name: HELM_REGISTRY
             value: $(params.helm_registry)
           - name: CD_REPO_URL
-            value: [email protected]:stakater/nordmart-apps-gitops-config.git
+            value: [email protected]:$(params.organization)/nordmart-apps-gitops-config.git
         workspaces:
           - name: source
             workspace: source

deploy/values.yaml

@@ -18,7 +18,7 @@ application:
         pattern: "(ERROR|ERR|error|E[A-Z0-9]{4})"
     additionalLabels:
       appCategory: backend
-    imagePullSecrets: docker-reg-creds
+    imagePullSecrets: review-docker-reg-creds
     env:
       MONGODB_PASSWORD:
         valueFrom:
@@ -143,6 +143,10 @@ application:
         dataFrom:
           key: review-api/dev/mongodb-creds
 
+      docker-reg-creds:
+        dataFrom:
+          key: docker-reg-creds
+
 #####################
 # MongoDB dependency
 #####################