Verified Commit 98709c6a authored by justin's avatar justin
Browse files

Additional chart cleanup.

parent f9ddbd73
Pipeline #1418 passed with stages
in 6 minutes and 20 seconds
......@@ -97,7 +97,7 @@ build-frontend-master:
name: gcr.io/kaniko-project/executor:debug-v0.23.0
entrypoint: [""]
script:
- /kaniko/executor --cache=true --dockerfile=$CI_PROJECT_DIR/frontend/Dockerfile --destination=$CONTAINER_REGISTRY/frontend:$CI_COMMIT_SHA --destination=$CONTAINER_REGISTRY/frontend:latest --context $CI_PROJECT_DIR/frontend
- /kaniko/executor --cache=true --dockerfile=$CI_PROJECT_DIR/frontend/Dockerfile --destination=$CONTAINER_REGISTRY/frontend:$CI_COMMIT_SHORT_SHA --destination=$CONTAINER_REGISTRY/frontend:latest --context $CI_PROJECT_DIR/frontend
only:
- master
......@@ -110,7 +110,7 @@ build-backend-master:
entrypoint: [""]
script:
- cp $CI_PROJECT_DIR/docker/Dockerfile.backend.dockerignore $CI_PROJECT_DIR/.dockerignore
- /kaniko/executor --cache=true --dockerfile=$CI_PROJECT_DIR/docker/Dockerfile.backend --destination=$CONTAINER_REGISTRY/backend:$CI_COMMIT_SHA --destination=$CONTAINER_REGISTRY/backend:latest --context $CI_PROJECT_DIR
- /kaniko/executor --cache=true --dockerfile=$CI_PROJECT_DIR/docker/Dockerfile.backend --destination=$CONTAINER_REGISTRY/backend:$CI_COMMIT_SHORT_SHA --destination=$CONTAINER_REGISTRY/backend:latest --context $CI_PROJECT_DIR
only:
- master
......@@ -124,8 +124,8 @@ deploy-helm-master-dry-run:
- west1-b
script:
- ln -sf $CI_PROJECT_DIR/deploy/configs $CI_PROJECT_DIR/deploy/boxomon-charts/backend/configs
- helm upgrade --install --dry-run --namespace $KUBERNETES_NAMESPACE boxomon-frontend --values $CI_PROJECT_DIR/deploy/helm-upgrade/frontend-values.yaml --set image.tag=$CI_COMMIT_REF_SLUG $CI_PROJECT_DIR/deploy/boxomon-charts/frontend
- helm upgrade --install --dry-run --namespace $KUBERNETES_NAMESPACE boxomon-backend --values $CI_PROJECT_DIR/deploy/helm-upgrade/backend-values.yaml --set image.tag=$CI_COMMIT_REF_SLUG $CI_PROJECT_DIR/deploy/boxomon-charts/backend
- helm upgrade --install --dry-run --namespace $KUBERNETES_NAMESPACE boxomon-frontend --values $CI_PROJECT_DIR/deploy/helm-upgrade/frontend-values.yaml --set image.tag=$CI_COMMIT_SHA $CI_PROJECT_DIR/deploy/boxomon-charts/frontend
- helm upgrade --install --dry-run --namespace $KUBERNETES_NAMESPACE boxomon-backend --values $CI_PROJECT_DIR/deploy/helm-upgrade/backend-values.yaml --set image.tag=$CI_COMMIT_SHA $CI_PROJECT_DIR/deploy/boxomon-charts/backend
only:
- master
......@@ -150,7 +150,7 @@ build-frontend-tag:
name: gcr.io/kaniko-project/executor:debug-v0.23.0
entrypoint: [""]
script:
- /kaniko/executor --cache=true --dockerfile=$CI_PROJECT_DIR/frontend/Dockerfile --destination=$CONTAINER_REGISTRY/frontend:$CI_COMMIT_REF_SLUG --context $CI_PROJECT_DIR/frontend
- /kaniko/executor --cache=true --dockerfile=$CI_PROJECT_DIR/frontend/Dockerfile --destination=$CONTAINER_REGISTRY/frontend:$CI_COMMIT_TAG --context $CI_PROJECT_DIR/frontend
only:
- tags
......@@ -163,7 +163,7 @@ build-backend-tag:
entrypoint: [""]
script:
- cp $CI_PROJECT_DIR/docker/Dockerfile.backend.dockerignore $CI_PROJECT_DIR/.dockerignore
- /kaniko/executor --cache=true --dockerfile=$CI_PROJECT_DIR/docker/Dockerfile.backend --destination=$CONTAINER_REGISTRY/backend:$CI_COMMIT_REF_SLUG --context $CI_PROJECT_DIR
- /kaniko/executor --cache=true --dockerfile=$CI_PROJECT_DIR/docker/Dockerfile.backend --destination=$CONTAINER_REGISTRY/backend:$CI_COMMIT_TAG --context $CI_PROJECT_DIR
only:
- tags
......@@ -177,8 +177,8 @@ deploy-helm:
- west1-b
script:
- ln -sf $CI_PROJECT_DIR/deploy/configs $CI_PROJECT_DIR/deploy/boxomon-charts/backend/configs
- helm upgrade --install --namespace $KUBERNETES_NAMESPACE boxomon-frontend --values $CI_PROJECT_DIR/deploy/helm-upgrade/frontend-values.yaml --set image.tag=$CI_COMMIT_REF_SLUG $CI_PROJECT_DIR/deploy/boxomon-charts/frontend
- helm upgrade --install --namespace $KUBERNETES_NAMESPACE boxomon-backend --values $CI_PROJECT_DIR/deploy/helm-upgrade/backend-values.yaml --set image.tag=$CI_COMMIT_REF_SLUG $CI_PROJECT_DIR/deploy/boxomon-charts/backend
- helm upgrade --install --namespace $KUBERNETES_NAMESPACE boxomon-frontend --values $CI_PROJECT_DIR/deploy/helm-upgrade/frontend-values.yaml --set image.tag=$CI_COMMIT_TAG $CI_PROJECT_DIR/deploy/boxomon-charts/frontend
- helm upgrade --install --namespace $KUBERNETES_NAMESPACE boxomon-backend --values $CI_PROJECT_DIR/deploy/helm-upgrade/backend-values.yaml --set image.tag=$CI_COMMIT_TAG $CI_PROJECT_DIR/deploy/boxomon-charts/backend
only:
- tags
except:
......
......@@ -6,11 +6,6 @@ replicaCount: 2
image: {}
arguments:
nameOverride: ""
fullnameOverride: ""
service:
# type: ClusterIP
ports:
......@@ -83,8 +78,8 @@ affinity:
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app.kubernetes.io/name
- key: app.kubernetes.io/instance
operator: In
values:
- {{ include "backend.name" . }}
- boxomon-backend
topologyKey: kubernetes.io/hostname
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment