Skip to content

Commit

Permalink
replace group pattern with group-1-b2
Browse files Browse the repository at this point in the history
  • Loading branch information
WeRockStar committed May 17, 2024
1 parent 5df96e7 commit b55c6e4
Show file tree
Hide file tree
Showing 12 changed files with 26 additions and 26 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/cicd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [ main ]
env:
PROJECT_NAME: workshop-summer-<GROUP_NO>
PROJECT_NAME: workshop-summer-group-1-b2

jobs:
unit-test:
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
with:
push: ${{ github.ref == 'refs/heads/main' }}
tags: ghcr.io/kkgo-software-engineering/workshop-summer-<GROUP_NO>:${{ env.GITHUB_SHA }}
tags: ghcr.io/kkgo-software-engineering/workshop-summer-group-1-b2:${{ env.GITHUB_SHA }}

- name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}
Expand All @@ -109,7 +109,7 @@ jobs:
- name: change image tag to deploy dev
if: ${{ github.ref == 'refs/heads/main' }}
run: |
sed -i -E "s/ghcr.io\/kkgo-software-engineering\/workshop-summer-<GROUP_NO>.*$/ghcr.io\/kkgo-software-engineering\/workshop-summer-<GROUP_NO>:${GITHUB_SHA}/" infra/gitops/dev/deployment.yaml
sed -i -E "s/ghcr.io\/kkgo-software-engineering\/workshop-summer-group-1-b2.*$/ghcr.io\/kkgo-software-engineering\/workshop-summer-group-1-b2:${GITHUB_SHA}/" infra/gitops/dev/deployment.yaml
git add infra/gitops/dev/deployment.yaml
git commit -m "[skip actions] 🤖 change dev docker image version to ${GITHUB_SHA}"
git pull --rebase
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prod-cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: change image tag
run: |
sed -i -E "s/ghcr.io\/kkgo-software-engineering\/workshop-summer-<GROUP_NO>.*$/ghcr.io\/kkgo-software-engineering\/workshop-summer-<GROUP_NO>:${{ inputs.deploy-tag }}/" infra/gitops/prod/deployment.yaml
sed -i -E "s/ghcr.io\/kkgo-software-engineering\/workshop-summer-group-1-b2.*$/ghcr.io\/kkgo-software-engineering\/workshop-summer-group-1-b2:${{ inputs.deploy-tag }}/" infra/gitops/prod/deployment.yaml
git add infra/gitops/prod/deployment.yaml
git commit -m "[skip actions] ship it to prod 🚀 with ${{ inputs.deploy-message }}"
git pull --rebase
Expand Down
2 changes: 1 addition & 1 deletion infra/gitops/dev/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: app-config
namespace: <GROUP_NO>-dev
namespace: group-1-b2-dev
data:
server.port: "8080"
enable.create.spender: "true"
8 changes: 4 additions & 4 deletions infra/gitops/dev/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: <GROUP_NO>-dev-deployment
namespace: <GROUP_NO>-dev
name: group-1-b2-dev-deployment
namespace: group-1-b2-dev
spec:
selector:
matchLabels:
Expand All @@ -14,8 +14,8 @@ spec:
app: api
spec:
containers:
- name: workshop-summer-<GROUP_NO>
image: ghcr.io/kkgo-software-engineering/workshop-summer-<GROUP_NO>:a8704d65943f6596e13f8afaaf37d3c8989810fe
- name: workshop-summer-group-1-b2
image: ghcr.io/kkgo-software-engineering/workshop-summer-group-1-b2:a8704d65943f6596e13f8afaaf37d3c8989810fe
imagePullPolicy: Always
env:
- name: DATABASE_POSTGRES_URI
Expand Down
6 changes: 3 additions & 3 deletions infra/gitops/dev/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: ingress-website
namespace: <GROUP_NO>-dev
namespace: group-1-b2-dev
annotations:
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
spec:
ingressClassName: nginx
rules:
- host: <GROUP_NO>-dev.werockstar.dev
- host: group-1-b2-dev.werockstar.dev
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: <GROUP_NO>-dev-service
name: group-1-b2-dev-service
port:
number: 80
2 changes: 1 addition & 1 deletion infra/gitops/dev/namespace.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: v1
kind: Namespace
metadata:
name: <GROUP_NO>-dev
name: group-1-b2-dev
4 changes: 2 additions & 2 deletions infra/gitops/dev/service.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
kind: Service
metadata:
name: <GROUP_NO>-dev-service
namespace: <GROUP_NO>-dev
name: group-1-b2-dev-service
namespace: group-1-b2-dev
spec:
ports:
- port: 80
Expand Down
2 changes: 1 addition & 1 deletion infra/gitops/prod/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: app-config
namespace: <GROUP_NO>-prod
namespace: group-1-b2-prod
data:
server.port: "8080"
enable.create.spender: "false"
8 changes: 4 additions & 4 deletions infra/gitops/prod/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: <GROUP_NO>-prod-deployment
namespace: <GROUP_NO>-prod
name: group-1-b2-prod-deployment
namespace: group-1-b2-prod
spec:
selector:
matchLabels:
Expand All @@ -14,8 +14,8 @@ spec:
app: api
spec:
containers:
- name: workshop-summer-<GROUP_NO>
image: ghcr.io/kkgo-software-engineering/workshop-summer-<GROUP_NO>:b363bea56839ebd2adf0f1bae2a36726e25ff810
- name: workshop-summer-group-1-b2
image: ghcr.io/kkgo-software-engineering/workshop-summer-group-1-b2:b363bea56839ebd2adf0f1bae2a36726e25ff810
imagePullPolicy: Always
env:
- name: DATABASE_POSTGRES_URI
Expand Down
6 changes: 3 additions & 3 deletions infra/gitops/prod/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: ingress-website
namespace: <GROUP_NO>-prod
namespace: group-1-b2-prod
annotations:
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
spec:
ingressClassName: nginx
rules:
- host: <GROUP_NO>-prod.werockstar.dev
- host: group-1-b2-prod.werockstar.dev
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: <GROUP_NO>-prod-service
name: group-1-b2-prod-service
port:
number: 80
2 changes: 1 addition & 1 deletion infra/gitops/prod/namespace.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: v1
kind: Namespace
metadata:
name: <GROUP_NO>-prod
name: group-1-b2-prod
4 changes: 2 additions & 2 deletions infra/gitops/prod/service.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
kind: Service
metadata:
name: <GROUP_NO>-prod-service
namespace: <GROUP_NO>-prod
name: group-1-b2-prod-service
namespace: group-1-b2-prod
spec:
ports:
- port: 80
Expand Down

0 comments on commit b55c6e4

Please sign in to comment.