Skip to content

Commit

Permalink
Revert "feat(workflow): updated from deprecated container registry to…
Browse files Browse the repository at this point in the history
… artifac…" (#724)

This reverts commit 7384092.
  • Loading branch information
kadey001 authored Nov 13, 2024
1 parent 7384092 commit 01de23e
Show file tree
Hide file tree
Showing 15 changed files with 41 additions and 48 deletions.
13 changes: 6 additions & 7 deletions .github/workflows/cc2c-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ env:
DATABASE_URL: ${{ secrets.DATABASE_URL }} # Used for prisma migration
REGISTRATION_AUTHORIZATION_CODE: ${{ secrets.REGISTRATION_AUTHORIZATION_CODE }}
PRYTANEUM_URL: ${{ vars.PRYTANEUM_URL }}
GOOGLE_ARTIFACT_REPO: ${{ vars.GOOGLE_ARTIFACT_REPO }}

jobs:
staging:
Expand Down Expand Up @@ -72,7 +71,7 @@ jobs:
run: |-
docker build \
-f ./docker/Dockerfile.cc2c \
--tag "$GOOGLE_ARTIFACT_REPO/$CC2C_IMAGE:$GITHUB_SHA" \
--tag "gcr.io/$PROJECT_ID/$CC2C_IMAGE:$GITHUB_SHA" \
--build-arg GITHUB_SHA="$GITHUB_SHA" \
--build-arg GITHUB_REF="$GITHUB_REF" \
--build-arg DEPLOYMENT_ENV="development" \
Expand All @@ -85,7 +84,7 @@ jobs:
# Push the App image to Google Container Registry
- name: Publish App
run: docker push "$GOOGLE_ARTIFACT_REPO/$CC2C_IMAGE:$GITHUB_SHA"
run: docker push "gcr.io/$PROJECT_ID/$CC2C_IMAGE:$GITHUB_SHA"

# Set up kustomize
- name: Set up Kustomize
Expand All @@ -97,7 +96,7 @@ jobs:
- name: Kustomize & Deploy App
run: |-
cd ./k8s/cc2c/app/development
kustomize edit set image GOOGLE_ARTIFACT_REPO/CC2C_IMAGE:TAG=$GOOGLE_ARTIFACT_REPO/$CC2C_IMAGE:$GITHUB_SHA
kustomize edit set image gcr.io/PROJECT_ID/CC2C_IMAGE:TAG=gcr.io/$PROJECT_ID/$CC2C_IMAGE:$GITHUB_SHA
kustomize edit set namespace $NAMESPACE
kustomize build . | kubectl apply -f -
Expand Down Expand Up @@ -162,7 +161,7 @@ jobs:
run: |-
docker build \
-f ./docker/Dockerfile.cc2c \
--tag "$GOOGLE_ARTIFACT_REPO/$CC2C_IMAGE:$GITHUB_SHA" \
--tag "gcr.io/$PROJECT_ID/$CC2C_IMAGE:$GITHUB_SHA" \
--build-arg GITHUB_SHA="$GITHUB_SHA" \
--build-arg GITHUB_REF="$GITHUB_REF" \
--build-arg DEPLOYMENT_ENV="production" \
Expand All @@ -175,7 +174,7 @@ jobs:
# Push the App image to Google Container Registry
- name: Publish App
run: docker push "$GOOGLE_ARTIFACT_REPO/$CC2C_IMAGE:$GITHUB_SHA"
run: docker push "gcr.io/$PROJECT_ID/$CC2C_IMAGE:$GITHUB_SHA"

# Set up kustomize
- name: Set up Kustomize
Expand All @@ -187,7 +186,7 @@ jobs:
- name: Kustomize & Deploy App
run: |-
cd ./k8s/cc2c/app/production
kustomize edit set image GOOGLE_ARTIFACT_REPO/CC2C_IMAGE:TAG=$GOOGLE_ARTIFACT_REPO/$CC2C_IMAGE:$GITHUB_SHA
kustomize edit set image gcr.io/PROJECT_ID/CC2C_IMAGE:TAG=gcr.io/$PROJECT_ID/$CC2C_IMAGE:$GITHUB_SHA
kustomize edit set namespace $NAMESPACE
kustomize build . | kubectl apply -f -
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/client-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ env:
ORIGIN: ${{ vars.ORIGIN }}
API_URL: ${{ vars.API_URL }}
GOOGLE_MEET_API_KEY: ${{ vars.GOOGLE_MEET_API_KEY }}
$GOOGLE_ARTIFACT_REPO: ${{ vars.GOOGLE_ARTIFACT_REPO }}

jobs:
staging:
Expand Down Expand Up @@ -73,7 +72,7 @@ jobs:
run: |-
docker build \
-f ./docker/Dockerfile.client \
--tag "$GOOGLE_ARTIFACT_REPO/$CLIENT_IMAGE:$GITHUB_SHA" \
--tag "gcr.io/$PROJECT_ID/$CLIENT_IMAGE:$GITHUB_SHA" \
--build-arg GITHUB_SHA="$GITHUB_SHA" \
--build-arg GITHUB_REF="$GITHUB_REF" \
--build-arg GRAPHQL_URL="$GRAPHQL_URL" \
Expand All @@ -86,7 +85,7 @@ jobs:
# Push the Client image to Google Container Registry
- name: Publish Client
run: docker push "$GOOGLE_ARTIFACT_REPO/$CLIENT_IMAGE:$GITHUB_SHA"
run: docker push "gcr.io/$PROJECT_ID/$CLIENT_IMAGE:$GITHUB_SHA"

# Set up kustomize
- name: Set up Kustomize
Expand All @@ -98,7 +97,7 @@ jobs:
- name: Kustomize & Deploy Client
run: |-
cd ./k8s/client/development
kustomize edit set image GOOGLE_ARTIFACT_REPO/CLIENT_IMAGE:TAG=$GOOGLE_ARTIFACT_REPO/$CLIENT_IMAGE:$GITHUB_SHA
kustomize edit set image gcr.io/PROJECT_ID/CLIENT_IMAGE:TAG=gcr.io/$PROJECT_ID/$CLIENT_IMAGE:$GITHUB_SHA
kustomize edit set namespace $NAMESPACE
kustomize build . | kubectl apply -f -
Expand Down Expand Up @@ -151,7 +150,7 @@ jobs:
run: |-
docker build \
-f ./docker/Dockerfile.client \
--tag "$GOOGLE_ARTIFACT_REPO/$CLIENT_IMAGE:$GITHUB_SHA" \
--tag "gcr.io/$PROJECT_ID/$CLIENT_IMAGE:$GITHUB_SHA" \
--build-arg GITHUB_SHA="$GITHUB_SHA" \
--build-arg GITHUB_REF="$GITHUB_REF" \
--build-arg DEPLOYMENT_ENV="production" \
Expand All @@ -163,7 +162,7 @@ jobs:
# Push the Client image to Google Container Registry
- name: Publish Client
run: docker push "$GOOGLE_ARTIFACT_REPO/$CLIENT_IMAGE:$GITHUB_SHA"
run: docker push "gcr.io/$PROJECT_ID/$CLIENT_IMAGE:$GITHUB_SHA"

# Set up kustomize
- name: Set up Kustomize
Expand All @@ -175,7 +174,7 @@ jobs:
- name: Kustomize & Deploy Client
run: |-
cd ./k8s/client/production
kustomize edit set image GOOGLE_ARTIFACT_REPO/CLIENT_IMAGE:TAG=$GOOGLE_ARTIFACT_REPO/$CLIENT_IMAGE:$GITHUB_SHA
kustomize edit set image gcr.io/PROJECT_ID/CLIENT_IMAGE:TAG=gcr.io/$PROJECT_ID/$CLIENT_IMAGE:$GITHUB_SHA
kustomize edit set namespace $NAMESPACE
kustomize build . | kubectl apply -f -
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/gcp-service-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ env:
GKE_ZONE: ${{ vars.GKE_ZONE }}
GCP_SERVICE_IMAGE: ${{ vars.GCP_SERVICE_IMAGE }}
NAMESPACE: ${{ vars.NAMESPACE }}
GOOGLE_ARTIFACT_REPO: ${{ vars.GOOGLE_ARTIFACT_REPO }}

jobs:
staging:
Expand Down Expand Up @@ -66,21 +65,21 @@ jobs:
run: |-
docker build \
-f ./docker/Dockerfile.gcp \
--tag "$GOOGLE_ARTIFACT_REPO/$GCP_SERVICE_IMAGE:$GITHUB_SHA" \
--tag "gcr.io/$PROJECT_ID/$GCP_SERVICE_IMAGE:$GITHUB_SHA" \
--build-arg GITHUB_SHA="$GITHUB_SHA" \
--build-arg GITHUB_REF="$GITHUB_REF" \
--build-arg DEPLOYMENT_ENV="development" \
.
# Push the App image to Google Container Registry
- name: Publish GCP Service
run: docker push "$GOOGLE_ARTIFACT_REPO/$GCP_SERVICE_IMAGE:$GITHUB_SHA"
run: docker push "gcr.io/$PROJECT_ID/$GCP_SERVICE_IMAGE:$GITHUB_SHA"

# Deploy the Docker image to the GKE cluster
- name: Kustomize & Deploy GCP Service
run: |-
cd ./k8s/cc2c/gcp/development
kustomize edit set image GOOGLE_ARTIFACT_REPO/GCP_SERVICE_IMAGE:TAG=$GOOGLE_ARTIFACT_REPO/$GCP_SERVICE_IMAGE:$GITHUB_SHA
kustomize edit set image gcr.io/PROJECT_ID/GCP_SERVICE_IMAGE:TAG=gcr.io/$PROJECT_ID/$GCP_SERVICE_IMAGE:$GITHUB_SHA
kustomize edit set namespace $NAMESPACE
kustomize build . | kubectl apply -f -
Expand Down Expand Up @@ -133,21 +132,21 @@ jobs:
run: |-
docker build \
-f ./docker/Dockerfile.gcp \
--tag "$GOOGLE_ARTIFACT_REPO/$GCP_SERVICE_IMAGE:$GITHUB_SHA" \
--tag "gcr.io/$PROJECT_ID/$GCP_SERVICE_IMAGE:$GITHUB_SHA" \
--build-arg GITHUB_SHA="$GITHUB_SHA" \
--build-arg GITHUB_REF="$GITHUB_REF" \
--build-arg DEPLOYMENT_ENV="production" \
.
# Push the App image to Google Container Registry
- name: Publish GCP Service
run: docker push "$GOOGLE_ARTIFACT_REPO/$GCP_SERVICE_IMAGE:$GITHUB_SHA"
run: docker push "gcr.io/$PROJECT_ID/$GCP_SERVICE_IMAGE:$GITHUB_SHA"

# Deploy the Docker image to the GKE cluster
- name: Kustomize & Deploy GCP Service
run: |-
cd ./k8s/cc2c/gcp/production
kustomize edit set image GOOGLE_ARTIFACT_REPO/GCP_SERVICE_IMAGE:TAG=$GOOGLE_ARTIFACT_REPO/$GCP_SERVICE_IMAGE:$GITHUB_SHA
kustomize edit set image gcr.io/PROJECT_ID/GCP_SERVICE_IMAGE:TAG=gcr.io/$PROJECT_ID/$GCP_SERVICE_IMAGE:$GITHUB_SHA
kustomize edit set namespace $NAMESPACE
kustomize build . | kubectl apply -f -
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/moderation-algo-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ env:
MODERATION_ALGO_IMAGE: ${{ vars.MODERATION_ALGO_IMAGE }}
NAMESPACE: ${{ vars.NAMESPACE }}
ORIGIN: ${{ vars.ORIGIN }}
GOOGLE_ARTIFACT_REPO: ${{ vars.GOOGLE_ARTIFACT_REPO }}

jobs:
staging:
Expand Down Expand Up @@ -73,14 +72,14 @@ jobs:
run: |-
docker build \
-f ./app/moderation-algo/Dockerfile \
--tag "$GOOGLE_ARTIFACT_REPO/$MODERATION_ALGO_IMAGE:$GITHUB_SHA" \
--tag "gcr.io/$PROJECT_ID/$MODERATION_ALGO_IMAGE:$GITHUB_SHA" \
--build-arg GITHUB_SHA="$GITHUB_SHA" \
--build-arg GITHUB_REF="$GITHUB_REF" \
./app/moderation-algo
# Push the Moderation algo image to Google Container Registry
- name: Publish Moderation Algorithm
run: docker push "$GOOGLE_ARTIFACT_REPO/$MODERATION_ALGO_IMAGE:$GITHUB_SHA"
run: docker push "gcr.io/$PROJECT_ID/$MODERATION_ALGO_IMAGE:$GITHUB_SHA"

# Set up kustomize
- name: Set up Kustomize
Expand All @@ -92,7 +91,7 @@ jobs:
- name: Kustomize & Deploy Moderation Algorithm
run: |-
cd ./k8s/moderation-algo/development
kustomize edit set image GOOGLE_ARTIFACT_REPO/MODERATION_ALGO_IMAGE:TAG=$GOOGLE_ARTIFACT_REPO/$MODERATION_ALGO_IMAGE:$GITHUB_SHA
kustomize edit set image gcr.io/PROJECT_ID/MODERATION_ALGO_IMAGE:TAG=gcr.io/$PROJECT_ID/$MODERATION_ALGO_IMAGE:$GITHUB_SHA
kustomize edit set namespace $NAMESPACE
kustomize build . | kubectl apply -f -
Expand Down Expand Up @@ -161,14 +160,14 @@ jobs:
run: |-
docker build \
-f ./app/moderation-algo/Dockerfile \
--tag "$GOOGLE_ARTIFACT_REPO/$MODERATION_ALGO_IMAGE:$GITHUB_SHA" \
--tag "gcr.io/$PROJECT_ID/$MODERATION_ALGO_IMAGE:$GITHUB_SHA" \
--build-arg GITHUB_SHA="$GITHUB_SHA" \
--build-arg GITHUB_REF="$GITHUB_REF" \
./app/moderation-algo
# Push the Moderation algo image to Google Container Registry
- name: Publish Moderation Algorithm
run: docker push "$GOOGLE_ARTIFACT_REPO/$MODERATION_ALGO_IMAGE:$GITHUB_SHA"
run: docker push "gcr.io/$PROJECT_ID/$MODERATION_ALGO_IMAGE:$GITHUB_SHA"

# Set up kustomize
- name: Set up Kustomize
Expand All @@ -180,7 +179,7 @@ jobs:
- name: Kustomize & Deploy Moderation Algorithm
run: |-
cd ./k8s/moderation-algo/production
kustomize edit set image GOOGLE_ARTIFACT_REPO/MODERATION_ALGO_IMAGE:TAG=$GOOGLE_ARTIFACT_REPO/$MODERATION_ALGO_IMAGE:$GITHUB_SHA
kustomize edit set image gcr.io/PROJECT_ID/MODERATION_ALGO_IMAGE:TAG=gcr.io/$PROJECT_ID/$MODERATION_ALGO_IMAGE:$GITHUB_SHA
kustomize edit set namespace $NAMESPACE
kustomize build . | kubectl apply -f -
Expand Down
17 changes: 7 additions & 10 deletions .github/workflows/server-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ env:
GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }}
GOOGLE_REDIRECT_URI: ${{ vars.GOOGLE_REDIRECT_URI }}
GOOGLE_ARTIFACT_REPO: ${{ vars.GOOGLE_ARTIFACT_REPO }}

jobs:
staging:
Expand Down Expand Up @@ -60,10 +59,8 @@ jobs:

# Configure Docker to use the gcloud command-line tool as a credential
# helper for authentication
# This is required to push the Docker image to Google Artifact Registry
- run: |-
gcloud --quiet auth configure-docker \
us-central1-docker.pkg.dev
gcloud --quiet auth configure-docker
# Get the GKE credentials so we can deploy to the cluster
- id: 'get-credentials'
uses: google-github-actions/get-gke-credentials@v0.7.0
Expand All @@ -76,7 +73,7 @@ jobs:
run: |-
docker build \
-f ./docker/Dockerfile.server \
--tag "$GOOGLE_ARTIFACT_REPO/$SERVER_IMAGE:$GITHUB_SHA" \
--tag "gcr.io/$PROJECT_ID/$SERVER_IMAGE:$GITHUB_SHA" \
--build-arg ORIGIN="$ORIGIN" \
--build-arg GITHUB_SHA="$GITHUB_SHA" \
--build-arg GITHUB_REF="$GITHUB_REF" \
Expand All @@ -87,7 +84,7 @@ jobs:
# Push the Server image to Google Container Registry
- name: Publish Server
run: docker push "$GOOGLE_ARTIFACT_REPO/$SERVER_IMAGE:$GITHUB_SHA"
run: docker push "gcr.io/$PROJECT_ID/$SERVER_IMAGE:$GITHUB_SHA"

# Set up kustomize
- name: Set up Kustomize
Expand All @@ -99,7 +96,7 @@ jobs:
- name: Kustomize & Deploy Server
run: |-
cd ./k8s/server/development
kustomize edit set image GOOGLE_ARTIFACT_REPO/SERVER_IMAGE:TAG=$GOOGLE_ARTIFACT_REPO/$SERVER_IMAGE:$GITHUB_SHA
kustomize edit set image gcr.io/PROJECT_ID/SERVER_IMAGE:TAG=gcr.io/$PROJECT_ID/$SERVER_IMAGE:$GITHUB_SHA
kustomize edit set namespace $NAMESPACE
kustomize build . | kubectl apply -f -
Expand Down Expand Up @@ -165,7 +162,7 @@ jobs:
run: |-
docker build \
-f ./docker/Dockerfile.server \
--tag "$GOOGLE_ARTIFACT_REPO/$SERVER_IMAGE:$GITHUB_SHA" \
--tag "gcr.io/$PROJECT_ID/$SERVER_IMAGE:$GITHUB_SHA" \
--build-arg ORIGIN="$ORIGIN" \
--build-arg GITHUB_SHA="$GITHUB_SHA" \
--build-arg GITHUB_REF="$GITHUB_REF" \
Expand All @@ -176,7 +173,7 @@ jobs:
# Push the Server image to Google Container Registry
- name: Publish Server
run: docker push "$GOOGLE_ARTIFACT_REPO/$SERVER_IMAGE:$GITHUB_SHA"
run: docker push "gcr.io/$PROJECT_ID/$SERVER_IMAGE:$GITHUB_SHA"

# Set up kustomize
- name: Set up Kustomize
Expand All @@ -188,7 +185,7 @@ jobs:
- name: Kustomize & Deploy Server
run: |-
cd ./k8s/server/production
kustomize edit set image GOOGLE_ARTIFACT_REPO/SERVER_IMAGE:TAG=$GOOGLE_ARTIFACT_REPO/$SERVER_IMAGE:$GITHUB_SHA
kustomize edit set image gcr.io/PROJECT_ID/SERVER_IMAGE:TAG=gcr.io/$PROJECT_ID/$SERVER_IMAGE:$GITHUB_SHA
kustomize edit set namespace $NAMESPACE
kustomize build . | kubectl apply -f -
Expand Down
2 changes: 1 addition & 1 deletion k8s/cc2c/app/development/cc2c-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
secretName: gcp-storage-credentials
containers:
- name: cc2c
image: GOOGLE_ARTIFACT_REPO/CC2C_IMAGE:TAG
image: gcr.io/PROJECT_ID/CC2C_IMAGE:TAG
volumeMounts:
- name: google-cloud-key
mountPath: /var/secrets/google
Expand Down
2 changes: 1 addition & 1 deletion k8s/cc2c/app/production/cc2c-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
secretName: gcp-storage-credentials
containers:
- name: cc2c
image: GOOGLE_ARTIFACT_REPO/CC2C_IMAGE:TAG
image: gcr.io/PROJECT_ID/CC2C_IMAGE:TAG
volumeMounts:
- name: google-cloud-key
mountPath: /var/secrets/google
Expand Down
2 changes: 1 addition & 1 deletion k8s/cc2c/gcp/development/gcp-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
secretName: gcp-storage-credentials
containers:
- name: gcp
image: GOOGLE_ARTIFACT_REPO/GCP_SERVICE_IMAGE:TAG
image: gcr.io/PROJECT_ID/GCP_SERVICE_IMAGE:TAG
volumeMounts:
- name: google-cloud-key
mountPath: /var/secrets/google
Expand Down
2 changes: 1 addition & 1 deletion k8s/cc2c/gcp/production/gcp-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
secretName: gcp-storage-credentials
containers:
- name: gcp
image: GOOGLE_ARTIFACT_REPO/GCP_SERVICE_IMAGE:TAG
image: gcr.io/PROJECT_ID/GCP_SERVICE_IMAGE:TAG
volumeMounts:
- name: google-cloud-key
mountPath: /var/secrets/google
Expand Down
2 changes: 1 addition & 1 deletion k8s/client/development/prytaneum-client-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
spec:
containers:
- name: prytaneum-client
image: GOOGLE_ARTIFACT_REPO/CLIENT_IMAGE:TAG
image: gcr.io/PROJECT_ID/CLIENT_IMAGE:TAG
imagePullPolicy: IfNotPresent
resources:
limits:
Expand Down
2 changes: 1 addition & 1 deletion k8s/client/production/prytaneum-client-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
spec:
containers:
- name: prytaneum-client
image: GOOGLE_ARTIFACT_REPO/CLIENT_IMAGE:TAG
image: gcr.io/PROJECT_ID/CLIENT_IMAGE:TAG
imagePullPolicy: IfNotPresent
resources:
limits:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
spec:
containers:
- name: moderation-algo
image: GOOGLE_ARTIFACT_REPO/MODERATION_ALGO_IMAGE:TAG
image: gcr.io/PROJECT_ID/MODERATION_ALGO_IMAGE:TAG
imagePullPolicy: IfNotPresent
resources:
limits:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
spec:
containers:
- name: moderation-algo
image: GOOGLE_ARTIFACT_REPO/MODERATION_ALGO_IMAGE:TAG
image: gcr.io/PROJECT_ID/MODERATION_ALGO_IMAGE:TAG
imagePullPolicy: IfNotPresent
resources:
limits:
Expand Down
2 changes: 1 addition & 1 deletion k8s/server/development/prytaneum-server-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
spec:
containers:
- name: prytaneum-server
image: GOOGLE_ARTIFACT_REPO/SERVER_IMAGE:TAG
image: gcr.io/PROJECT_ID/SERVER_IMAGE:TAG
imagePullPolicy: IfNotPresent
resources:
limits:
Expand Down
Loading

0 comments on commit 01de23e

Please sign in to comment.