Merge pull request #90 from bcgov/smk-cdci

Remove helm chart
bcgov · Jan 22, 2021 · d85e1dd · d85e1dd
2 parents 23df80c + f7af42a
commit d85e1dd
Show file tree

Hide file tree

Showing 14 changed files with 10 additions and 368 deletions.
diff --git a/.github/workflows/deploy_dev.yaml b/.github/workflows/deploy_dev.yaml
@@ -133,8 +133,9 @@ jobs:
         #  - helm chart creates the image pull secret
         #  - tries to use it with the service account
         #  - service account hasn't been granted access
-
-        helm upgrade $REPONAME ./helm-charts --install \
+        #  helm upgrade $REPONAME ./helm-charts --install \
+        helm repo add smk-helms https://bcgov.github.io/smk-helms/
+        helm upgrade $REPONAME smk-helms/smk-app-deploy --install \
            --set app_name=$REPONAME \
            --set env=dev \
            --set app_image_pull_secret_params.email=$EMAIL \

diff --git a/.github/workflows/deploy_prod.yaml b/.github/workflows/deploy_prod.yaml
@@ -146,12 +146,17 @@ jobs:
         DOCKER_VERSION_TAG=${{ steps.retrieveimagetag.outputs.DOCKER_VERSION_TAG }}
         IMAGE_REGISTRY=${{ steps.retrieveimagetag.outputs.IMAGE_REGISTRY }}
         REPONAME=${{ steps.retrieveimagetag.outputs.REPONAME }}
+        IMAGE_PULL_SECRET_NAME=${REPONAME}-image-pull-secret
 
         # extract deploy name from the template
-        helm upgrade $REPONAME ./helm-charts --install \
+        #helm upgrade $REPONAME ./helm-charts --install \
+        helm repo add smk-helms https://bcgov.github.io/smk-helms/
+        helm upgrade $REPONAME smk-helms/smk-app-deploy --install \
            --set app_name=$REPONAME \
            --set env=prd \
-           --set app_image_pull_secret_params.name=github-imagepull-secrets \
+           --set app_image_pull_secret_params.email=$EMAIL \
+           --set app_image_pull_secret_params.password=$GHCR_TOKEN \
+           --set app_image_pull_secret_params.name=$IMAGE_PULL_SECRET_NAME \
            --set app_image_pull_secret_params.imagetag=$DOCKER_VERSION_TAG \
            --set app_image_pull_secret_params.registry=$IMAGE_REGISTRY
 

diff --git a/helm-charts/.helmignore b/helm-charts/.helmignore
diff --git a/helm-charts/Chart.yaml b/helm-charts/Chart.yaml
diff --git a/helm-charts/templates/NOTES.txt b/helm-charts/templates/NOTES.txt
diff --git a/helm-charts/templates/_helpers.tpl b/helm-charts/templates/_helpers.tpl
diff --git a/helm-charts/templates/smk-app-deploymentConfig.yaml b/helm-charts/templates/smk-app-deploymentConfig.yaml
diff --git a/helm-charts/templates/smk-app-gwaroutes-nsp.yaml b/helm-charts/templates/smk-app-gwaroutes-nsp.yaml
diff --git a/helm-charts/templates/smk-app-imagepullsecret.yaml b/helm-charts/templates/smk-app-imagepullsecret.yaml
diff --git a/helm-charts/templates/smk-app-route.yaml b/helm-charts/templates/smk-app-route.yaml
diff --git a/helm-charts/templates/smk-app-service.yaml b/helm-charts/templates/smk-app-service.yaml
diff --git a/helm-charts/templates/smk-app-web-nsp.yaml b/helm-charts/templates/smk-app-web-nsp.yaml
diff --git a/helm-charts/templates/tests/test-connection.yaml b/helm-charts/templates/tests/test-connection.yaml