From b472a717f7728c937bd398dbce11bd0fb4e22b67 Mon Sep 17 00:00:00 2001 From: XoR Date: Wed, 26 Mar 2025 11:14:50 +0300 Subject: [PATCH] Edit. --- 3-example/application.yaml | 2 +- 5-example/application.yaml | 2 +- deploy-pr/environments/dev/my-app/kustomization.yaml | 2 +- deploy-pr/my-app-base/deployment.yaml | 2 +- deploy-pr/my-app/1-deployment.yaml | 2 +- deploy/second-app/1-deployment.yaml | 2 +- .../environments/dev/my-app/kustomization.yaml | 2 +- lesson-158-private/my-app-base/deployment.yaml | 2 +- lesson-158-private/my-app/1-deployment.yaml | 2 +- lesson-158/environments/staging/my-app/1-deployment.yaml | 2 +- .../environments/staging/second-app/1-deployment.yaml | 2 +- upgrade.sh | 6 +++--- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/3-example/application.yaml b/3-example/application.yaml index ad38d62..3c86706 100644 --- a/3-example/application.yaml +++ b/3-example/application.yaml @@ -11,7 +11,7 @@ spec: source: repoURL: git@github.com:antonputra/lesson-158-private.git targetRevision: HEAD - path: my-app + path: deploy/my-app destination: server: https://kubernetes.default.svc syncPolicy: diff --git a/5-example/application.yaml b/5-example/application.yaml index 2dad986..d81493e 100644 --- a/5-example/application.yaml +++ b/5-example/application.yaml @@ -11,7 +11,7 @@ spec: source: repoURL: git@github.com:antonputra/lesson-158-private.git targetRevision: HEAD - path: environments/dev/my-app + path: deploy-pr/environments/dev/my-app destination: server: https://kubernetes.default.svc syncPolicy: diff --git a/deploy-pr/environments/dev/my-app/kustomization.yaml b/deploy-pr/environments/dev/my-app/kustomization.yaml index e4ac41e..d2ab2db 100644 --- a/deploy-pr/environments/dev/my-app/kustomization.yaml +++ b/deploy-pr/environments/dev/my-app/kustomization.yaml @@ -1,7 +1,7 @@ --- namespace: staging images: - - name: aputra/nginx + - name: benadis/nginx newTag: v0.1.0 resources: - ../../../my-app-base diff --git a/deploy-pr/my-app-base/deployment.yaml b/deploy-pr/my-app-base/deployment.yaml index 5fecbd9..7170a85 100644 --- a/deploy-pr/my-app-base/deployment.yaml +++ b/deploy-pr/my-app-base/deployment.yaml @@ -16,6 +16,6 @@ spec: containers: - name: nginx imagePullPolicy: Always - image: aputra/nginx + image: benadis/nginx ports: - containerPort: 80 diff --git a/deploy-pr/my-app/1-deployment.yaml b/deploy-pr/my-app/1-deployment.yaml index c329e35..a9f7df4 100644 --- a/deploy-pr/my-app/1-deployment.yaml +++ b/deploy-pr/my-app/1-deployment.yaml @@ -19,7 +19,7 @@ spec: containers: - name: nginx imagePullPolicy: Always - image: aputra/nginx-private:v0.1.0 + image: benadis/nginx:v0.1.0 ports: - containerPort: 80 imagePullSecrets: diff --git a/deploy/second-app/1-deployment.yaml b/deploy/second-app/1-deployment.yaml index a529751..22e08d6 100644 --- a/deploy/second-app/1-deployment.yaml +++ b/deploy/second-app/1-deployment.yaml @@ -18,6 +18,6 @@ spec: spec: containers: - name: nginx - image: aputra/nginx:v0.1.3 + image: benadis/nginx:v0.1.0 ports: - containerPort: 80 diff --git a/lesson-158-private/environments/dev/my-app/kustomization.yaml b/lesson-158-private/environments/dev/my-app/kustomization.yaml index e4ac41e..d2ab2db 100644 --- a/lesson-158-private/environments/dev/my-app/kustomization.yaml +++ b/lesson-158-private/environments/dev/my-app/kustomization.yaml @@ -1,7 +1,7 @@ --- namespace: staging images: - - name: aputra/nginx + - name: benadis/nginx newTag: v0.1.0 resources: - ../../../my-app-base diff --git a/lesson-158-private/my-app-base/deployment.yaml b/lesson-158-private/my-app-base/deployment.yaml index 5fecbd9..7170a85 100644 --- a/lesson-158-private/my-app-base/deployment.yaml +++ b/lesson-158-private/my-app-base/deployment.yaml @@ -16,6 +16,6 @@ spec: containers: - name: nginx imagePullPolicy: Always - image: aputra/nginx + image: benadis/nginx ports: - containerPort: 80 diff --git a/lesson-158-private/my-app/1-deployment.yaml b/lesson-158-private/my-app/1-deployment.yaml index c329e35..a9f7df4 100644 --- a/lesson-158-private/my-app/1-deployment.yaml +++ b/lesson-158-private/my-app/1-deployment.yaml @@ -19,7 +19,7 @@ spec: containers: - name: nginx imagePullPolicy: Always - image: aputra/nginx-private:v0.1.0 + image: benadis/nginx:v0.1.0 ports: - containerPort: 80 imagePullSecrets: diff --git a/lesson-158/environments/staging/my-app/1-deployment.yaml b/lesson-158/environments/staging/my-app/1-deployment.yaml index 8c806ed..d4ee7cb 100644 --- a/lesson-158/environments/staging/my-app/1-deployment.yaml +++ b/lesson-158/environments/staging/my-app/1-deployment.yaml @@ -18,6 +18,6 @@ spec: spec: containers: - name: nginx - image: aputra/nginx:v0.1.3 + image: benadis/nginx:v0.1.0 ports: - containerPort: 80 diff --git a/lesson-158/environments/staging/second-app/1-deployment.yaml b/lesson-158/environments/staging/second-app/1-deployment.yaml index a529751..22e08d6 100644 --- a/lesson-158/environments/staging/second-app/1-deployment.yaml +++ b/lesson-158/environments/staging/second-app/1-deployment.yaml @@ -18,6 +18,6 @@ spec: spec: containers: - name: nginx - image: aputra/nginx:v0.1.3 + image: benadis/nginx:v0.1.0 ports: - containerPort: 80 diff --git a/upgrade.sh b/upgrade.sh index 9def020..bf99830 100644 --- a/upgrade.sh +++ b/upgrade.sh @@ -8,10 +8,10 @@ new_ver=$1 echo "new version: $new_ver" # Simulate release of the new docker images -docker tag nginx:1.23.3 aputra/nginx:$new_ver +docker tag nginx:1.23.3 benadis/nginx:$new_ver # Push new version to dockerhub -docker push aputra/nginx:$new_ver +docker push benadis/nginx:$new_ver # Create temporary folder tmp_dir=$(mktemp -d) @@ -21,7 +21,7 @@ echo $tmp_dir git clone git@github.com:antonputra/lesson-158.git $tmp_dir # Update image tag -sed -i '' -e "s/aputra\/nginx:.*/aputra\/nginx:$new_ver/g" $tmp_dir/my-app/1-deployment.yaml +sed -i '' -e "s/benadis\/nginx:.*/benadis\/nginx:$new_ver/g" $tmp_dir/my-app/1-deployment.yaml # Commit and push cd $tmp_dir