From ccf2ffed00d08a31cfbf3d1d55929102dd70e6d7 Mon Sep 17 00:00:00 2001 From: Iliyan Vutov Date: Mon, 28 Oct 2024 18:01:20 +0200 Subject: [PATCH 001/308] Ansible homework --- M1-3-Ansible/README.md | 36 ++++++++++++++++++++++++++++++++++++ requirements.txt | 4 ++++ 2 files changed, 40 insertions(+) create mode 100644 M1-3-Ansible/README.md diff --git a/M1-3-Ansible/README.md b/M1-3-Ansible/README.md new file mode 100644 index 000000000..e44faf9c3 --- /dev/null +++ b/M1-3-Ansible/README.md @@ -0,0 +1,36 @@ +# M1-3-1 Configuration Management + +## Ansible Task + +Create an Ansible playbook that build, push and then run the Docker image for the Python +application. Let your playbook has the following variables: + +* `image_name` - contains the name of your image without the tag, i.e. `vutoff/python-app` +* `image_tag` - contains the tag you tagged your image with, i.e. `v0.2` +* `listen_port` - contains the listening port you're binding your app to. + +Make sure that you set environment variable `PORT` when you define your container +in the Ansible playbook that takes its value from `listen_port` variable. + +Use Ansible modules. Do not shell out. + +### Requirements + +* Make sure you have Python installed. Any version above 3.8 would suffice. +* The `requirements.txt` file in this directory contains the required Ansible version. Run + +```sh +pip install -r requirements.txt +``` + +* Make sure that Docker is running on your local machine. + +### Mind the following + +* If you're running Docker Desktop or Rancher Desktop, mind the location of the `docker.sock` file. The location of the socket file is + * Docker Desktop - `${HOME}/.docker/run/docker.sock` + * Rancher DEsktop - ${HOME}/.rd/run/docker.sock + +* If you're using one of the above, when you write your Ansible playbook you +must specify the path to the docker socket with the parameter `docker_host`, +i.e. `docker_host: "unix://{{ ansible_env.HOME }}/.rd/docker.sock"`. diff --git a/requirements.txt b/requirements.txt index b5ba78cca..38a10fb15 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,7 @@ +ansible==10.3.0 +ansible-compat==24.9.1 +ansible-core==2.17.5 +ansible-lint==24.9.2 blinker==1.6.3 ; python_version >= "3.10" and python_version < "4.0" click==8.1.7 ; python_version >= "3.10" and python_version < "4.0" colorama==0.4.6 ; python_version >= "3.10" and python_version < "4.0" and platform_system == "Windows" From bf9ab711db808bfe96658882a5688a2dfe0497d3 Mon Sep 17 00:00:00 2001 From: dimitardd Date: Tue, 29 Oct 2024 01:38:29 +0200 Subject: [PATCH 002/308] dd docker file --- Dockerfile | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..ae1caa20f --- /dev/null +++ b/Dockerfile @@ -0,0 +1,22 @@ +FROM ubuntu:22.04 + +LABEL maintainer="dhd.dimitrov@gmail.com" +LABEL version="0.1" + +RUN apt-get update -y && \ + apt-get install -y --no-install-recommends \ + python3 \ + python3-pip && \ + groupadd -r appgroup && \ + useradd -r -g appgroup appuser + +WORKDIR /app + +COPY --chown=appuser:appgroup requirements.txt . +COPY --chown=appuser:appgroup ./app . + +RUN pip3 install -r requirements.txt + +USER appuser + +CMD ["python3", "app.py"] From 57a7e7a25b640e07752586f29b0ae607d4ddeb50 Mon Sep 17 00:00:00 2001 From: dimitardd Date: Tue, 29 Oct 2024 19:36:20 +0200 Subject: [PATCH 003/308] add docker file --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ae1caa20f..8cd78e7d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ WORKDIR /app COPY --chown=appuser:appgroup requirements.txt . COPY --chown=appuser:appgroup ./app . -RUN pip3 install -r requirements.txt +RUN pip3 install flask==3.0.0 USER appuser From 9053c54f82f70c34a718d7ebb8832243016b8447 Mon Sep 17 00:00:00 2001 From: dimitardd Date: Wed, 30 Oct 2024 14:58:35 +0200 Subject: [PATCH 004/308] dd DockerFiles --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8cd78e7d9..804199762 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:22.04 LABEL maintainer="dhd.dimitrov@gmail.com" -LABEL version="0.1" +LABEL version="4.1" RUN apt-get update -y && \ apt-get install -y --no-install-recommends \ From eb3976b1f52ffe2a9aa7d273135018c2b216fc60 Mon Sep 17 00:00:00 2001 From: dimitardd Date: Wed, 30 Oct 2024 15:00:19 +0200 Subject: [PATCH 005/308] dd dockerfile --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 804199762..8d198a1e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,6 @@ RUN apt-get update -y && \ WORKDIR /app -COPY --chown=appuser:appgroup requirements.txt . COPY --chown=appuser:appgroup ./app . RUN pip3 install flask==3.0.0 From b9751b9451018969a2e0f0973715739f89b34a6c Mon Sep 17 00:00:00 2001 From: dimitardd Date: Wed, 30 Oct 2024 15:47:11 +0200 Subject: [PATCH 006/308] dd file --- Dockerfile | 2 ++ m1-3-1-docker.yml | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 m1-3-1-docker.yml diff --git a/Dockerfile b/Dockerfile index 8d198a1e1..ff59d52c5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,6 +10,8 @@ RUN apt-get update -y && \ groupadd -r appgroup && \ useradd -r -g appgroup appuser +RUN apt-get install git -y --no-install-recommends + WORKDIR /app COPY --chown=appuser:appgroup ./app . diff --git a/m1-3-1-docker.yml b/m1-3-1-docker.yml new file mode 100644 index 000000000..19fd88120 --- /dev/null +++ b/m1-3-1-docker.yml @@ -0,0 +1,38 @@ +- name: Build, push and run Docker image M1-3-1 Ansible + hosts: localhost + gather_facts: no + vars: + ansible_python_interpreter: "/usr/bin/python3" + image_name: "dimitardd/dimitar-app02" + image_tag: "v4.1" + listen_port: "5000" + dockerpath: "/opt/telerik/build" + gitbanch: "dimitardd-281024" + + tasks: + - name: Get_Dockerfile_lates_version + git: + repo: git@github.com:dimitardd/devops-programme.git + dest: "{{ dockerpath }}" + version: "{{ gitbanch }}" + force: yes + + - name: build_container_image + docker_image: + name: "{{ image_name }}" + tag: "{{ image_tag }}" + build: + path: "{{ dockerpath }}" + dockerfile: Dockerfile + source: build + state: present + push: yes + register: build_image + + - name: tag_version + docker_image: + name: "{{ image_name }}" + repository: latest # New tag there. + pull: no + state: present + when: build_image.changed From 0ab27b2345a261aebf375bbe98e02bf53d9f6bd1 Mon Sep 17 00:00:00 2001 From: dimitardd Date: Wed, 30 Oct 2024 16:09:45 +0200 Subject: [PATCH 007/308] dd files --- Dockerfile | 2 +- m1-3-1-docker.yml | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index ff59d52c5..27f827e44 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN apt-get update -y && \ groupadd -r appgroup && \ useradd -r -g appgroup appuser -RUN apt-get install git -y --no-install-recommends +#RUN apt-get install git -y --no-install-recommends WORKDIR /app diff --git a/m1-3-1-docker.yml b/m1-3-1-docker.yml index 19fd88120..83f4a5b88 100644 --- a/m1-3-1-docker.yml +++ b/m1-3-1-docker.yml @@ -2,7 +2,6 @@ hosts: localhost gather_facts: no vars: - ansible_python_interpreter: "/usr/bin/python3" image_name: "dimitardd/dimitar-app02" image_tag: "v4.1" listen_port: "5000" @@ -10,14 +9,14 @@ gitbanch: "dimitardd-281024" tasks: - - name: Get_Dockerfile_lates_version + - name: Get Dockerfile lates version! git: repo: git@github.com:dimitardd/devops-programme.git dest: "{{ dockerpath }}" version: "{{ gitbanch }}" force: yes - - name: build_container_image + - name: Build Container Image! docker_image: name: "{{ image_name }}" tag: "{{ image_tag }}" @@ -26,13 +25,8 @@ dockerfile: Dockerfile source: build state: present - push: yes - register: build_image - +# push: yes - name: tag_version docker_image: - name: "{{ image_name }}" - repository: latest # New tag there. - pull: no - state: present - when: build_image.changed + name: latest # Equal to name in build task. + repository: "{{ image_name }}" From 40e05c2df92f3d5f1eb9b1b6fdcccc936bbc4d03 Mon Sep 17 00:00:00 2001 From: dimitardd Date: Wed, 30 Oct 2024 16:19:18 +0200 Subject: [PATCH 008/308] tag change --- m1-3-1-docker.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/m1-3-1-docker.yml b/m1-3-1-docker.yml index 83f4a5b88..c8f1f9ad9 100644 --- a/m1-3-1-docker.yml +++ b/m1-3-1-docker.yml @@ -26,7 +26,10 @@ source: build state: present # push: yes - - name: tag_version + + - name: Tag version latest docker_image: name: latest # Equal to name in build task. repository: "{{ image_name }}" + force_tag: true + source: local From 2b1dc2ce83cb4205f4817ad89899112d672dcc21 Mon Sep 17 00:00:00 2001 From: dimitardd Date: Wed, 30 Oct 2024 16:21:08 +0200 Subject: [PATCH 009/308] tag --- m1-3-1-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m1-3-1-docker.yml b/m1-3-1-docker.yml index c8f1f9ad9..766a14dac 100644 --- a/m1-3-1-docker.yml +++ b/m1-3-1-docker.yml @@ -29,7 +29,7 @@ - name: Tag version latest docker_image: - name: latest # Equal to name in build task. + name: "{{ image_name }}":latest # Equal to name in build task. repository: "{{ image_name }}" force_tag: true source: local From 3cbea5c75670b708f43fcff587e6278abd1b76a5 Mon Sep 17 00:00:00 2001 From: dimitardd Date: Wed, 30 Oct 2024 16:23:33 +0200 Subject: [PATCH 010/308] tag --- m1-3-1-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m1-3-1-docker.yml b/m1-3-1-docker.yml index 766a14dac..a057e3788 100644 --- a/m1-3-1-docker.yml +++ b/m1-3-1-docker.yml @@ -29,7 +29,7 @@ - name: Tag version latest docker_image: - name: "{{ image_name }}":latest # Equal to name in build task. + name: "{{ image_name }}"":latest" # Equal to name in build task. repository: "{{ image_name }}" force_tag: true source: local From 40ca622ebb4f50da34d5d778f8ebfcac8c9b2a5a Mon Sep 17 00:00:00 2001 From: dimitardd Date: Wed, 30 Oct 2024 18:28:44 +0200 Subject: [PATCH 011/308] add files --- Dockerfile | 3 +-- m1-3-1-docker.yml | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 27f827e44..9623aad53 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:22.04 LABEL maintainer="dhd.dimitrov@gmail.com" -LABEL version="4.1" +LABEL version="4.11" RUN apt-get update -y && \ apt-get install -y --no-install-recommends \ @@ -10,7 +10,6 @@ RUN apt-get update -y && \ groupadd -r appgroup && \ useradd -r -g appgroup appuser -#RUN apt-get install git -y --no-install-recommends WORKDIR /app diff --git a/m1-3-1-docker.yml b/m1-3-1-docker.yml index a057e3788..598589dad 100644 --- a/m1-3-1-docker.yml +++ b/m1-3-1-docker.yml @@ -2,9 +2,10 @@ hosts: localhost gather_facts: no vars: - image_name: "dimitardd/dimitar-app02" - image_tag: "v4.1" - listen_port: "5000" + image_name: "dimitar-app02" + image_tag: "v4.11" + listen_port: "3000" + access_port: "5000" dockerpath: "/opt/telerik/build" gitbanch: "dimitardd-281024" @@ -25,11 +26,13 @@ dockerfile: Dockerfile source: build state: present -# push: yes + push: yes - - name: Tag version latest - docker_image: - name: "{{ image_name }}"":latest" # Equal to name in build task. - repository: "{{ image_name }}" - force_tag: true - source: local + - name: Run Docker container! + community.docker.docker_container: + name: "{{ image_name }}" + image: "{{ image_name }}:{{ image_tag }}" + state: started + restart_policy: always + published_ports: + - "{{ access_port }}:{{ listen_port }}" From d1eb132c5f30f7aba15a3ec368d9a79a67103c3f Mon Sep 17 00:00:00 2001 From: dimitardd Date: Wed, 30 Oct 2024 19:42:17 +0200 Subject: [PATCH 012/308] addcommand for push --- m1-3-1-docker.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/m1-3-1-docker.yml b/m1-3-1-docker.yml index 598589dad..8d2a8a69d 100644 --- a/m1-3-1-docker.yml +++ b/m1-3-1-docker.yml @@ -3,7 +3,7 @@ gather_facts: no vars: image_name: "dimitar-app02" - image_tag: "v4.11" + image_tag: "v4.12" listen_port: "3000" access_port: "5000" dockerpath: "/opt/telerik/build" @@ -16,8 +16,10 @@ dest: "{{ dockerpath }}" version: "{{ gitbanch }}" force: yes + register: git_status - name: Build Container Image! + when: git_status.changed == true docker_image: name: "{{ image_name }}" tag: "{{ image_tag }}" @@ -26,8 +28,8 @@ dockerfile: Dockerfile source: build state: present - push: yes - +# push: yes + command: docker push dimitardd/ "{{ image_name }}" - name: Run Docker container! community.docker.docker_container: name: "{{ image_name }}" From 390a5a1b31d1b23abc73b85f384a4ed574ab97ab Mon Sep 17 00:00:00 2001 From: dimitardd Date: Wed, 30 Oct 2024 19:52:10 +0200 Subject: [PATCH 013/308] new version --- m1-3-1-docker.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/m1-3-1-docker.yml b/m1-3-1-docker.yml index 8d2a8a69d..2337af264 100644 --- a/m1-3-1-docker.yml +++ b/m1-3-1-docker.yml @@ -29,7 +29,11 @@ source: build state: present # push: yes - command: docker push dimitardd/ "{{ image_name }}" + + - name : Tag image and push it to Docker hub! + command: docker image tag "{{ image_name }}:latest" + command: docker push "dimitardd/{{ image_name }}" + - name: Run Docker container! community.docker.docker_container: name: "{{ image_name }}" From c00af6edca50aa14a58276201af0899006a71c92 Mon Sep 17 00:00:00 2001 From: dimitardd Date: Wed, 30 Oct 2024 19:54:44 +0200 Subject: [PATCH 014/308] dd second tag --- m1-3-1-docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/m1-3-1-docker.yml b/m1-3-1-docker.yml index 2337af264..ec0bf26fc 100644 --- a/m1-3-1-docker.yml +++ b/m1-3-1-docker.yml @@ -3,7 +3,7 @@ gather_facts: no vars: image_name: "dimitar-app02" - image_tag: "v4.12" + image_tag: "v4.13" listen_port: "3000" access_port: "5000" dockerpath: "/opt/telerik/build" @@ -31,7 +31,7 @@ # push: yes - name : Tag image and push it to Docker hub! - command: docker image tag "{{ image_name }}:latest" + command: docker image tag "{{ image_name }}:latest" "{{ image_name }}:{{ image_tag }}" command: docker push "dimitardd/{{ image_name }}" - name: Run Docker container! From a87a2dc6bf35669d5d31ac9acb1231b7113db86f Mon Sep 17 00:00:00 2001 From: dimitardd Date: Wed, 30 Oct 2024 19:58:46 +0200 Subject: [PATCH 015/308] new version tag --- Dockerfile | 2 +- m1-3-1-docker.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9623aad53..4893e825f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:22.04 LABEL maintainer="dhd.dimitrov@gmail.com" -LABEL version="4.11" +LABEL version="4.14" RUN apt-get update -y && \ apt-get install -y --no-install-recommends \ diff --git a/m1-3-1-docker.yml b/m1-3-1-docker.yml index ec0bf26fc..b6157100f 100644 --- a/m1-3-1-docker.yml +++ b/m1-3-1-docker.yml @@ -3,7 +3,7 @@ gather_facts: no vars: image_name: "dimitar-app02" - image_tag: "v4.13" + image_tag: "v4.14" listen_port: "3000" access_port: "5000" dockerpath: "/opt/telerik/build" @@ -31,6 +31,7 @@ # push: yes - name : Tag image and push it to Docker hub! + when: git_status.changed == true command: docker image tag "{{ image_name }}:latest" "{{ image_name }}:{{ image_tag }}" command: docker push "dimitardd/{{ image_name }}" From 28e0d72e3b9a94c83f118d345f6e7f944ee30048 Mon Sep 17 00:00:00 2001 From: dimitardd Date: Wed, 30 Oct 2024 20:09:28 +0200 Subject: [PATCH 016/308] add tag --- m1-3-1-docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/m1-3-1-docker.yml b/m1-3-1-docker.yml index b6157100f..aca206cdd 100644 --- a/m1-3-1-docker.yml +++ b/m1-3-1-docker.yml @@ -19,7 +19,7 @@ register: git_status - name: Build Container Image! - when: git_status.changed == true +# when: git_status.changed == true docker_image: name: "{{ image_name }}" tag: "{{ image_tag }}" @@ -31,7 +31,7 @@ # push: yes - name : Tag image and push it to Docker hub! - when: git_status.changed == true +# when: git_status.changed == true command: docker image tag "{{ image_name }}:latest" "{{ image_name }}:{{ image_tag }}" command: docker push "dimitardd/{{ image_name }}" From f96bda8af8ee024ebdbb93a58416505ba591354d Mon Sep 17 00:00:00 2001 From: dimitardd Date: Wed, 30 Oct 2024 20:10:42 +0200 Subject: [PATCH 017/308] add tag --- m1-3-1-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m1-3-1-docker.yml b/m1-3-1-docker.yml index aca206cdd..34ad19464 100644 --- a/m1-3-1-docker.yml +++ b/m1-3-1-docker.yml @@ -33,7 +33,7 @@ - name : Tag image and push it to Docker hub! # when: git_status.changed == true command: docker image tag "{{ image_name }}:latest" "{{ image_name }}:{{ image_tag }}" - command: docker push "dimitardd/{{ image_name }}" + command: docker push "dimitardd/{{ image_name }}:{{ image_tag }}" - name: Run Docker container! community.docker.docker_container: From 68fb6cc70129840263d71baa285706956dd90c29 Mon Sep 17 00:00:00 2001 From: dimitardd Date: Wed, 30 Oct 2024 20:14:16 +0200 Subject: [PATCH 018/308] add gain tag --- m1-3-1-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m1-3-1-docker.yml b/m1-3-1-docker.yml index 34ad19464..7c0e59804 100644 --- a/m1-3-1-docker.yml +++ b/m1-3-1-docker.yml @@ -3,7 +3,7 @@ gather_facts: no vars: image_name: "dimitar-app02" - image_tag: "v4.14" + image_tag: "v4.15" listen_port: "3000" access_port: "5000" dockerpath: "/opt/telerik/build" From caf96819c5e6f42a36606870882ca3dbccdf054e Mon Sep 17 00:00:00 2001 From: dimitardd Date: Wed, 30 Oct 2024 20:20:22 +0200 Subject: [PATCH 019/308] fix latest tag --- m1-3-1-docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/m1-3-1-docker.yml b/m1-3-1-docker.yml index 7c0e59804..20d2cced6 100644 --- a/m1-3-1-docker.yml +++ b/m1-3-1-docker.yml @@ -32,8 +32,8 @@ - name : Tag image and push it to Docker hub! # when: git_status.changed == true - command: docker image tag "{{ image_name }}:latest" "{{ image_name }}:{{ image_tag }}" - command: docker push "dimitardd/{{ image_name }}:{{ image_tag }}" + command: docker image tag "{{ image_name }}:{{ image_tag }}" "{{ image_name }}:latest" + command: docker push "dimitardd/{{ image_name }}:latest" - name: Run Docker container! community.docker.docker_container: From e2be0292a2300e5080a420b6790f956915925ba4 Mon Sep 17 00:00:00 2001 From: dimitardd Date: Wed, 30 Oct 2024 20:23:07 +0200 Subject: [PATCH 020/308] separate tags --- m1-3-1-docker.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/m1-3-1-docker.yml b/m1-3-1-docker.yml index 20d2cced6..3abf93b6f 100644 --- a/m1-3-1-docker.yml +++ b/m1-3-1-docker.yml @@ -30,9 +30,11 @@ state: present # push: yes - - name : Tag image and push it to Docker hub! + - name: Tag image with lates! # when: git_status.changed == true command: docker image tag "{{ image_name }}:{{ image_tag }}" "{{ image_name }}:latest" + + - name: Pus docker image to Docker HUB! command: docker push "dimitardd/{{ image_name }}:latest" - name: Run Docker container! From b4de873f59013e150dc8b21662131b9c1a227932 Mon Sep 17 00:00:00 2001 From: dimitardd Date: Wed, 30 Oct 2024 20:24:27 +0200 Subject: [PATCH 021/308] tag agian --- m1-3-1-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m1-3-1-docker.yml b/m1-3-1-docker.yml index 3abf93b6f..ad719f3ad 100644 --- a/m1-3-1-docker.yml +++ b/m1-3-1-docker.yml @@ -35,7 +35,7 @@ command: docker image tag "{{ image_name }}:{{ image_tag }}" "{{ image_name }}:latest" - name: Pus docker image to Docker HUB! - command: docker push "dimitardd/{{ image_name }}:latest" + command: docker push "dimitardd/{{ image_name }}" - name: Run Docker container! community.docker.docker_container: From 799396a71f5e5660c8bb1efe30af8154f5df32dc Mon Sep 17 00:00:00 2001 From: dimitardd Date: Wed, 30 Oct 2024 20:25:26 +0200 Subject: [PATCH 022/308] fixing push command --- m1-3-1-docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m1-3-1-docker.yml b/m1-3-1-docker.yml index ad719f3ad..474aa2dc5 100644 --- a/m1-3-1-docker.yml +++ b/m1-3-1-docker.yml @@ -35,7 +35,7 @@ command: docker image tag "{{ image_name }}:{{ image_tag }}" "{{ image_name }}:latest" - name: Pus docker image to Docker HUB! - command: docker push "dimitardd/{{ image_name }}" + command: docker push "{{ image_name }}" - name: Run Docker container! community.docker.docker_container: From 116398b9866bb95767968bbf272e3ac3549811fd Mon Sep 17 00:00:00 2001 From: dimitardd Date: Thu, 31 Oct 2024 07:06:06 +0200 Subject: [PATCH 023/308] image pish fixed tag --- m1-3-1-docker.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/m1-3-1-docker.yml b/m1-3-1-docker.yml index 474aa2dc5..9a9137017 100644 --- a/m1-3-1-docker.yml +++ b/m1-3-1-docker.yml @@ -3,7 +3,7 @@ gather_facts: no vars: image_name: "dimitar-app02" - image_tag: "v4.15" + image_tag: "v4.16" listen_port: "3000" access_port: "5000" dockerpath: "/opt/telerik/build" @@ -19,7 +19,7 @@ register: git_status - name: Build Container Image! -# when: git_status.changed == true + when: git_status.changed == true docker_image: name: "{{ image_name }}" tag: "{{ image_tag }}" @@ -28,14 +28,14 @@ dockerfile: Dockerfile source: build state: present -# push: yes - name: Tag image with lates! -# when: git_status.changed == true - command: docker image tag "{{ image_name }}:{{ image_tag }}" "{{ image_name }}:latest" + when: git_status.changed == true + command: docker image tag "{{ image_name }}:{{ image_tag }}" "{{ image_name }}:latest" "dimitardd/{{ image_name }}" - name: Pus docker image to Docker HUB! - command: docker push "{{ image_name }}" + when: git_status.changed == true + command: docker image push "dimitardd/{{ image_name }}" - name: Run Docker container! community.docker.docker_container: From 6075559d85aeafbcb53774ea08b30d2f7bd77fdd Mon Sep 17 00:00:00 2001 From: dimitardd Date: Thu, 31 Oct 2024 07:08:31 +0200 Subject: [PATCH 024/308] tag images --- m1-3-1-docker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/m1-3-1-docker.yml b/m1-3-1-docker.yml index 9a9137017..7de14368b 100644 --- a/m1-3-1-docker.yml +++ b/m1-3-1-docker.yml @@ -32,6 +32,7 @@ - name: Tag image with lates! when: git_status.changed == true command: docker image tag "{{ image_name }}:{{ image_tag }}" "{{ image_name }}:latest" "dimitardd/{{ image_name }}" + command: docker image tag "{{ image_name }}:{{ image_tag }}" "dimitardd/{{ image_name }}" - name: Pus docker image to Docker HUB! when: git_status.changed == true From 1a5f897fdf50cf0c6aca701f9c96fbaa375058c1 Mon Sep 17 00:00:00 2001 From: dimitardd Date: Thu, 31 Oct 2024 07:11:08 +0200 Subject: [PATCH 025/308] version docker file --- Dockerfile | 2 +- m1-3-1-docker.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4893e825f..ac24d1099 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:22.04 LABEL maintainer="dhd.dimitrov@gmail.com" -LABEL version="4.14" +LABEL version="4.18" RUN apt-get update -y && \ apt-get install -y --no-install-recommends \ diff --git a/m1-3-1-docker.yml b/m1-3-1-docker.yml index 7de14368b..be6476ad6 100644 --- a/m1-3-1-docker.yml +++ b/m1-3-1-docker.yml @@ -3,7 +3,7 @@ gather_facts: no vars: image_name: "dimitar-app02" - image_tag: "v4.16" + image_tag: "v4.18" listen_port: "3000" access_port: "5000" dockerpath: "/opt/telerik/build" From 0d8a2473327063a88e0e4fbd5d3acc6d4462357e Mon Sep 17 00:00:00 2001 From: dimitardd Date: Thu, 31 Oct 2024 07:32:18 +0200 Subject: [PATCH 026/308] ansoble-vault secret --- Dockerfile | 2 +- m1-3-1-docker.yml | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ac24d1099..a0135c777 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:22.04 LABEL maintainer="dhd.dimitrov@gmail.com" -LABEL version="4.18" +LABEL version="4.19" RUN apt-get update -y && \ apt-get install -y --no-install-recommends \ diff --git a/m1-3-1-docker.yml b/m1-3-1-docker.yml index be6476ad6..3aebdfcb0 100644 --- a/m1-3-1-docker.yml +++ b/m1-3-1-docker.yml @@ -1,14 +1,20 @@ - name: Build, push and run Docker image M1-3-1 Ansible hosts: localhost gather_facts: no + vars: image_name: "dimitar-app02" - image_tag: "v4.18" + image_tag: "v4.19" listen_port: "3000" access_port: "5000" dockerpath: "/opt/telerik/build" + dockerhubuser: "dimitardd" gitbanch: "dimitardd-281024" + vars_files: + - /opt/telerik/secrets/secret.yaml + + tasks: - name: Get Dockerfile lates version! git: @@ -34,6 +40,11 @@ command: docker image tag "{{ image_name }}:{{ image_tag }}" "{{ image_name }}:latest" "dimitardd/{{ image_name }}" command: docker image tag "{{ image_name }}:{{ image_tag }}" "dimitardd/{{ image_name }}" + - name: Log into DockerHub + community.docker.docker_login: + username: "{{ dockerhubuser }}" + password: "{{ dockerhub }}" + - name: Pus docker image to Docker HUB! when: git_status.changed == true command: docker image push "dimitardd/{{ image_name }}" From bb8b0a0ce1f21d2be748aa1582528bb28444c041 Mon Sep 17 00:00:00 2001 From: dimitardd Date: Thu, 31 Oct 2024 07:32:18 +0200 Subject: [PATCH 027/308] Docker build, pish and run --- Dockerfile | 2 +- m1-3-1-docker.yml | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ac24d1099..a0135c777 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:22.04 LABEL maintainer="dhd.dimitrov@gmail.com" -LABEL version="4.18" +LABEL version="4.19" RUN apt-get update -y && \ apt-get install -y --no-install-recommends \ diff --git a/m1-3-1-docker.yml b/m1-3-1-docker.yml index be6476ad6..3aebdfcb0 100644 --- a/m1-3-1-docker.yml +++ b/m1-3-1-docker.yml @@ -1,14 +1,20 @@ - name: Build, push and run Docker image M1-3-1 Ansible hosts: localhost gather_facts: no + vars: image_name: "dimitar-app02" - image_tag: "v4.18" + image_tag: "v4.19" listen_port: "3000" access_port: "5000" dockerpath: "/opt/telerik/build" + dockerhubuser: "dimitardd" gitbanch: "dimitardd-281024" + vars_files: + - /opt/telerik/secrets/secret.yaml + + tasks: - name: Get Dockerfile lates version! git: @@ -34,6 +40,11 @@ command: docker image tag "{{ image_name }}:{{ image_tag }}" "{{ image_name }}:latest" "dimitardd/{{ image_name }}" command: docker image tag "{{ image_name }}:{{ image_tag }}" "dimitardd/{{ image_name }}" + - name: Log into DockerHub + community.docker.docker_login: + username: "{{ dockerhubuser }}" + password: "{{ dockerhub }}" + - name: Pus docker image to Docker HUB! when: git_status.changed == true command: docker image push "dimitardd/{{ image_name }}" From d314b2a717e9eab7ea3d74fe9e0ae7eb09d8020a Mon Sep 17 00:00:00 2001 From: dimitardd Date: Tue, 29 Oct 2024 01:38:29 +0200 Subject: [PATCH 028/308] final commit dd docker file add docker file dd DockerFiles ready dd dockerfile dd file dd files tag change tag tag add files addcommand for push new version dd second tag new version tag add tag add tag add gain tag fix latest tag separate tags tag agian fixing push command image pish fixed tag tag images version docker file Docker build, pish and run ansoble-vault secret --- Dockerfile | 22 ++++++++++++++++++ m1-3-1-docker.yml | 59 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 Dockerfile create mode 100644 m1-3-1-docker.yml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..a0135c777 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,22 @@ +FROM ubuntu:22.04 + +LABEL maintainer="dhd.dimitrov@gmail.com" +LABEL version="4.19" + +RUN apt-get update -y && \ + apt-get install -y --no-install-recommends \ + python3 \ + python3-pip && \ + groupadd -r appgroup && \ + useradd -r -g appgroup appuser + + +WORKDIR /app + +COPY --chown=appuser:appgroup ./app . + +RUN pip3 install flask==3.0.0 + +USER appuser + +CMD ["python3", "app.py"] diff --git a/m1-3-1-docker.yml b/m1-3-1-docker.yml new file mode 100644 index 000000000..3aebdfcb0 --- /dev/null +++ b/m1-3-1-docker.yml @@ -0,0 +1,59 @@ +- name: Build, push and run Docker image M1-3-1 Ansible + hosts: localhost + gather_facts: no + + vars: + image_name: "dimitar-app02" + image_tag: "v4.19" + listen_port: "3000" + access_port: "5000" + dockerpath: "/opt/telerik/build" + dockerhubuser: "dimitardd" + gitbanch: "dimitardd-281024" + + vars_files: + - /opt/telerik/secrets/secret.yaml + + + tasks: + - name: Get Dockerfile lates version! + git: + repo: git@github.com:dimitardd/devops-programme.git + dest: "{{ dockerpath }}" + version: "{{ gitbanch }}" + force: yes + register: git_status + + - name: Build Container Image! + when: git_status.changed == true + docker_image: + name: "{{ image_name }}" + tag: "{{ image_tag }}" + build: + path: "{{ dockerpath }}" + dockerfile: Dockerfile + source: build + state: present + + - name: Tag image with lates! + when: git_status.changed == true + command: docker image tag "{{ image_name }}:{{ image_tag }}" "{{ image_name }}:latest" "dimitardd/{{ image_name }}" + command: docker image tag "{{ image_name }}:{{ image_tag }}" "dimitardd/{{ image_name }}" + + - name: Log into DockerHub + community.docker.docker_login: + username: "{{ dockerhubuser }}" + password: "{{ dockerhub }}" + + - name: Pus docker image to Docker HUB! + when: git_status.changed == true + command: docker image push "dimitardd/{{ image_name }}" + + - name: Run Docker container! + community.docker.docker_container: + name: "{{ image_name }}" + image: "{{ image_name }}:{{ image_tag }}" + state: started + restart_policy: always + published_ports: + - "{{ access_port }}:{{ listen_port }}" From edc4db8b28d8791d33b828e2b0a79516cb01d17f Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Mon, 4 Nov 2024 20:49:01 +0200 Subject: [PATCH 029/308] Create github-actions-demo.yml --- .github/workflows/github-actions-demo.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/github-actions-demo.yml diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml new file mode 100644 index 000000000..15a61d6b6 --- /dev/null +++ b/.github/workflows/github-actions-demo.yml @@ -0,0 +1,18 @@ +name: GitHub Actions Demo +run-name: ${{ github.actor }} is testing out GitHub Actions πŸš€ +on: [push] +jobs: + Explore-GitHub-Actions: + runs-on: ubuntu-latest + steps: + - run: echo "πŸŽ‰ The job was automatically triggered by a ${{ github.event_name }} event." + - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!" + - run: echo "πŸ”Ž The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." + - name: Check out repository code + uses: actions/checkout@v4 + - run: echo "πŸ’‘ The ${{ github.repository }} repository has been cloned to the runner." + - run: echo "πŸ–₯️ The workflow is now ready to test your code on the runner." + - name: List files in the repository + run: | + ls ${{ github.workspace }} + - run: echo "🍏 This job's status is ${{ job.status }}." From a717c1b7b35a6af74b2b61101fd1f6391d000dec Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 4 Nov 2024 21:00:40 +0200 Subject: [PATCH 030/308] step2 --- .github/workflows/github-actions-demo.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 15a61d6b6..bb2958e7b 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -16,3 +16,13 @@ jobs: run: | ls ${{ github.workspace }} - run: echo "🍏 This job's status is ${{ job.status }}." +lint: + runs-on: ubuntu-lates + needs: Explore-GitHub-Actions + steps: + - run: echi "Code lint" +unittest: + runs-on: ubuntu-lates + needs: lint + steps: + - run: echi "Code unittest" \ No newline at end of file From 01b412bbc142cc9795e28b32a19114608738f5ba Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 4 Nov 2024 21:02:07 +0200 Subject: [PATCH 031/308] fix ubuntu-latest --- .github/workflows/github-actions-demo.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index bb2958e7b..a585ff18e 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -16,13 +16,12 @@ jobs: run: | ls ${{ github.workspace }} - run: echo "🍏 This job's status is ${{ job.status }}." -lint: - runs-on: ubuntu-lates +lint: ubuntu-latest needs: Explore-GitHub-Actions steps: - run: echi "Code lint" unittest: - runs-on: ubuntu-lates + runs-on: ubuntu-latest needs: lint steps: - run: echi "Code unittest" \ No newline at end of file From e497277c444d22b58a3a882874347fc5da978195 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 4 Nov 2024 21:04:24 +0200 Subject: [PATCH 032/308] lint and unitest --- .github/workflows/github-actions-demo.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index a585ff18e..f23f4f111 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -16,12 +16,13 @@ jobs: run: | ls ${{ github.workspace }} - run: echo "🍏 This job's status is ${{ job.status }}." -lint: ubuntu-latest - needs: Explore-GitHub-Actions +lint: + runs-on: ubuntu-latest + needs: ubuntu-latest steps: - - run: echi "Code lint" + - run: echi "Co rde unittest" unittest: runs-on: ubuntu-latest needs: lint steps: - - run: echi "Code unittest" \ No newline at end of file + - run: echi "Co rde unittest" \ No newline at end of file From 9a3bfe46c9a6e4690d6c454122002c3a89b226ea Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 4 Nov 2024 21:05:33 +0200 Subject: [PATCH 033/308] lint commit --- .github/workflows/github-actions-demo.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index f23f4f111..5475403b5 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -18,11 +18,11 @@ jobs: - run: echo "🍏 This job's status is ${{ job.status }}." lint: runs-on: ubuntu-latest - needs: ubuntu-latest + needs: Explore-GitHub-Actions steps: - - run: echi "Co rde unittest" + - run: echi "Code lint" unittest: runs-on: ubuntu-latest needs: lint steps: - - run: echi "Co rde unittest" \ No newline at end of file + - run: echi "Code unittest" \ No newline at end of file From e3dd320f44b8de9f3fffe77a755c676ec55740b2 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 4 Nov 2024 21:06:55 +0200 Subject: [PATCH 034/308] lint fix --- .github/workflows/github-actions-demo.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 5475403b5..d30c30ac8 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -16,11 +16,13 @@ jobs: run: | ls ${{ github.workspace }} - run: echo "🍏 This job's status is ${{ job.status }}." + lint: runs-on: ubuntu-latest needs: Explore-GitHub-Actions steps: - run: echi "Code lint" + unittest: runs-on: ubuntu-latest needs: lint From 76bf890f97c583c726c82b775f00b7a6b40ddc7d Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 4 Nov 2024 21:08:38 +0200 Subject: [PATCH 035/308] tab mish mach --- .github/workflows/github-actions-demo.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index d30c30ac8..d29b77e9a 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -17,14 +17,14 @@ jobs: ls ${{ github.workspace }} - run: echo "🍏 This job's status is ${{ job.status }}." -lint: - runs-on: ubuntu-latest - needs: Explore-GitHub-Actions - steps: - - run: echi "Code lint" + lint: + runs-on: ubuntu-latest + needs: Explore-GitHub-Actions + steps: + - run: echi "Code lint" -unittest: - runs-on: ubuntu-latest - needs: lint - steps: - - run: echi "Code unittest" \ No newline at end of file + unittest: + runs-on: ubuntu-latest + needs: lint + steps: + - run: echi "Code unittest" \ No newline at end of file From a3bfdc21c1a0b60f8b51bc4b55467259c049542b Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 4 Nov 2024 21:09:52 +0200 Subject: [PATCH 036/308] echo command --- .github/workflows/github-actions-demo.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index d29b77e9a..9834ee34b 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -21,10 +21,10 @@ jobs: runs-on: ubuntu-latest needs: Explore-GitHub-Actions steps: - - run: echi "Code lint" + - run: echo "Code lint" unittest: runs-on: ubuntu-latest needs: lint steps: - - run: echi "Code unittest" \ No newline at end of file + - run: echo "Code unittest" \ No newline at end of file From 422aab22302ebe9afbca4fe53613e789d335e56c Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 11 Nov 2024 19:59:14 +0200 Subject: [PATCH 037/308] tast1 --- .editorconfig | 33 +++++++++++ .github/workflows/github-actions-demo.yml | 69 +++++++++++++++-------- 2 files changed, 78 insertions(+), 24 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..26e04eaf7 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,33 @@ +# EditorConfig is awesome: https://editorconfig.org + +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +end_of_line = lf +insert_final_newline = true + +# Matches multiple files with brace expansion notation +# Set default charset +[*.{js,py}] +charset = utf-8 + +# 4 space indentation +[*.py] +indent_style = space +indent_size = 4 + +# Tab indentation (no size specified) +[Makefile] +indent_style = tab + +# Indentation override for all JS under lib directory +[lib/**.js] +indent_style = space +indent_size = 2 + +# Matches the exact files either package.json or .travis.yml +[{package.json,.travis.yml}] +indent_style = space +indent_size = 2 \ No newline at end of file diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 9834ee34b..69a991bde 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -2,29 +2,50 @@ name: GitHub Actions Demo run-name: ${{ github.actor }} is testing out GitHub Actions πŸš€ on: [push] jobs: - Explore-GitHub-Actions: - runs-on: ubuntu-latest - steps: - - run: echo "πŸŽ‰ The job was automatically triggered by a ${{ github.event_name }} event." - - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!" - - run: echo "πŸ”Ž The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." - - name: Check out repository code - uses: actions/checkout@v4 - - run: echo "πŸ’‘ The ${{ github.repository }} repository has been cloned to the runner." - - run: echo "πŸ–₯️ The workflow is now ready to test your code on the runner." - - name: List files in the repository - run: | - ls ${{ github.workspace }} - - run: echo "🍏 This job's status is ${{ job.status }}." + Pylint: + runs-on: ubuntu-latest + steps: + - name: Check .editorconfig + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - run: pip install editorconfig-checker editorconfig-checker + - name: Set up Python + uses: actions/setup-python@v3 + with: + python-version: '3.10' + cache: 'pip' + - name: Install dependencies + run: pip install pylint black flake8 markdown-lint-cli + - name: Analysing the code with pylint + run: pylint $(git ls-files '*.py') + - name: Check markdown files + run: + markdownlint-cli . - lint: - runs-on: ubuntu-latest - needs: Explore-GitHub-Actions - steps: - - run: echo "Code lint" + # Explore-GitHub-Actions: + # runs-on: ubuntu-latest + # steps: + # - run: echo "πŸŽ‰ The job was automatically triggered by a ${{ github.event_name }} event." + # - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!" + # - run: echo "πŸ”Ž The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." + # - name: Check out repository code + # uses: actions/checkout@v4 + # - run: echo "πŸ’‘ The ${{ github.repository }} repository has been cloned to the runner." + # - run: echo "πŸ–₯️ The workflow is now ready to test your code on the runner." + # - name: List files in the repository + # run: | + # ls ${{ github.workspace }} + # - run: echo "🍏 This job's status is ${{ job.status }}." - unittest: - runs-on: ubuntu-latest - needs: lint - steps: - - run: echo "Code unittest" \ No newline at end of file + # lint: + # runs-on: ubuntu-latest + # needs: Explore-GitHub-Actions + # steps: + # - run: echo "Code lint" + + # unittest: + # runs-on: ubuntu-latest + # needs: lint + # steps: + # - run: echo "Code unittest" \ No newline at end of file From 56531475fea88ba49266dd2ff977b86fb5913fa0 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 11 Nov 2024 20:01:01 +0200 Subject: [PATCH 038/308] test2 --- .github/workflows/github-actions-demo.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 69a991bde..a1cfc0d5d 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -9,20 +9,19 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 - - run: pip install editorconfig-checker editorconfig-checker + - run: pip3 install editorconfig-checker editorconfig-checker - name: Set up Python uses: actions/setup-python@v3 with: python-version: '3.10' cache: 'pip' - name: Install dependencies - run: pip install pylint black flake8 markdown-lint-cli + run: pip3 install pylint black flake8 markdown-lint-cli - name: Analysing the code with pylint run: pylint $(git ls-files '*.py') - name: Check markdown files run: markdownlint-cli . - # Explore-GitHub-Actions: # runs-on: ubuntu-latest # steps: From c1f5062e662bc1f4c372ba4b2f084571a386c786 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 11 Nov 2024 20:02:35 +0200 Subject: [PATCH 039/308] test3 --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index a1cfc0d5d..974d00170 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -16,7 +16,7 @@ jobs: python-version: '3.10' cache: 'pip' - name: Install dependencies - run: pip3 install pylint black flake8 markdown-lint-cli + run: pip3 install pylint markdown-lint-cli - name: Analysing the code with pylint run: pylint $(git ls-files '*.py') - name: Check markdown files From 8157577b247cfd559865ef1aa7213dacef11a512 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 11 Nov 2024 20:07:36 +0200 Subject: [PATCH 040/308] test4 --- .github/workflows/github-actions-demo.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 974d00170..44a8ebc57 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -16,12 +16,15 @@ jobs: python-version: '3.10' cache: 'pip' - name: Install dependencies - run: pip3 install pylint markdown-lint-cli + run: pip3 install pylint + - name: Install markdownlint-cli + run: npm install -g markdownlint-cli - name: Analysing the code with pylint run: pylint $(git ls-files '*.py') - name: Check markdown files - run: - markdownlint-cli . + run: markdownlint-cli . + + # Explore-GitHub-Actions: # runs-on: ubuntu-latest # steps: From 913fdc2513004b28cd8968f551654f5767eff7eb Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 11 Nov 2024 20:34:34 +0200 Subject: [PATCH 041/308] test4 --- .github/workflows/github-actions-demo.yml | 37 +++++++++++------------ 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 44a8ebc57..860c09096 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -5,26 +5,25 @@ jobs: Pylint: runs-on: ubuntu-latest steps: - - name: Check .editorconfig - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - run: pip3 install editorconfig-checker editorconfig-checker - - name: Set up Python - uses: actions/setup-python@v3 - with: - python-version: '3.10' - cache: 'pip' - - name: Install dependencies - run: pip3 install pylint - - name: Install markdownlint-cli - run: npm install -g markdownlint-cli - - name: Analysing the code with pylint - run: pylint $(git ls-files '*.py') - - name: Check markdown files - run: markdownlint-cli . + - name: Check .editorconfig + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Set up Python + uses: actions/setup-python@v3 + with: + python-version: '3.10' + cache: 'pip' + - run: | + pip install pylint black flake8 editorconfig-checker + npm install -g markdownlint-cli + editorconfig-checker + - name: Analysing the code with pylint + run: pylint $(git ls-files '*.py') + - name: Check markdown files + run: markdownlint-cli . + - # Explore-GitHub-Actions: # runs-on: ubuntu-latest # steps: From 9ce592735d9756a346b7a370c288a15ea7bbd1df Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 11 Nov 2024 20:36:08 +0200 Subject: [PATCH 042/308] test5 --- .github/workflows/github-actions-demo.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 860c09096..f6cb5451d 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -15,9 +15,9 @@ jobs: python-version: '3.10' cache: 'pip' - run: | - pip install pylint black flake8 editorconfig-checker - npm install -g markdownlint-cli - editorconfig-checker + pip3 install pylint black flake8 editorconfig-checker + npm install -g markdownlint-cli + editorconfig-checker - name: Analysing the code with pylint run: pylint $(git ls-files '*.py') - name: Check markdown files From 13c8600acbe10e269e088a5c7be537a5501275e3 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 11 Nov 2024 20:42:03 +0200 Subject: [PATCH 043/308] test6 --- .github/workflows/github-actions-demo.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index f6cb5451d..eaffda227 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -5,7 +5,7 @@ jobs: Pylint: runs-on: ubuntu-latest steps: - - name: Check .editorconfig + - name: Check out repo uses: actions/checkout@v2 with: fetch-depth: 0 @@ -13,11 +13,12 @@ jobs: uses: actions/setup-python@v3 with: python-version: '3.10' - cache: 'pip' + cache: 'pip' - run: | pip3 install pylint black flake8 editorconfig-checker npm install -g markdownlint-cli - editorconfig-checker + - name: Check .editorconfig + run: editorconfig-checker - name: Analysing the code with pylint run: pylint $(git ls-files '*.py') - name: Check markdown files From 01f2f34bfcd1f51872266409597e926097d63141 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 11 Nov 2024 20:44:00 +0200 Subject: [PATCH 044/308] test7 --- .github/workflows/github-actions-demo.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index eaffda227..2c530e564 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -15,8 +15,8 @@ jobs: python-version: '3.10' cache: 'pip' - run: | - pip3 install pylint black flake8 editorconfig-checker - npm install -g markdownlint-cli + pip3 install pylint black flake8 + npm install -g markdownlint-cli editorconfig-checker - name: Check .editorconfig run: editorconfig-checker - name: Analysing the code with pylint From cd76ce46136ffc15bb5eb091ffb78bebeaa7ece7 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 11 Nov 2024 21:03:00 +0200 Subject: [PATCH 045/308] test8 From 2aa5ecf2f10962aae173259addffe38de7f3b82a Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 11 Nov 2024 21:21:22 +0200 Subject: [PATCH 046/308] test3 From 3939082d8aa943c1af00da750d3ed41f761d97c1 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 11 Nov 2024 21:26:52 +0200 Subject: [PATCH 047/308] test9 --- .github/workflows/github-actions-demo.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 2c530e564..157de0101 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -9,6 +9,10 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 + - name: Set Node version + uses: actions/setup-node@v4 + with: + node-version: 20 - name: Set up Python uses: actions/setup-python@v3 with: From 5d55017c35bae00b020e692bdff2dfd8bc63c7d7 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 11 Nov 2024 21:32:03 +0200 Subject: [PATCH 048/308] test11 --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 26e04eaf7..3b3098110 100644 --- a/.editorconfig +++ b/.editorconfig @@ -30,4 +30,4 @@ indent_size = 2 # Matches the exact files either package.json or .travis.yml [{package.json,.travis.yml}] indent_style = space -indent_size = 2 \ No newline at end of file +indent_size = 2 From e79de7e2fe64a4884d012d257a37c65636922025 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 11 Nov 2024 21:34:03 +0200 Subject: [PATCH 049/308] test12 --- .github/workflows/github-actions-demo.yml | 28 ----------------------- README.md | 2 +- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 157de0101..325c4e2e2 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -27,31 +27,3 @@ jobs: run: pylint $(git ls-files '*.py') - name: Check markdown files run: markdownlint-cli . - - - # Explore-GitHub-Actions: - # runs-on: ubuntu-latest - # steps: - # - run: echo "πŸŽ‰ The job was automatically triggered by a ${{ github.event_name }} event." - # - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!" - # - run: echo "πŸ”Ž The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." - # - name: Check out repository code - # uses: actions/checkout@v4 - # - run: echo "πŸ’‘ The ${{ github.repository }} repository has been cloned to the runner." - # - run: echo "πŸ–₯️ The workflow is now ready to test your code on the runner." - # - name: List files in the repository - # run: | - # ls ${{ github.workspace }} - # - run: echo "🍏 This job's status is ${{ job.status }}." - - # lint: - # runs-on: ubuntu-latest - # needs: Explore-GitHub-Actions - # steps: - # - run: echo "Code lint" - - # unittest: - # runs-on: ubuntu-latest - # needs: lint - # steps: - # - run: echo "Code unittest" \ No newline at end of file diff --git a/README.md b/README.md index d19dfd95a..25e0e448e 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -# devops-programme \ No newline at end of file +# devops-programme From 06b114e891026f10f47fe8087281595bc321df6f Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Wed, 13 Nov 2024 18:48:30 +0200 Subject: [PATCH 050/308] test From 2d9c3b9c1dc3a21d0061c1362c199ebd191e60fe Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Wed, 13 Nov 2024 18:53:23 +0200 Subject: [PATCH 051/308] test1 --- .github/workflows/github-actions-demo.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 325c4e2e2..2aa41ed23 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -18,8 +18,8 @@ jobs: with: python-version: '3.10' cache: 'pip' - - run: | - pip3 install pylint black flake8 + - run: + pip3 install pylint black flake8 &&/ npm install -g markdownlint-cli editorconfig-checker - name: Check .editorconfig run: editorconfig-checker From 3f337a4a82afd23a02ae88a071d7e113f6e557aa Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Wed, 13 Nov 2024 18:54:11 +0200 Subject: [PATCH 052/308] test --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 2aa41ed23..5441fd49a 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -19,7 +19,7 @@ jobs: python-version: '3.10' cache: 'pip' - run: - pip3 install pylint black flake8 &&/ + pip3 install pylint black flake8 &&\ npm install -g markdownlint-cli editorconfig-checker - name: Check .editorconfig run: editorconfig-checker From 3d835ff0ab07c878ea2dc90b1917f7f25dd1afe0 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Wed, 13 Nov 2024 18:54:55 +0200 Subject: [PATCH 053/308] test --- .github/workflows/github-actions-demo.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 5441fd49a..325c4e2e2 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -18,8 +18,8 @@ jobs: with: python-version: '3.10' cache: 'pip' - - run: - pip3 install pylint black flake8 &&\ + - run: | + pip3 install pylint black flake8 npm install -g markdownlint-cli editorconfig-checker - name: Check .editorconfig run: editorconfig-checker From e418d59b0cc6105eda74d990e008247667c6dd93 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Sat, 16 Nov 2024 09:28:07 +0200 Subject: [PATCH 054/308] test --- .github/workflows/github-actions-demo.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 325c4e2e2..77bad63b8 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -12,18 +12,24 @@ jobs: - name: Set Node version uses: actions/setup-node@v4 with: - node-version: 20 + node-version: '20' - name: Set up Python uses: actions/setup-python@v3 with: python-version: '3.10' cache: 'pip' - run: | - pip3 install pylint black flake8 + pip install pylint black flake8 npm install -g markdownlint-cli editorconfig-checker - name: Check .editorconfig - run: editorconfig-checker + run: editorconfig-checker/action-editorconfig-checker@v2 - name: Analysing the code with pylint run: pylint $(git ls-files '*.py') + - name: Markdownlint config file + run: | + echo '{ + "MD013": false, + "line-lenght": false + }' > .markdownlint.json - name: Check markdown files - run: markdownlint-cli . + run: markdownlint '**/*.md' --ignore node_modules From 2a13aa5e6e516d9528ab3a5f19237a01608f417f Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Sat, 16 Nov 2024 09:29:09 +0200 Subject: [PATCH 055/308] test --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 77bad63b8..1c277f204 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -22,7 +22,7 @@ jobs: pip install pylint black flake8 npm install -g markdownlint-cli editorconfig-checker - name: Check .editorconfig - run: editorconfig-checker/action-editorconfig-checker@v2 + run: editorconfig-checker - name: Analysing the code with pylint run: pylint $(git ls-files '*.py') - name: Markdownlint config file From d1ab5578d53bea55f576dce3cd5d079acbb441d5 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Sat, 16 Nov 2024 09:30:37 +0200 Subject: [PATCH 056/308] test --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 1c277f204..5513cd62f 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -24,7 +24,7 @@ jobs: - name: Check .editorconfig run: editorconfig-checker - name: Analysing the code with pylint - run: pylint $(git ls-files '*.py') + run: pylint --disable=C0111,C0114,C0115,C0116 $(git ls-files '*.py') - name: Markdownlint config file run: | echo '{ From 54d4cedebc6526103e45191a350ab3cbd06ee7cf Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Sat, 16 Nov 2024 09:32:03 +0200 Subject: [PATCH 057/308] test --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 5513cd62f..ecfcd04d6 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -19,7 +19,7 @@ jobs: python-version: '3.10' cache: 'pip' - run: | - pip install pylint black flake8 + pip install pylint black flake8 flask npm install -g markdownlint-cli editorconfig-checker - name: Check .editorconfig run: editorconfig-checker From 20ecda185d97ac0e3aeea756c4b54421153e2714 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Sat, 16 Nov 2024 09:38:31 +0200 Subject: [PATCH 058/308] test --- .github/workflows/github-actions-demo.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index ecfcd04d6..ceee27cb7 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -21,7 +21,7 @@ jobs: - run: | pip install pylint black flake8 flask npm install -g markdownlint-cli editorconfig-checker - - name: Check .editorconfig + - name: Check Editorconfig run: editorconfig-checker - name: Analysing the code with pylint run: pylint --disable=C0111,C0114,C0115,C0116 $(git ls-files '*.py') @@ -29,7 +29,8 @@ jobs: run: | echo '{ "MD013": false, + "MD012": false, "line-lenght": false }' > .markdownlint.json - - name: Check markdown files + - name: Markdown lint check run: markdownlint '**/*.md' --ignore node_modules From 4804bd85c2b2d0b7a7a6a98d2bfd168a9ea60fb1 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Sat, 16 Nov 2024 09:50:12 +0200 Subject: [PATCH 059/308] unitest --- .github/workflows/github-actions-demo.yml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index ceee27cb7..86f2bbeb7 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -28,9 +28,28 @@ jobs: - name: Markdownlint config file run: | echo '{ - "MD013": false, "MD012": false, + "MD013": false, "line-lenght": false }' > .markdownlint.json - name: Markdown lint check run: markdownlint '**/*.md' --ignore node_modules + Unit_Test: + needs: Pylint + runs-on: ubuntu-lates + steps: + - uses: actions/checkout@v4 + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: '3.10' + cache: 'pip' + - run: | + pip install flask + - name: Run app test + run: | + cd app + python -m unittest app_test.py + + + From e1d0c88e9902ca2da97a96e2705bf1ecdde865b7 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Sat, 16 Nov 2024 09:56:08 +0200 Subject: [PATCH 060/308] unitest --- .github/workflows/github-actions-demo.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 86f2bbeb7..05483e225 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -34,9 +34,9 @@ jobs: }' > .markdownlint.json - name: Markdown lint check run: markdownlint '**/*.md' --ignore node_modules - Unit_Test: + UnitTest: needs: Pylint - runs-on: ubuntu-lates + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: Set up Python @@ -50,6 +50,6 @@ jobs: run: | cd app python -m unittest app_test.py - + From 6abfbcee7a065d4b25e42895c6aebc9d8a58f854 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Sat, 16 Nov 2024 09:59:44 +0200 Subject: [PATCH 061/308] secrets --- .github/workflows/github-actions-demo.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 05483e225..2a6844de5 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -50,6 +50,17 @@ jobs: run: | cd app python -m unittest app_test.py + CheckforSecrets: + needs: Pylint + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Gitleaks scan + uses: gitleaks/gitleaks-action@v2 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From a349a8ae43816addb92e1cf1f4b6118f4116ff5a Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 18 Nov 2024 21:25:28 +0200 Subject: [PATCH 062/308] test --- .github/workflows/github-actions-demo.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 2a6844de5..99cf37ce5 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -3,7 +3,7 @@ run-name: ${{ github.actor }} is testing out GitHub Actions πŸš€ on: [push] jobs: Pylint: - runs-on: ubuntu-latest + runs-on: self-hosted steps: - name: Check out repo uses: actions/checkout@v2 @@ -36,7 +36,7 @@ jobs: run: markdownlint '**/*.md' --ignore node_modules UnitTest: needs: Pylint - runs-on: ubuntu-latest + runs-on: self-hosted steps: - uses: actions/checkout@v4 - name: Set up Python @@ -52,7 +52,7 @@ jobs: python -m unittest app_test.py CheckforSecrets: needs: Pylint - runs-on: ubuntu-latest + runs-on: self-hosted steps: - uses: actions/checkout@v4 with: @@ -61,6 +61,8 @@ jobs: uses: gitleaks/gitleaks-action@v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - + CheckSAST: + needs: Pylint + name: SonarCloud + runs-on: self-hosted + \ No newline at end of file From 7edf33b95004c652bfd44c8a2972793765754516 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 18 Nov 2024 21:26:22 +0200 Subject: [PATCH 063/308] test --- .github/workflows/github-actions-demo.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 99cf37ce5..65bdefcbf 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -61,8 +61,8 @@ jobs: uses: gitleaks/gitleaks-action@v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - CheckSAST: - needs: Pylint - name: SonarCloud - runs-on: self-hosted +# CheckSAST: +# needs: Pylint +# name: SonarCloud +# runs-on: self-hosted \ No newline at end of file From 2debbbda0a6526a7521ddfaf99dd823a1fc52ed6 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 18 Nov 2024 21:29:19 +0200 Subject: [PATCH 064/308] test --- .github/workflows/github-actions-demo.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 65bdefcbf..687be4a1c 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v3 with: - python-version: '3.10' + python-version: '3.10.5' cache: 'pip' - run: | pip install pylint black flake8 flask @@ -42,7 +42,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.10.5' cache: 'pip' - run: | pip install flask From de0179a0c59efb5e616c572d3c98aa34e9573a97 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 18 Nov 2024 21:32:21 +0200 Subject: [PATCH 065/308] test --- .github/workflows/github-actions-demo.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 687be4a1c..289a90b52 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -3,7 +3,7 @@ run-name: ${{ github.actor }} is testing out GitHub Actions πŸš€ on: [push] jobs: Pylint: - runs-on: self-hosted + runs-on: ubuntu-latest steps: - name: Check out repo uses: actions/checkout@v2 @@ -16,7 +16,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v3 with: - python-version: '3.10.5' + python-version: '3.10' cache: 'pip' - run: | pip install pylint black flake8 flask @@ -36,13 +36,13 @@ jobs: run: markdownlint '**/*.md' --ignore node_modules UnitTest: needs: Pylint - runs-on: self-hosted + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '3.10.5' + python-version: '3.10' cache: 'pip' - run: | pip install flask @@ -52,7 +52,7 @@ jobs: python -m unittest app_test.py CheckforSecrets: needs: Pylint - runs-on: self-hosted + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 with: From 11edee04c0bdf88d81552ec3adae2eddadc2c4fa Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 18 Nov 2024 21:42:42 +0200 Subject: [PATCH 066/308] test --- .github/workflows/github-actions-demo.yml | 24 ++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 289a90b52..d3584289b 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -61,8 +61,22 @@ jobs: uses: gitleaks/gitleaks-action@v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# CheckSAST: -# needs: Pylint -# name: SonarCloud -# runs-on: self-hosted - \ No newline at end of file + CheckSAST: + needs: Pylint + name: SonarCloud + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: SonarCloud Scan + uses: SonarSource/sonarcloud-github-action@master + env: + SONARQUBE_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} + + with: + args: > + -Dsonar.projectKey=devops-programme + -Dsonar.organization=dimitardd + -Dsonar.sources=. + -Dsonar.branch.name=main \ No newline at end of file From 0771d2c27922881f7558766c61696d4626ca1968 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 18 Nov 2024 21:43:19 +0200 Subject: [PATCH 067/308] test --- .github/workflows/github-actions-demo.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index d3584289b..8e4e24bd1 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -79,4 +79,5 @@ jobs: -Dsonar.projectKey=devops-programme -Dsonar.organization=dimitardd -Dsonar.sources=. - -Dsonar.branch.name=main \ No newline at end of file + -Dsonar.branch.name=main + \ No newline at end of file From 279fa32d12b937a9b6630c0ad2cd16893ba209a2 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 18 Nov 2024 21:44:08 +0200 Subject: [PATCH 068/308] testt --- .github/workflows/github-actions-demo.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 8e4e24bd1..a0d1e8ba4 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -80,4 +80,3 @@ jobs: -Dsonar.organization=dimitardd -Dsonar.sources=. -Dsonar.branch.name=main - \ No newline at end of file From d043c63b4bb5db96c68cd79b175f1a84e0489621 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 18 Nov 2024 21:46:07 +0200 Subject: [PATCH 069/308] SONAR_TOKEN --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index a0d1e8ba4..b6abde495 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -72,7 +72,7 @@ jobs: - name: SonarCloud Scan uses: SonarSource/sonarcloud-github-action@master env: - SONARQUBE_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} with: args: > From 710f723352668b17a0f25a2e1545fee202f116b8 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 18 Nov 2024 21:51:38 +0200 Subject: [PATCH 070/308] test From d6d0d4b89b6a7a65ad4409d303164403b976d25d Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 18 Nov 2024 22:03:53 +0200 Subject: [PATCH 071/308] dimitardd-281024 --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index b6abde495..bae45fbd8 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -79,4 +79,4 @@ jobs: -Dsonar.projectKey=devops-programme -Dsonar.organization=dimitardd -Dsonar.sources=. - -Dsonar.branch.name=main + -Dsonar.branch.name=dimitardd-281024 From f56394365fa47c6834e231536e1082719e9d3689 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 18 Nov 2024 22:28:15 +0200 Subject: [PATCH 072/308] teset From c49f119471224c1ffaca7d656c97bf3db6ca0287 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 18 Nov 2024 22:33:52 +0200 Subject: [PATCH 073/308] test --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a0135c777..d17ac75b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ RUN apt-get update -y && \ WORKDIR /app -COPY --chown=appuser:appgroup ./app . +COPY --chown=appuser:appgroup --chmod=755 ./app . RUN pip3 install flask==3.0.0 From 1a4e6a44d557d607cdbaffa39d0e51b8143bbf06 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 18 Nov 2024 22:39:40 +0200 Subject: [PATCH 074/308] apt-get clean --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index d17ac75b9..10862b07d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,7 @@ RUN apt-get update -y && \ apt-get install -y --no-install-recommends \ python3 \ python3-pip && \ + apt-get clean && \ groupadd -r appgroup && \ useradd -r -g appgroup appuser From 0d3d28b4ee232c6c41f5746d61dfd5178e29384b Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 18 Nov 2024 22:44:26 +0200 Subject: [PATCH 075/308] dimitardd_devops-programme --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index bae45fbd8..3d643e1c4 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -76,7 +76,7 @@ jobs: with: args: > - -Dsonar.projectKey=devops-programme + -Dsonar.projectKey=dimitardd_devops-programme -Dsonar.organization=dimitardd -Dsonar.sources=. -Dsonar.branch.name=dimitardd-281024 From b84f9f6a3c7f59ce9061dc95bb4d2a5ed4ef2380 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 18 Nov 2024 22:48:33 +0200 Subject: [PATCH 076/308] devops-programme --- .github/workflows/github-actions-demo.yml | 2 +- Dockerfile | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 3d643e1c4..bae45fbd8 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -76,7 +76,7 @@ jobs: with: args: > - -Dsonar.projectKey=dimitardd_devops-programme + -Dsonar.projectKey=devops-programme -Dsonar.organization=dimitardd -Dsonar.sources=. -Dsonar.branch.name=dimitardd-281024 diff --git a/Dockerfile b/Dockerfile index 10862b07d..d4295163e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,6 @@ RUN apt-get update -y && \ groupadd -r appgroup && \ useradd -r -g appgroup appuser - WORKDIR /app COPY --chown=appuser:appgroup --chmod=755 ./app . From c1b6b031e96fe55b6eb42d8f6603b659a01bfd7f Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 18 Nov 2024 23:10:45 +0200 Subject: [PATCH 077/308] tesy From a1b6e64e2eb8ab1d1808b6f8bbf1a0eb15be6737 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 18 Nov 2024 23:22:11 +0200 Subject: [PATCH 078/308] test --- .github/workflows/github-actions-demo.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index bae45fbd8..b44ed5478 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -73,10 +73,4 @@ jobs: uses: SonarSource/sonarcloud-github-action@master env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - - with: - args: > - -Dsonar.projectKey=devops-programme - -Dsonar.organization=dimitardd - -Dsonar.sources=. - -Dsonar.branch.name=dimitardd-281024 + From bb2002ea0efb86861188d8c60f3dcc951377445d Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 18 Nov 2024 23:30:02 +0200 Subject: [PATCH 079/308] dimitardd/dimitar-app02 --- .github/workflows/github-actions-demo.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index b44ed5478..3d037cfa3 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -1,6 +1,9 @@ name: GitHub Actions Demo run-name: ${{ github.actor }} is testing out GitHub Actions πŸš€ on: [push] + +env: + IMAGE_TAG: dimitardd/dimitar-app02 jobs: Pylint: runs-on: ubuntu-latest From 2882df7b7a0e1f6482acf0140fb6c11d800a1739 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 18 Nov 2024 23:33:45 +0200 Subject: [PATCH 080/308] sonarsource/sonarcloud-github-action@v3.1.0 --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 3d037cfa3..970472983 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -73,7 +73,7 @@ jobs: with: fetch-depth: 0 - name: SonarCloud Scan - uses: SonarSource/sonarcloud-github-action@master + uses: sonarsource/sonarcloud-github-action@v3.1.0 env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} From 000b30953f45d37021b74411f062bfcf8803f119 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 18 Nov 2024 23:39:37 +0200 Subject: [PATCH 081/308] sonar --- .github/workflows/github-actions-demo.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 970472983..f7e7073e8 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -76,4 +76,11 @@ jobs: uses: sonarsource/sonarcloud-github-action@v3.1.0 env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + + with: + args: > + -Dsonar.projectKey=devops-programme + -Dsonar.organization=dimitardd + -Dsonar.sources=./app + -Dsonar.branch.name=dimitardd-281024 From 53aedef7e05a9e1b18113a449b5aafe9f18b85b5 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 18 Nov 2024 23:42:39 +0200 Subject: [PATCH 082/308] ttt --- .github/workflows/github-actions-demo.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index f7e7073e8..c5c02d213 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -81,6 +81,3 @@ jobs: args: > -Dsonar.projectKey=devops-programme -Dsonar.organization=dimitardd - -Dsonar.sources=./app - -Dsonar.branch.name=dimitardd-281024 - From eacb63fc93329d73ad39f481d363308b9d4f23df Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 18 Nov 2024 23:45:02 +0200 Subject: [PATCH 083/308] app --- .github/workflows/github-actions-demo.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index c5c02d213..13c0f581f 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -81,3 +81,4 @@ jobs: args: > -Dsonar.projectKey=devops-programme -Dsonar.organization=dimitardd + -Dsonar.sonar.tests=app From f9f3cca19d79abf8ad05afad7ecd13447e4d3357 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 18 Nov 2024 23:56:00 +0200 Subject: [PATCH 084/308] app --- .github/workflows/github-actions-demo.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 13c0f581f..764ad9a4a 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -78,7 +78,8 @@ jobs: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} with: + projectBaseDir: app args: > -Dsonar.projectKey=devops-programme -Dsonar.organization=dimitardd - -Dsonar.sonar.tests=app + -Dsonar.verbose=true From 4334e330c1d3e0a25d77578b4aaf4fd7f76f9b88 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 18 Nov 2024 23:59:46 +0200 Subject: [PATCH 085/308] dimitardd-281024 --- .github/workflows/github-actions-demo.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 764ad9a4a..be5d9d899 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -83,3 +83,4 @@ jobs: -Dsonar.projectKey=devops-programme -Dsonar.organization=dimitardd -Dsonar.verbose=true + -Dsonar.branch.name=dimitardd-281024 From 493d179dea57eea201fdedd2808039cd9423d323 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Tue, 19 Nov 2024 22:26:39 +0200 Subject: [PATCH 086/308] test --- .github/workflows/github-actions-demo.yml | 52 +++++++++++++++-------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index be5d9d899..18359fbf7 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -64,23 +64,39 @@ jobs: uses: gitleaks/gitleaks-action@v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - CheckSAST: - needs: Pylint - name: SonarCloud + TrivySecurity: runs-on: ubuntu-latest + needs: Pylint steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: SonarCloud Scan - uses: sonarsource/sonarcloud-github-action@v3.1.0 - env: - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - - with: - projectBaseDir: app - args: > - -Dsonar.projectKey=devops-programme - -Dsonar.organization=dimitardd - -Dsonar.verbose=true - -Dsonar.branch.name=dimitardd-281024 + - uses: actions/checkout@v4 + - name: Trivy Vulnerability Scan + uses: aquasecurity/trivy-action@0.20.0 + with: + scan-type: 'fs' + ignore-unfixed: true + format: 'sarif' + output: 'trivy-output.sarif' + severity: 'CRITICAL' + - name: Trivy Scan Results + uses: github/codeql-action/upload-sarif@v3 + with: + sarif_file: 'trivy-output.sarif' +# CheckSAST: +# needs: Pylint +# name: SonarCloud +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v4 +# with: +# fetch-depth: 0 +# - name: SonarCloud Scan +# uses: sonarsource/sonarcloud-github-action@v3.1.0 +# env: +# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} +# with: +# projectBaseDir: app +# args: > +# -Dsonar.projectKey=devops-programme +# -Dsonar.organization=dimitardd +# -Dsonar.verbose=true +# -Dsonar.branch.name=dimitardd-281024 From ffaf3322c94a0b4f6e3397ee8f2d9ee2fd4c6c30 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Tue, 19 Nov 2024 22:33:25 +0200 Subject: [PATCH 087/308] test --- .github/workflows/github-actions-demo.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 18359fbf7..554a93002 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -65,22 +65,21 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} TrivySecurity: + name: Trivy Vulnerability Scan runs-on: ubuntu-latest needs: Pylint steps: - uses: actions/checkout@v4 - - name: Trivy Vulnerability Scan - uses: aquasecurity/trivy-action@0.20.0 with: - scan-type: 'fs' - ignore-unfixed: true - format: 'sarif' - output: 'trivy-output.sarif' - severity: 'CRITICAL' - - name: Trivy Scan Results - uses: github/codeql-action/upload-sarif@v3 - with: - sarif_file: 'trivy-output.sarif' + fetch-depth: 0 + # scan-type: 'fs' + # ignore-unfixed: true + # format: 'sarif' + # output: 'trivy-output.sarif' + # severity: 'CRITICAL' + - uses: gitleaks/gitleaks-action@v2 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # CheckSAST: # needs: Pylint # name: SonarCloud From 572582bae72559a7c8dfea707c0de399861ef780 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Tue, 19 Nov 2024 22:51:46 +0200 Subject: [PATCH 088/308] test --- .github/workflows/github-actions-demo.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 554a93002..37ea12056 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -65,22 +65,23 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} TrivySecurity: - name: Trivy Vulnerability Scan runs-on: ubuntu-latest needs: Pylint steps: - uses: actions/checkout@v4 + - name: Trivy Vulnerability Scan + uses: aquasecurity/trivy-action@master with: - fetch-depth: 0 - # scan-type: 'fs' - # ignore-unfixed: true - # format: 'sarif' - # output: 'trivy-output.sarif' - # severity: 'CRITICAL' - - uses: gitleaks/gitleaks-action@v2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# CheckSAST: + scan-type: 'fs' + ignore-unfixed: true + format: 'sarif' + output: 'trivy-output.sarif' + severity: 'CRITICAL' + - name: Trivy Scan Output + - uses: github/codeql-action/upload-sarif@v3 + with: + sarif_file: 'trivy-output.sarif' + # CheckSAST: # needs: Pylint # name: SonarCloud # runs-on: ubuntu-latest From 9fab8ca98ce26b1993f8b65de98c4028c1799553 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Tue, 19 Nov 2024 22:53:03 +0200 Subject: [PATCH 089/308] test --- .github/workflows/github-actions-demo.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 37ea12056..42adef17c 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -78,10 +78,10 @@ jobs: output: 'trivy-output.sarif' severity: 'CRITICAL' - name: Trivy Scan Output - - uses: github/codeql-action/upload-sarif@v3 + uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-output.sarif' - # CheckSAST: +# CheckSAST: # needs: Pylint # name: SonarCloud # runs-on: ubuntu-latest From 6ce2f9e6af66224b1eea5be19e7150a873db4b4c Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Tue, 19 Nov 2024 22:59:30 +0200 Subject: [PATCH 090/308] test --- .github/workflows/github-actions-demo.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 42adef17c..55031007d 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -54,7 +54,7 @@ jobs: cd app python -m unittest app_test.py CheckforSecrets: - needs: Pylint + needs: UnitTest runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -66,7 +66,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} TrivySecurity: runs-on: ubuntu-latest - needs: Pylint + needs: UnitTest steps: - uses: actions/checkout@v4 - name: Trivy Vulnerability Scan From 5135e72fe2554a09098dc6ce7b92169c0e07f1bd Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Tue, 19 Nov 2024 23:05:03 +0200 Subject: [PATCH 091/308] sonarcloud-security: --- .github/workflows/github-actions-demo.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 55031007d..be8642e14 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -100,3 +100,16 @@ jobs: # -Dsonar.organization=dimitardd # -Dsonar.verbose=true # -Dsonar.branch.name=dimitardd-281024 + sonarcloud-security: + runs-on: ubuntu-latest + needs: UnitTest + needs: lint-unit-tests + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: SonarCloud Scan + uses: sonarsource/sonarcloud-github-action@v3.1.0 # Ex: v2.1.0, See the latest version at https://github.com/marketplace/actions/sonarcloud-scan + env: + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + From f0e19575a34d6dc8136f03f549497341824fe815 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Tue, 19 Nov 2024 23:08:37 +0200 Subject: [PATCH 092/308] test --- .github/workflows/github-actions-demo.yml | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index be8642e14..5b9495a1b 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -81,6 +81,18 @@ jobs: uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-output.sarif' + SonarcloudSecurity: + runs-on: ubuntu-latest + needs: UnitTest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: SonarCloud Scan + uses: sonarsource/sonarcloud-github-action@master + env: + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + # CheckSAST: # needs: Pylint # name: SonarCloud @@ -100,16 +112,4 @@ jobs: # -Dsonar.organization=dimitardd # -Dsonar.verbose=true # -Dsonar.branch.name=dimitardd-281024 - sonarcloud-security: - runs-on: ubuntu-latest - needs: UnitTest - needs: lint-unit-tests - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: SonarCloud Scan - uses: sonarsource/sonarcloud-github-action@v3.1.0 # Ex: v2.1.0, See the latest version at https://github.com/marketplace/actions/sonarcloud-scan - env: - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} From 6649a18f5ef6bff03f44b5ed9c8f241630ba3a20 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Tue, 19 Nov 2024 23:11:29 +0200 Subject: [PATCH 093/308] test --- .github/workflows/github-actions-demo.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 5b9495a1b..684173b98 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -92,7 +92,10 @@ jobs: uses: sonarsource/sonarcloud-github-action@master env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - + with: + args: > + -Dsonar.projectKey=devops-programme + -Dsonar.organization=dimitardd # CheckSAST: # needs: Pylint # name: SonarCloud From ed4777d518bb7dac405a507c94a8d41ca902a03b Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Tue, 19 Nov 2024 23:23:00 +0200 Subject: [PATCH 094/308] sf From 8efc7f3c76ab77f781501ecd3f2edbc09ff4f40e Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Tue, 19 Nov 2024 23:37:19 +0200 Subject: [PATCH 095/308] test --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 684173b98..b706dcc35 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -95,7 +95,7 @@ jobs: with: args: > -Dsonar.projectKey=devops-programme - -Dsonar.organization=dimitardd + -Dsonar.organization=dimitardd # CheckSAST: # needs: Pylint # name: SonarCloud From da189dfdcab49e14fdfdb7aaa5476886aa61176e Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Tue, 19 Nov 2024 23:41:25 +0200 Subject: [PATCH 096/308] sonarclud dir app --- .github/workflows/github-actions-demo.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index b706dcc35..68723f84e 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -93,6 +93,7 @@ jobs: env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} with: + projectBaseDir: app args: > -Dsonar.projectKey=devops-programme -Dsonar.organization=dimitardd From 03bbf65287e10b1618846294d56c8f2833fd4aec Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Tue, 19 Nov 2024 23:46:45 +0200 Subject: [PATCH 097/308] safsa --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 68723f84e..01e6b7820 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -95,7 +95,7 @@ jobs: with: projectBaseDir: app args: > - -Dsonar.projectKey=devops-programme + -Dsonar.projectKey=dimitardd_devops-programme -Dsonar.organization=dimitardd # CheckSAST: # needs: Pylint From 835770517c39fcad137753dcc8f5351bea5cff07 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Tue, 19 Nov 2024 23:52:27 +0200 Subject: [PATCH 098/308] test --- .github/workflows/github-actions-demo.yml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 01e6b7820..039de227e 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -97,23 +97,3 @@ jobs: args: > -Dsonar.projectKey=dimitardd_devops-programme -Dsonar.organization=dimitardd -# CheckSAST: -# needs: Pylint -# name: SonarCloud -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v4 -# with: -# fetch-depth: 0 -# - name: SonarCloud Scan -# uses: sonarsource/sonarcloud-github-action@v3.1.0 -# env: -# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} -# with: -# projectBaseDir: app -# args: > -# -Dsonar.projectKey=devops-programme -# -Dsonar.organization=dimitardd -# -Dsonar.verbose=true -# -Dsonar.branch.name=dimitardd-281024 - From 13b5ccf6a2484f2d10e06c9226de01db959f891b Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 25 Nov 2024 19:08:09 +0200 Subject: [PATCH 099/308] build --- .github/workflows/github-actions-demo.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 039de227e..ebeadf470 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -97,3 +97,24 @@ jobs: args: > -Dsonar.projectKey=dimitardd_devops-programme -Dsonar.organization=dimitardd + build-test: + name: Build Image and Test + runs-on: ubuntu-latest + if: ${{ !cancelled() && !failure() }} + needs: [ SonarcloudSecurity, TrivySecurity, CheckforSecrets ] + steps: + - name: Checkout code + uses: actions/checkout@v4 + - name: Build an image from Dockerfile + run: | + docker build -t ${{ env.IMAGE_TAG }}:${{ github.sha }} . + - name: Run Trivy vulnerability scanner + uses: aquasecurity/trivy-action@0.28.0 + with: + image-ref: '${{ env.IMAGE_TAG }}:${{ github.sha }}' + format: 'sarif' + output: 'trivy-results-container.sarif' + - name: Upload Trivy scan results to GitHub Security tab + uses: github/codeql-action/upload-sarif@v3 + with: + sarif_file: 'trivy-results-container.sarif' From dde456c7b6dbf5d1c5a55ad9b8c4982ac7410d84 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 25 Nov 2024 19:26:55 +0200 Subject: [PATCH 100/308] push --- .github/workflows/github-actions-demo.yml | 53 +++++++++++++++-------- 1 file changed, 35 insertions(+), 18 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index ebeadf470..75cb2dd3a 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -81,27 +81,27 @@ jobs: uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-output.sarif' - SonarcloudSecurity: - runs-on: ubuntu-latest - needs: UnitTest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: SonarCloud Scan - uses: sonarsource/sonarcloud-github-action@master - env: - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - with: - projectBaseDir: app - args: > - -Dsonar.projectKey=dimitardd_devops-programme - -Dsonar.organization=dimitardd - build-test: +# SonarcloudSecurity: +# runs-on: ubuntu-latest +# needs: UnitTest +# steps: +# - uses: actions/checkout@v4 +# with: +# fetch-depth: 0 +# - name: SonarCloud Scan +# uses: sonarsource/sonarcloud-github-action@master +# env: +# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} +# with: +# projectBaseDir: app +# args: > +# -Dsonar.projectKey=dimitardd_devops-programme +# -Dsonar.organization=dimitardd + Build-Test: name: Build Image and Test runs-on: ubuntu-latest if: ${{ !cancelled() && !failure() }} - needs: [ SonarcloudSecurity, TrivySecurity, CheckforSecrets ] + needs: [ TrivySecurity, CheckforSecrets ] steps: - name: Checkout code uses: actions/checkout@v4 @@ -118,3 +118,20 @@ jobs: uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results-container.sarif' + Deploy: + name: Push container to docker hub + runs-on: ubuntu-latest + if: ${{ !cancelled() && !failure() }} + needs: [ Build-Test ] + steps: + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Push + uses: docker/build-push-action@v6 + with: + push: true + tags: '${{ env.IMAGE_TAG }}:${{ github.sha }}' + if: success() # Only push if get login is ok From 30c670dfb01db12261f24b2c2343d9f37f33fc50 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 25 Nov 2024 19:37:08 +0200 Subject: [PATCH 101/308] full test --- .github/workflows/github-actions-demo.yml | 34 +++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 75cb2dd3a..6049dce72 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -81,27 +81,27 @@ jobs: uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-output.sarif' -# SonarcloudSecurity: -# runs-on: ubuntu-latest -# needs: UnitTest -# steps: -# - uses: actions/checkout@v4 -# with: -# fetch-depth: 0 -# - name: SonarCloud Scan -# uses: sonarsource/sonarcloud-github-action@master -# env: -# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} -# with: -# projectBaseDir: app -# args: > -# -Dsonar.projectKey=dimitardd_devops-programme -# -Dsonar.organization=dimitardd + SonarcloudSecurity: + runs-on: ubuntu-latest + needs: UnitTest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: SonarCloud Scan + uses: sonarsource/sonarcloud-github-action@master + env: + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + with: + projectBaseDir: app + args: > + -Dsonar.projectKey=dimitardd_devops-programme + -Dsonar.organization=dimitardd Build-Test: name: Build Image and Test runs-on: ubuntu-latest if: ${{ !cancelled() && !failure() }} - needs: [ TrivySecurity, CheckforSecrets ] + needs: [ SonarcloudSecurity, TrivySecurity, CheckforSecrets ] steps: - name: Checkout code uses: actions/checkout@v4 From 54af73e0fd8c8255833449d4d9bfe9a2da822fe4 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 19 Dec 2024 23:24:29 +0200 Subject: [PATCH 102/308] Update README.md --- README.md | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/README.md b/README.md index 25e0e448e..be3d51d63 100644 --- a/README.md +++ b/README.md @@ -1 +1,97 @@ # devops-programme +# GitHub Actions Demo + +This repository demonstrates a CI/CD pipeline using GitHub Actions. The actions defined in this workflow cover code quality checks, testing, security scanning, and deploying a Docker container to Docker Hub. + +## Workflow Overview + +The pipeline consists of several jobs that are executed in sequence based on dependencies. The jobs include: + +1. **Pylint**: Checks the code quality using Pylint, MarkdownLint, and EditorConfig. +2. **UnitTest**: Runs unit tests using Python's `unittest` framework. +3. **CheckforSecrets**: Scans the repository for potential sensitive information using Gitleaks. +4. **TrivySecurity**: Performs a vulnerability scan on the repository using Trivy. +5. **SonarcloudSecurity**: Conducts a code quality and security analysis through SonarCloud. +6. **Build-Test**: Builds a Docker image and runs a vulnerability scan on it. +7. **Deploy**: Pushes the Docker image to Docker Hub. + +## Workflow Trigger + +This workflow is triggered on every `push` event to the repository. + +## Environment Variables + +- `IMAGE_TAG`: The Docker image tag to be used for building the application. + +## Job Details + +### Pylint + +- **Runs on**: `ubuntu-latest` +- **Steps**: + - Check out the repository. + - Set up Node.js and Python environments. + - Install necessary dependencies (Pylint, Black, Flake8, Flask, MarkdownLint). + - Check for EditorConfig compliance. + - Analyze Python code with Pylint. + - Configure and run MarkdownLint. + +### UnitTest + +- **Needs**: `Pylint` +- **Runs on**: `ubuntu-latest` +- **Steps**: + - Check out the repository. + - Set up the Python environment. + - Install Flask. + - Run unit tests located in the `app` directory. + +### CheckforSecrets + +- **Needs**: `UnitTest` +- **Runs on**: `ubuntu-latest` +- **Steps**: + - Check out the repository. + - Perform a Gitleaks scan to identify potential secrets in the codebase. + +### TrivySecurity + +- **Needs**: `UnitTest` +- **Runs on**: `ubuntu-latest` +- **Steps**: + - Check out the repository. + - Run a Trivy vulnerability scan and output results in SARIF format. + - Upload the Trivy scan results to the GitHub Security tab. + +### SonarcloudSecurity + +- **Needs**: `UnitTest` +- **Runs on**: `ubuntu-latest` +- **Steps**: + - Check out the repository. + - Run a SonarCloud analysis with the specified project key and organization. + +### Build-Test + +- **Needs**: `[ SonarcloudSecurity, TrivySecurity, CheckforSecrets ]` +- **Runs on**: `ubuntu-latest` +- **Steps**: + - Check out the code. + - Build a Docker image from the Dockerfile. + - Run a Trivy vulnerability scan on the built Docker image. + - Upload the Trivy scan results to the GitHub Security tab. + +### Deploy + +- **Needs**: `[ Build-Test ]` +- **Runs on**: `ubuntu-latest` +- **Steps**: + - Log in to Docker Hub using credentials stored in GitHub Secrets. + - Push the Docker image to Docker Hub. + +## Requirements + +- Ensure that you set up the necessary GitHub Secrets: + - `DOCKERHUB_USERNAME`: Your Docker Hub username. + - `DOCKERHUB_TOKEN`: Your Docker Hub access token. + - `SONAR_TOKEN`: Your SonarCloud token. From 0c79b3faa6e9d0c3c497cf7e4b038399b79130c7 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Sat, 21 Dec 2024 23:27:04 +0200 Subject: [PATCH 103/308] terraform init --- terraform/config.tf | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 terraform/config.tf diff --git a/terraform/config.tf b/terraform/config.tf new file mode 100644 index 000000000..e69de29bb From b81b70f7180bb3af17f017ddb0ec567dd0f9eafc Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 9 Jan 2025 15:04:49 +0200 Subject: [PATCH 104/308] Update github-actions-demo.yml --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 6049dce72..c1843e0d3 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -36,7 +36,7 @@ jobs: "line-lenght": false }' > .markdownlint.json - name: Markdown lint check - run: markdownlint '**/*.md' --ignore node_modules + run: markdownlint '*.md' --ignore node_modules UnitTest: needs: Pylint runs-on: ubuntu-latest From 23daa4c0c15d08da993b79d71a7b31f466038d60 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 9 Jan 2025 15:08:24 +0200 Subject: [PATCH 105/308] Update github-actions-demo.yml --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index c1843e0d3..ad2777bef 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -36,7 +36,7 @@ jobs: "line-lenght": false }' > .markdownlint.json - name: Markdown lint check - run: markdownlint '*.md' --ignore node_modules + run: markdownlint 'README.md' --ignore node_modules UnitTest: needs: Pylint runs-on: ubuntu-latest From 25d04068497b122126b52d365994e7d514023860 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 9 Jan 2025 15:11:54 +0200 Subject: [PATCH 106/308] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index be3d51d63..b76e21fdf 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# devops-programme -# GitHub Actions Demo +#devops-programme +#GitHub Actions Demo This repository demonstrates a CI/CD pipeline using GitHub Actions. The actions defined in this workflow cover code quality checks, testing, security scanning, and deploying a Docker container to Docker Hub. From 75b9d7f3a958594f4df627afec887d7b31e2adf6 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 9 Jan 2025 15:13:21 +0200 Subject: [PATCH 107/308] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b76e21fdf..be3d51d63 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -#devops-programme -#GitHub Actions Demo +# devops-programme +# GitHub Actions Demo This repository demonstrates a CI/CD pipeline using GitHub Actions. The actions defined in this workflow cover code quality checks, testing, security scanning, and deploying a Docker container to Docker Hub. From 89b7ae1c43b0c02e04ae27349ac4904690ca5fb8 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 9 Jan 2025 15:18:28 +0200 Subject: [PATCH 108/308] Update github-actions-demo.yml --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index ad2777bef..f4225b65e 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -36,7 +36,7 @@ jobs: "line-lenght": false }' > .markdownlint.json - name: Markdown lint check - run: markdownlint 'README.md' --ignore node_modules + run: markdownlint '*/*.md' --ignore node_modules UnitTest: needs: Pylint runs-on: ubuntu-latest From acfbc7fe47a720d46195459718c3ba379b9d2fdb Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 9 Jan 2025 15:29:30 +0200 Subject: [PATCH 109/308] Update github-actions-demo.yml --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index f4225b65e..55bfa33ed 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -36,7 +36,7 @@ jobs: "line-lenght": false }' > .markdownlint.json - name: Markdown lint check - run: markdownlint '*/*.md' --ignore node_modules + run: markdownlint **/*.md --ignore node_modules UnitTest: needs: Pylint runs-on: ubuntu-latest From 1f93fe55878be69d42e4ba421132eca2205f68fd Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 10 Jan 2025 15:55:22 +0200 Subject: [PATCH 110/308] Update github-actions-demo.yml --- .github/workflows/github-actions-demo.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 55bfa33ed..f537ddd97 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -1,6 +1,9 @@ name: GitHub Actions Demo run-name: ${{ github.actor }} is testing out GitHub Actions πŸš€ -on: [push] +on: + push: + branches: + - main env: IMAGE_TAG: dimitardd/dimitar-app02 From f6ca95d67b14ac67db6ba3aab2df4cff326bc3a2 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 12 Jan 2025 22:13:13 +0200 Subject: [PATCH 111/308] deplayment test --- deplayment/test.yaml | 1 + 1 file changed, 1 insertion(+) create mode 100644 deplayment/test.yaml diff --git a/deplayment/test.yaml b/deplayment/test.yaml new file mode 100644 index 000000000..30d74d258 --- /dev/null +++ b/deplayment/test.yaml @@ -0,0 +1 @@ +test \ No newline at end of file From 9167c93d7a881506ec895dd0003d5d44c8071fe1 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 12 Jan 2025 23:56:34 +0200 Subject: [PATCH 112/308] sof-app01 --- deplayment/test.yaml | 1 - deployment/sof-app01.yaml | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) delete mode 100644 deplayment/test.yaml create mode 100644 deployment/sof-app01.yaml diff --git a/deplayment/test.yaml b/deplayment/test.yaml deleted file mode 100644 index 30d74d258..000000000 --- a/deplayment/test.yaml +++ /dev/null @@ -1 +0,0 @@ -test \ No newline at end of file diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml new file mode 100644 index 000000000..d5a5a1ff7 --- /dev/null +++ b/deployment/sof-app01.yaml @@ -0,0 +1,21 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: nginx-deployment + labels: + app: nginx +spec: + replicas: 3 + selector: + matchLabels: + app: nginx + template: + metadata: + labels: + app: nginx + spec: + containers: + - name: nginx + image: imitardd/dimitar-app02 + ports: + - containerPort: 80 \ No newline at end of file From 78285dd71d4bf6e5e82487a4a2dbdaa2d3179df5 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Mon, 13 Jan 2025 00:17:53 +0200 Subject: [PATCH 113/308] change namespace in deplayment --- deployment/sof-app01.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index d5a5a1ff7..940a8da4a 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -1,9 +1,9 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: nginx-deployment + name: sof-app01 labels: - app: nginx + app: sof-app01 spec: replicas: 3 selector: From af0585d990bccc0d8757fa3c5c11a556b634b3fb Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Mon, 13 Jan 2025 00:19:54 +0200 Subject: [PATCH 114/308] namespace changed --- deployment/sof-app01.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 940a8da4a..207d6aee2 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -1,9 +1,9 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: sof-app01 + name: sof-app02 labels: - app: sof-app01 + app: sof-app02 spec: replicas: 3 selector: From 3a8fc0dce286c7534f0f026214e8dcb42ac1cf04 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Mon, 13 Jan 2025 00:26:38 +0200 Subject: [PATCH 115/308] namespace --- deployment/sof-app01.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 207d6aee2..432b35957 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: sof-app02 + namespace: sof-app02 labels: app: sof-app02 spec: From 814bbcccff25966bba7aa89ef11f312d40a1ef78 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Mon, 13 Jan 2025 00:29:39 +0200 Subject: [PATCH 116/308] image name correction --- deployment/sof-app01.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 432b35957..b28cf30ca 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -17,6 +17,6 @@ spec: spec: containers: - name: nginx - image: imitardd/dimitar-app02 + image: dimitardd/dimitar-app02 ports: - containerPort: 80 \ No newline at end of file From dd8b7b7ce21fa421e7845a7129979a44c2316c01 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Mon, 13 Jan 2025 00:33:09 +0200 Subject: [PATCH 117/308] chnage port 3000 in deplayment sof-app01 --- deployment/sof-app01.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index b28cf30ca..28ac56274 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -19,4 +19,4 @@ spec: - name: nginx image: dimitardd/dimitar-app02 ports: - - containerPort: 80 \ No newline at end of file + - containerPort: 3000 \ No newline at end of file From 614d1e10574176bdaf8ae9b59c20729f2e3769cd Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Mon, 13 Jan 2025 16:10:59 +0200 Subject: [PATCH 118/308] form --- .gitignore | 3 ++ terraform/argo-app01.tf | 73 +++++++++++++++++++++++++++++++++++++++ terraform/argo-install.tf | 23 ++++++++++++ terraform/provider.tf | 22 ++++++++++++ 4 files changed, 121 insertions(+) create mode 100644 terraform/argo-app01.tf create mode 100644 terraform/argo-install.tf create mode 100644 terraform/provider.tf diff --git a/.gitignore b/.gitignore index 68bc17f9f..42e9dd4e4 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,9 @@ __pycache__/ # C extensions *.so +# terrafomr +terraform/.terraform + # Distribution / packaging .Python build/ diff --git a/terraform/argo-app01.tf b/terraform/argo-app01.tf new file mode 100644 index 000000000..538e76b54 --- /dev/null +++ b/terraform/argo-app01.tf @@ -0,0 +1,73 @@ +resource "argocd_application" "sof-app01" { + metadata { + name = "sof-app01" + namespace = "sof-app01" + labels = { + test = "true" + } + } + + spec { + project = "default" + + source { + repo_url = "https://github.com/dimitardd/devops-programme" + path = "deployment" + target_revision = "dimitardd-281024" + kustomize { + name_prefix = "foo-" + name_suffix = "-bar" + images = ["hashicorp/terraform:light"] + common_labels = { + "this.is.a.common" = "la-bel" + "another.io/one" = "true" + } + } + } + + destination { + server = "https://kubernetes.default.svc" + namespace = "sof-app01" + } + + sync_policy { + automated = { + prune = true + self_heal = true + allow_empty = true + } + # Only available from ArgoCD 1.5.0 onwards + sync_options = ["Validate=false"] + retry { + limit = "5" + backoff = { + duration = "30s" + max_duration = "2m" + factor = "2" + } + } + } + + # ignore_difference { + # group = "apps" + # kind = "Deployment" + # json_pointers = ["/spec/replicas"] + # } + + # ignore_difference { + # group = "apps" + # kind = "StatefulSet" + # name = "someStatefulSet" + # json_pointers = [ + # "/spec/replicas", + # "/spec/template/spec/metadata/labels/bar", + # ] + # Only available from ArgoCD 2.1.0 onwards + # jq_path_expressions = [ + # ".spec.replicas", + # ".spec.template.spec.metadata.labels.bar", + # ] + } +} +#} + diff --git a/terraform/argo-install.tf b/terraform/argo-install.tf new file mode 100644 index 000000000..7e2f8f8e7 --- /dev/null +++ b/terraform/argo-install.tf @@ -0,0 +1,23 @@ +resource "helm_release" "argocd" { + name = "argo-cd-7-1734333419" + + repository = "http://slo-it-nexus01.pt.playtech.corp/repository/helm-argocd" + chart = "argo-cd" + namespace = "argocd" + create_namespace = true + version = "7.7.15" + + values = [file("values/argocd.yaml")] +} + +resource "helm_release" "argo-rollouts" { + name = "argo-rollouts" + + repository = "http://slo-it-nexus01.pt.playtech.corp/repository/helm-argocd" + chart = "argo-rollouts" + namespace = "argocd" + create_namespace = false + version = "2.38.2" + + values = [file("values/argo-rollouts.yaml")] +} diff --git a/terraform/provider.tf b/terraform/provider.tf new file mode 100644 index 000000000..6125793f6 --- /dev/null +++ b/terraform/provider.tf @@ -0,0 +1,22 @@ +provider "helm" { + kubernetes { + config_path = "~/.kube/sof-lab03" + } +} + +provider "kubernetes" { + config_path = "~/.kube/sof-lab03" + config_context = "sof-lab03" +} + +resource "kubernetes_namespace" "sof-app01" { + metadata { + name = "sof-app01" + } +} + +terraform { + backend "local" { + path = "/Users/dimitar.dimitrov/devops/telerik/terraform.tfstate" + } +} From b66c6b488700bbe2888cd17917e4e6616f0879e7 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Mon, 13 Jan 2025 16:27:48 +0200 Subject: [PATCH 119/308] added gitignore for terraform --- .gitignore | 5 ++- terraform/.terraform.lock.hcl | 40 +++++++++++++++++++ .../{argo-app01.tf => argo-app01.tf.back} | 0 terraform/values/argo-rollouts.yaml | 9 +++++ terraform/values/argocd.yaml | 9 +++++ 5 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 terraform/.terraform.lock.hcl rename terraform/{argo-app01.tf => argo-app01.tf.back} (100%) create mode 100644 terraform/values/argo-rollouts.yaml create mode 100644 terraform/values/argocd.yaml diff --git a/.gitignore b/.gitignore index 42e9dd4e4..1a41202d8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,10 @@ __pycache__/ # terrafomr terraform/.terraform - +**/.terraform/* +terraform/.terraform/lock.hcl +terrafrom/*/.terraform.lock.hcl + # Distribution / packaging .Python build/ diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl new file mode 100644 index 000000000..d87d06e76 --- /dev/null +++ b/terraform/.terraform.lock.hcl @@ -0,0 +1,40 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/helm" { + version = "2.17.0" + hashes = [ + "h1:0LSHBFqJvHTzQesUwagpDLsrzVliY+t2c26nDJizHFM=", + "zh:06fb4e9932f0afc1904d2279e6e99353c2ddac0d765305ce90519af410706bd4", + "zh:104eccfc781fc868da3c7fec4385ad14ed183eb985c96331a1a937ac79c2d1a7", + "zh:129345c82359837bb3f0070ce4891ec232697052f7d5ccf61d43d818912cf5f3", + "zh:3956187ec239f4045975b35e8c30741f701aa494c386aaa04ebabffe7749f81c", + "zh:66a9686d92a6b3ec43de3ca3fde60ef3d89fb76259ed3313ca4eb9bb8c13b7dd", + "zh:88644260090aa621e7e8083585c468c8dd5e09a3c01a432fb05da5c4623af940", + "zh:a248f650d174a883b32c5b94f9e725f4057e623b00f171936dcdcc840fad0b3e", + "zh:aa498c1f1ab93be5c8fbf6d48af51dc6ef0f10b2ea88d67bcb9f02d1d80d3930", + "zh:bf01e0f2ec2468c53596e027d376532a2d30feb72b0b5b810334d043109ae32f", + "zh:c46fa84cc8388e5ca87eb575a534ebcf68819c5a5724142998b487cb11246654", + "zh:d0c0f15ffc115c0965cbfe5c81f18c2e114113e7a1e6829f6bfd879ce5744fbb", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + ] +} + +provider "registry.terraform.io/hashicorp/kubernetes" { + version = "2.35.1" + hashes = [ + "h1:MfYq1y/cHyf7Xa1Bjw6bz/Z3PY4wgh92M+PAUJTj9qQ=", + "zh:12212ca5ae47823ce14bfafb909eeb6861faf1e2435fb2fc4a8b334b3544b5f5", + "zh:3f49b3d77182df06b225ab266667de69681c2e75d296867eb2cf06a8f8db768c", + "zh:40832494d19f8a2b3cd0c18b80294d0b23ef6b82f6f6897b5fe00248a9997460", + "zh:739a5ddea61a77925ee7006a29c8717377a2e9d0a79a0bbd98738d92eec12c0d", + "zh:a02b472021753627c5c39447a56d125a32214c29ff9108fc499f2dcdf4f1cc4f", + "zh:b78865b3867065aa266d6758c9601a2756741478f5735a838c20d633d65e085b", + "zh:d362e87464683f5632790e66920ea803adb54c2bc0cb24b6fd9a314d2b1efffd", + "zh:d98206fe88c2c9a52b8d2d0cb2c877c812a4a51d19f9d8428e63cbd5fd8a304d", + "zh:dfa320946b1ce3f3615c42b3447a28dc9f604c06d8b9a6fe289855ab2ade4d11", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:fc1debd2e695b5222d2ccc8b24dab65baba4ee2418ecce944e64d42e79474cb5", + "zh:fdaf960443720a238c09e519aeb30faf74f027ac5d1e0a309c3b326888e031d7", + ] +} diff --git a/terraform/argo-app01.tf b/terraform/argo-app01.tf.back similarity index 100% rename from terraform/argo-app01.tf rename to terraform/argo-app01.tf.back diff --git a/terraform/values/argo-rollouts.yaml b/terraform/values/argo-rollouts.yaml new file mode 100644 index 000000000..4b2299781 --- /dev/null +++ b/terraform/values/argo-rollouts.yaml @@ -0,0 +1,9 @@ +--- +global: + image: + tag: "v1.7.2" + +server: + extraArgs: + - --insecure + diff --git a/terraform/values/argocd.yaml b/terraform/values/argocd.yaml new file mode 100644 index 000000000..953cca4f3 --- /dev/null +++ b/terraform/values/argocd.yaml @@ -0,0 +1,9 @@ +--- +global: + image: + tag: "v2.13.3" + +server: + extraArgs: + - --insecure + From 8d351c75db3cdaa17110f2f890acf972989d38de Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Mon, 13 Jan 2025 16:29:34 +0200 Subject: [PATCH 120/308] Delete terraform/.terraform.lock.hcl --- terraform/.terraform.lock.hcl | 40 ----------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 terraform/.terraform.lock.hcl diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl deleted file mode 100644 index d87d06e76..000000000 --- a/terraform/.terraform.lock.hcl +++ /dev/null @@ -1,40 +0,0 @@ -# This file is maintained automatically by "terraform init". -# Manual edits may be lost in future updates. - -provider "registry.terraform.io/hashicorp/helm" { - version = "2.17.0" - hashes = [ - "h1:0LSHBFqJvHTzQesUwagpDLsrzVliY+t2c26nDJizHFM=", - "zh:06fb4e9932f0afc1904d2279e6e99353c2ddac0d765305ce90519af410706bd4", - "zh:104eccfc781fc868da3c7fec4385ad14ed183eb985c96331a1a937ac79c2d1a7", - "zh:129345c82359837bb3f0070ce4891ec232697052f7d5ccf61d43d818912cf5f3", - "zh:3956187ec239f4045975b35e8c30741f701aa494c386aaa04ebabffe7749f81c", - "zh:66a9686d92a6b3ec43de3ca3fde60ef3d89fb76259ed3313ca4eb9bb8c13b7dd", - "zh:88644260090aa621e7e8083585c468c8dd5e09a3c01a432fb05da5c4623af940", - "zh:a248f650d174a883b32c5b94f9e725f4057e623b00f171936dcdcc840fad0b3e", - "zh:aa498c1f1ab93be5c8fbf6d48af51dc6ef0f10b2ea88d67bcb9f02d1d80d3930", - "zh:bf01e0f2ec2468c53596e027d376532a2d30feb72b0b5b810334d043109ae32f", - "zh:c46fa84cc8388e5ca87eb575a534ebcf68819c5a5724142998b487cb11246654", - "zh:d0c0f15ffc115c0965cbfe5c81f18c2e114113e7a1e6829f6bfd879ce5744fbb", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - ] -} - -provider "registry.terraform.io/hashicorp/kubernetes" { - version = "2.35.1" - hashes = [ - "h1:MfYq1y/cHyf7Xa1Bjw6bz/Z3PY4wgh92M+PAUJTj9qQ=", - "zh:12212ca5ae47823ce14bfafb909eeb6861faf1e2435fb2fc4a8b334b3544b5f5", - "zh:3f49b3d77182df06b225ab266667de69681c2e75d296867eb2cf06a8f8db768c", - "zh:40832494d19f8a2b3cd0c18b80294d0b23ef6b82f6f6897b5fe00248a9997460", - "zh:739a5ddea61a77925ee7006a29c8717377a2e9d0a79a0bbd98738d92eec12c0d", - "zh:a02b472021753627c5c39447a56d125a32214c29ff9108fc499f2dcdf4f1cc4f", - "zh:b78865b3867065aa266d6758c9601a2756741478f5735a838c20d633d65e085b", - "zh:d362e87464683f5632790e66920ea803adb54c2bc0cb24b6fd9a314d2b1efffd", - "zh:d98206fe88c2c9a52b8d2d0cb2c877c812a4a51d19f9d8428e63cbd5fd8a304d", - "zh:dfa320946b1ce3f3615c42b3447a28dc9f604c06d8b9a6fe289855ab2ade4d11", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fc1debd2e695b5222d2ccc8b24dab65baba4ee2418ecce944e64d42e79474cb5", - "zh:fdaf960443720a238c09e519aeb30faf74f027ac5d1e0a309c3b326888e031d7", - ] -} From 87c6bc8ddb57e7a66503e68723a753830ec62b50 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Mon, 13 Jan 2025 16:32:44 +0200 Subject: [PATCH 121/308] gitignore terrafrom --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1a41202d8..a0d3d547f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,9 +7,10 @@ __pycache__/ *.so # terrafomr +*.terraform.lock.hcl terraform/.terraform **/.terraform/* -terraform/.terraform/lock.hcl +terraform/.terraform.lock.hcl terrafrom/*/.terraform.lock.hcl # Distribution / packaging From 78342814afc8e9a7c74e173f289ae6e574452c11 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 13 Jan 2025 19:51:59 +0200 Subject: [PATCH 122/308] clean repo --- M1-3-Ansible/README.md | 36 -------------- M1-4-2-CI-Practice/README.md | 62 ----------------------- terraform/README.md | 95 ++++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 98 deletions(-) delete mode 100644 M1-3-Ansible/README.md delete mode 100644 M1-4-2-CI-Practice/README.md create mode 100644 terraform/README.md diff --git a/M1-3-Ansible/README.md b/M1-3-Ansible/README.md deleted file mode 100644 index e44faf9c3..000000000 --- a/M1-3-Ansible/README.md +++ /dev/null @@ -1,36 +0,0 @@ -# M1-3-1 Configuration Management - -## Ansible Task - -Create an Ansible playbook that build, push and then run the Docker image for the Python -application. Let your playbook has the following variables: - -* `image_name` - contains the name of your image without the tag, i.e. `vutoff/python-app` -* `image_tag` - contains the tag you tagged your image with, i.e. `v0.2` -* `listen_port` - contains the listening port you're binding your app to. - -Make sure that you set environment variable `PORT` when you define your container -in the Ansible playbook that takes its value from `listen_port` variable. - -Use Ansible modules. Do not shell out. - -### Requirements - -* Make sure you have Python installed. Any version above 3.8 would suffice. -* The `requirements.txt` file in this directory contains the required Ansible version. Run - -```sh -pip install -r requirements.txt -``` - -* Make sure that Docker is running on your local machine. - -### Mind the following - -* If you're running Docker Desktop or Rancher Desktop, mind the location of the `docker.sock` file. The location of the socket file is - * Docker Desktop - `${HOME}/.docker/run/docker.sock` - * Rancher DEsktop - ${HOME}/.rd/run/docker.sock - -* If you're using one of the above, when you write your Ansible playbook you -must specify the path to the docker socket with the parameter `docker_host`, -i.e. `docker_host: "unix://{{ ansible_env.HOME }}/.rd/docker.sock"`. diff --git a/M1-4-2-CI-Practice/README.md b/M1-4-2-CI-Practice/README.md deleted file mode 100644 index 761192ab9..000000000 --- a/M1-4-2-CI-Practice/README.md +++ /dev/null @@ -1,62 +0,0 @@ -# GitHub Actions Practice - -## Prerequisites - -- Organize your git repo to follow the guidelines provides in the presentation - -```sh -β”œβ”€β”€ .editorconfig -β”œβ”€β”€ .github -β”‚Β Β  └── workflows -β”‚Β Β  └── ci-pipeline.yml -β”œβ”€β”€ .gitignore -β”œβ”€β”€ .markdownlint.json -β”œβ”€β”€ .python-version -β”œβ”€β”€ Dockerfile -β”œβ”€β”€ LICENSE -β”œβ”€β”€ README.md -β”œβ”€β”€ ansible -β”‚Β Β  β”œβ”€β”€ README.md -β”‚Β Β  └── playbook.yml -β”œβ”€β”€ app -β”‚Β Β  β”œβ”€β”€ README.md -β”‚Β Β  β”œβ”€β”€ app.py -β”‚Β Β  β”œβ”€β”€ app_test.py -β”‚Β Β  └── requirements.txt -└── requirements.txt -``` - -## Task description - -Create a GitHub Actions pipeline that runs on commit to a feature branch (i.e. not `main`) and performs the following checks on our simple Flask app repository. - -- Check `.editorconfig` -- Code Lint and style - use `pylint` and `black` to check for style/formatting/syntax errors -- Check makrdown files [markdownlint-cli](https://www.npmjs.com/package/cli-markdown) -- Code Unittest - there's a simple unit test next to our app called `app_test.py`. Make sure our unittest passes (`python -m unittest` executed in the app directory) -- Check for hardcoded secrets (`gitleaks`) - not just our app but the whole repository. -- SAST - SonarCloud; Review code smells and security issues -- SCA - Snyk; review security issues -- Build a Docker image. Use Git commit SHA as an Image tag. -- Scan the built image with `Trivy` -- Push the built image to your Docker HUB account -- (optional) Add CONTRIBUTORS guide. Follow [this](https://docs.github.com/en/communities/setting-up-your-project-for-healthy-contributions/setting-guidelines-for-repository-contributors) document from GitHUb. - -:warning: Make sure that you run as many tests in parallel as you see fit - -:warning: Make sure you don't push your image to Docker HUB if Critical vulnerabilities are found - -:warning: Try and use ready-made GH Actions. Avoid shell-out if possible - -:exclamation: At the end open a PR with your solution. - -## Extra effort - -- Create a pre-commit hook that safeguards for the following - - hardcoded secrets (`gitleaks`) - - yamllint - - check-merge-conflict - - check-added-large-files -- Setup docker-compose with build and run a container -- Try out GitHub Actions schedule trigger event - - diff --git a/terraform/README.md b/terraform/README.md new file mode 100644 index 000000000..d70f6d354 --- /dev/null +++ b/terraform/README.md @@ -0,0 +1,95 @@ +# Terraform Helm Chart Deployment + +This repository contains Terraform code for deploying ArgoCD and Argo Rollouts using Helm charts within a Kubernetes cluster. The Helm releases are configured to be deployed in the `argocd` namespace. + +## Prerequisites + +- Terraform installed on your machine. +- Access to a Kubernetes cluster. +- `kubectl` configured to interact with your Kubernetes cluster. +- Helm installed on your machine. + +## Getting Started + +1. **Clone the Repository**: + Clone this repository to your local machine. + + ```bash + git clone + cd + ``` + +2. **Configure Kubernetes Context**: + Ensure your Kubernetes configuration is set up correctly. The configuration file is expected to be located at `~/.kube/sof-lab03`. + +3. **Set Up Terraform Backend**: + The Terraform state file will be stored locally at `/Users/dimitar.dimitrov/devops/telerik/terraform.tfstate`. Ensure that this path is accessible. + +4. **Required Values Files**: + Make sure that the following values files are present in the `values` directory: + - `argocd.yaml` + - `argo-rollouts.yaml` + +5. **Initialize Terraform**: + Run the following command to initialize Terraform, which will download the necessary providers: + + ```bash + terraform init + ``` + +6. **Plan the Deployment**: + Generate an execution plan to review the resources that will be created: + + ```bash + terraform plan + ``` + +7. **Apply the Configuration**: + Apply the Terraform configuration to deploy the Helm charts: + + ```bash + terraform apply + ``` + + Confirm the action when prompted. + +## Resources + +### Helm Releases + +- **ArgoCD**: + - **Name**: `argo-cd-7-1734333419` + - **Chart**: `argo-cd` + - **Version**: `7.7.15` + - **Repository**: [Helm Repository](http://slo-it-nexus01.pt.playtech.corp/repository/helm-argocd) + +- **Argo Rollouts**: + - **Name**: `argo-rollouts` + - **Chart**: `argo-rollouts` + - **Version**: `2.38.2` + - **Repository**: [Helm Repository](http://slo-it-nexus01.pt.playtech.corp/repository/helm-argocd) + +### Kubernetes Namespace + +- **Namespace**: `sof-app01` +- This namespace will be created for your application resources. + +## Providers + +- **Helm**: + - Configured to use the Kubernetes config located at `~/.kube/sof-lab03`. + +- **Kubernetes**: + - Configured to use the Kubernetes config located at `~/.kube/sof-lab03` with the context `sof-lab03`. + +## Cleanup + +To remove the deployed resources, you can run: + +```bash +terraform destroy +``` + +## License + +This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details. \ No newline at end of file From eb35f1c0a2e8705eb603402d723abd7479028180 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 13 Jan 2025 20:01:42 +0200 Subject: [PATCH 123/308] add branch dimitardd-281024 in action plan --- .github/workflows/github-actions-demo.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index f537ddd97..28bdd7a32 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - dimitardd-281024 env: IMAGE_TAG: dimitardd/dimitar-app02 From d83d6212bc5d72d6c741d2b532f0cd5d612473f6 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 13 Jan 2025 20:03:15 +0200 Subject: [PATCH 124/308] Run editorconfig-checker Downloading v3.1.2 deployment/sof-app01.yaml: Wrong line endings or no final newline terraform/README.md: Wrong line endings or no final newline --- deployment/sof-app01.yaml | 2 +- terraform/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 28ac56274..5e3d31727 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -19,4 +19,4 @@ spec: - name: nginx image: dimitardd/dimitar-app02 ports: - - containerPort: 3000 \ No newline at end of file + - containerPort: 3000 diff --git a/terraform/README.md b/terraform/README.md index d70f6d354..b8c25f139 100644 --- a/terraform/README.md +++ b/terraform/README.md @@ -92,4 +92,4 @@ terraform destroy ## License -This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details. \ No newline at end of file +This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details. From c433100d12b6f741b131e0a3b9261727849c5677 Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 13 Jan 2025 20:07:03 +0200 Subject: [PATCH 125/308] MD009/no-trailing-spaces Trailing spaces in terraform/README.md --- terraform/README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/terraform/README.md b/terraform/README.md index b8c25f139..bc925ea62 100644 --- a/terraform/README.md +++ b/terraform/README.md @@ -11,7 +11,7 @@ This repository contains Terraform code for deploying ArgoCD and Argo Rollouts u ## Getting Started -1. **Clone the Repository**: +1. **Clone the Repository**: Clone this repository to your local machine. ```bash @@ -19,32 +19,32 @@ This repository contains Terraform code for deploying ArgoCD and Argo Rollouts u cd ``` -2. **Configure Kubernetes Context**: +2. **Configure Kubernetes Context**: Ensure your Kubernetes configuration is set up correctly. The configuration file is expected to be located at `~/.kube/sof-lab03`. -3. **Set Up Terraform Backend**: +3. **Set Up Terraform Backend**: The Terraform state file will be stored locally at `/Users/dimitar.dimitrov/devops/telerik/terraform.tfstate`. Ensure that this path is accessible. -4. **Required Values Files**: +4. **Required Values Files**: Make sure that the following values files are present in the `values` directory: - `argocd.yaml` - `argo-rollouts.yaml` -5. **Initialize Terraform**: +5. **Initialize Terraform**: Run the following command to initialize Terraform, which will download the necessary providers: ```bash terraform init ``` -6. **Plan the Deployment**: +6. **Plan the Deployment**: Generate an execution plan to review the resources that will be created: ```bash terraform plan ``` -7. **Apply the Configuration**: +7. **Apply the Configuration**: Apply the Terraform configuration to deploy the Helm charts: ```bash @@ -57,13 +57,13 @@ This repository contains Terraform code for deploying ArgoCD and Argo Rollouts u ### Helm Releases -- **ArgoCD**: +- **ArgoCD**: - **Name**: `argo-cd-7-1734333419` - **Chart**: `argo-cd` - **Version**: `7.7.15` - **Repository**: [Helm Repository](http://slo-it-nexus01.pt.playtech.corp/repository/helm-argocd) -- **Argo Rollouts**: +- **Argo Rollouts**: - **Name**: `argo-rollouts` - **Chart**: `argo-rollouts` - **Version**: `2.38.2` @@ -76,10 +76,10 @@ This repository contains Terraform code for deploying ArgoCD and Argo Rollouts u ## Providers -- **Helm**: +- **Helm**: - Configured to use the Kubernetes config located at `~/.kube/sof-lab03`. -- **Kubernetes**: +- **Kubernetes**: - Configured to use the Kubernetes config located at `~/.kube/sof-lab03` with the context `sof-lab03`. ## Cleanup From 18eb7e91343ce0def95976a4af5894e876ca1aaa Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 13 Jan 2025 20:17:17 +0200 Subject: [PATCH 126/308] build green image --- app/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/app.py b/app/app.py index 67e0180c0..370382038 100644 --- a/app/app.py +++ b/app/app.py @@ -7,7 +7,7 @@ @app.route("/") def hello_world(): - return "Hello, World!" + return "Hello, Green World!" if __name__ == "__main__": From 4d8f5c0aba5f446b4822a1b79c561c3e18850cba Mon Sep 17 00:00:00 2001 From: DimitarDimitrov Date: Mon, 13 Jan 2025 20:20:32 +0200 Subject: [PATCH 127/308] build Green image --- app/app_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/app_test.py b/app/app_test.py index a1b1bacb2..e7a6b3888 100644 --- a/app/app_test.py +++ b/app/app_test.py @@ -10,7 +10,7 @@ def setUp(self): def test_hello_world(self): response = self.client.get("/") self.assertEqual(response.status_code, 200) - self.assertEqual(response.data, b"Hello, World!") + self.assertEqual(response.data, b"Hello, Green World!") if __name__ == "__main__": From 4add8a0c2b43a3fa2b52db684c30bc137bc50802 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Mon, 13 Jan 2025 23:35:50 +0200 Subject: [PATCH 128/308] sof-app01 deplayment --- .github/workflows/github-actions-demo.yml | 2 +- deployment/sof-app01.yaml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 28bdd7a32..dda11d573 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -4,7 +4,7 @@ on: push: branches: - main - - dimitardd-281024 +# - dimitardd-281024 env: IMAGE_TAG: dimitardd/dimitar-app02 diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 5e3d31727..84d17ae3a 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -1,22 +1,22 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: sof-app02 - namespace: sof-app02 + name: sof-app01 + namespace: sof-app01 labels: - app: sof-app02 + app: sof-app01 spec: replicas: 3 selector: matchLabels: - app: nginx + app: sof-app01 template: metadata: labels: - app: nginx + app: sof-app01 spec: containers: - - name: nginx - image: dimitardd/dimitar-app02 + - name: sof-app01 + image: dimitardd/dimitar-app02:4d8f5c0aba5f446b4822a1b79c561c3e18850cba ports: - containerPort: 3000 From 600f531bad2eebaca2ffeefae9d319b07d1688d5 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Mon, 13 Jan 2025 23:46:30 +0200 Subject: [PATCH 129/308] sof-app01 service file --- deployment/sof-app01-svc.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 deployment/sof-app01-svc.yaml diff --git a/deployment/sof-app01-svc.yaml b/deployment/sof-app01-svc.yaml new file mode 100644 index 000000000..0078bed38 --- /dev/null +++ b/deployment/sof-app01-svc.yaml @@ -0,0 +1,16 @@ +piVersion: v1 +kind: Service +metadata: + name: sof-app01-service + namespace: sof-app01 + labels: + app: sof-app01 +spec: + selector: + app: sof-app01 + ports: + - protocol: TCP + port: 3000 + targetPort: 3000 + type: ClusterIP + From 752281aa70e5999fd80c4c85cb14ae38607d9864 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Mon, 13 Jan 2025 23:48:19 +0200 Subject: [PATCH 130/308] fix missing symbol in sof-app01-svc --- deployment/sof-app01-svc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/sof-app01-svc.yaml b/deployment/sof-app01-svc.yaml index 0078bed38..783237547 100644 --- a/deployment/sof-app01-svc.yaml +++ b/deployment/sof-app01-svc.yaml @@ -1,4 +1,4 @@ -piVersion: v1 +apiVersion: v1 kind: Service metadata: name: sof-app01-service From a3a5c6b261813fe2144107f2948c83e1dd1b77e7 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Mon, 13 Jan 2025 23:54:26 +0200 Subject: [PATCH 131/308] add sof-app01 igress file --- deployment/sof-app01-ingress.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 deployment/sof-app01-ingress.yaml diff --git a/deployment/sof-app01-ingress.yaml b/deployment/sof-app01-ingress.yaml new file mode 100644 index 000000000..c50c94532 --- /dev/null +++ b/deployment/sof-app01-ingress.yaml @@ -0,0 +1,20 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: sof-app01-ingress + namespace: sof-app01 + annotations: + kubernetes.io/ingress.class: "nginx" +spec: + rules: + - host: sof-app01.pt.playtech.corp + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: sof-app01-service + port: + number: 80 + From 708132e03fd8b98159d296a9d643fb5b28203c3d Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 14 Jan 2025 00:09:00 +0200 Subject: [PATCH 132/308] add portname on sof-app01 service --- deployment/sof-app01-svc.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deployment/sof-app01-svc.yaml b/deployment/sof-app01-svc.yaml index 783237547..283bb03fb 100644 --- a/deployment/sof-app01-svc.yaml +++ b/deployment/sof-app01-svc.yaml @@ -9,7 +9,8 @@ spec: selector: app: sof-app01 ports: - - protocol: TCP + - name: 3000tcp + protocol: TCP port: 3000 targetPort: 3000 type: ClusterIP From 42dc6a8dd995f6478a78d18c98c2e8fbc77c8aff Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 14 Jan 2025 00:21:15 +0200 Subject: [PATCH 133/308] fix sof-app01 ingress --- deployment/sof-app01-ingress.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/sof-app01-ingress.yaml b/deployment/sof-app01-ingress.yaml index c50c94532..aee1e69cc 100644 --- a/deployment/sof-app01-ingress.yaml +++ b/deployment/sof-app01-ingress.yaml @@ -16,5 +16,5 @@ spec: service: name: sof-app01-service port: - number: 80 + number: 3000 From 4fb3e4a57b0eb02324905c3cd293a83754a32057 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 14 Jan 2025 00:25:25 +0200 Subject: [PATCH 134/308] build blue immage --- .github/workflows/github-actions-demo.yml | 2 +- app/app.py | 2 +- app/app_test.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index dda11d573..28bdd7a32 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -4,7 +4,7 @@ on: push: branches: - main -# - dimitardd-281024 + - dimitardd-281024 env: IMAGE_TAG: dimitardd/dimitar-app02 diff --git a/app/app.py b/app/app.py index 370382038..51ee7acf9 100644 --- a/app/app.py +++ b/app/app.py @@ -7,7 +7,7 @@ @app.route("/") def hello_world(): - return "Hello, Green World!" + return "Hello, Blue World!" if __name__ == "__main__": diff --git a/app/app_test.py b/app/app_test.py index e7a6b3888..d67c26993 100644 --- a/app/app_test.py +++ b/app/app_test.py @@ -10,7 +10,7 @@ def setUp(self): def test_hello_world(self): response = self.client.get("/") self.assertEqual(response.status_code, 200) - self.assertEqual(response.data, b"Hello, Green World!") + self.assertEqual(response.data, b"Hello, Blue World!") if __name__ == "__main__": From eee52950b557904f443b0caeb009081b230de52d Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 14 Jan 2025 00:46:15 +0200 Subject: [PATCH 135/308] create rollout plan --- rollout/sof-app02-service.yaml | 12 +++++++++++ rollout/sof-app02.yaml | 38 ++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 rollout/sof-app02-service.yaml create mode 100644 rollout/sof-app02.yaml diff --git a/rollout/sof-app02-service.yaml b/rollout/sof-app02-service.yaml new file mode 100644 index 000000000..3af9db38f --- /dev/null +++ b/rollout/sof-app02-service.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: Service +metadata: + name: sof-app02-rollouts +spec: + ports: + - name: 80tcp + port: 80 + targetPort: http + protocol: TCP + selector: + app: sof-app02-rollouts \ No newline at end of file diff --git a/rollout/sof-app02.yaml b/rollout/sof-app02.yaml new file mode 100644 index 000000000..7b0dee8c9 --- /dev/null +++ b/rollout/sof-app02.yaml @@ -0,0 +1,38 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Rollout +metadata: + name: sof-app02-rollouts +spec: + replicas: 5 + strategy: + canary: + steps: + - setWeight: 20 + - pause: {} + - setWeight: 40 + - pause: {duration: 10} + - setWeight: 60 + - pause: {duration: 10} + - setWeight: 80 + - pause: {duration: 10} + revisionHistoryLimit: 2 + selector: + matchLabels: + app: sof-app02-rollouts + template: + metadata: + namespace: sof-app02 + labels: + app: sof-app02-rollouts + spec: + containers: + - name: sof-app02 + image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 + ports: + - name: 3000app02 + containerPort: 3000 + protocol: TCP + resources: + requests: + memory: 32Mi + cpu: 5m From 040b1e81f45f3ab90a2ebecafba6e88ba7d9dcdb Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 14 Jan 2025 01:02:13 +0200 Subject: [PATCH 136/308] sof-app02-service name fix --- deployment/sof-app01-ingress.yaml | 1 - rollout/sof-app02-ingress.yaml | 19 +++++++++++++++++++ rollout/sof-app02-service.yaml | 6 +++--- 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 rollout/sof-app02-ingress.yaml diff --git a/deployment/sof-app01-ingress.yaml b/deployment/sof-app01-ingress.yaml index aee1e69cc..5e4c224f4 100644 --- a/deployment/sof-app01-ingress.yaml +++ b/deployment/sof-app01-ingress.yaml @@ -17,4 +17,3 @@ spec: name: sof-app01-service port: number: 3000 - diff --git a/rollout/sof-app02-ingress.yaml b/rollout/sof-app02-ingress.yaml new file mode 100644 index 000000000..805b42aab --- /dev/null +++ b/rollout/sof-app02-ingress.yaml @@ -0,0 +1,19 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: sof-app02-ingress + namespace: sof-app02 + annotations: + kubernetes.io/ingress.class: "nginx" +spec: + rules: + - host: sof-app02.pt.playtech.corp + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: sof-app02-service + port: + number: 3000 diff --git a/rollout/sof-app02-service.yaml b/rollout/sof-app02-service.yaml index 3af9db38f..30c504181 100644 --- a/rollout/sof-app02-service.yaml +++ b/rollout/sof-app02-service.yaml @@ -1,11 +1,11 @@ apiVersion: v1 kind: Service metadata: - name: sof-app02-rollouts + name: sof-app02-service spec: ports: - - name: 80tcp - port: 80 + - name: 3000app02 + port: 3000 targetPort: http protocol: TCP selector: From cb835edddd18064bd8f4f49c39cd79be17ab9cda Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 14 Jan 2025 01:06:58 +0200 Subject: [PATCH 137/308] sof-app02 service target port fix --- rollout/sof-app02-service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rollout/sof-app02-service.yaml b/rollout/sof-app02-service.yaml index 30c504181..ca4939a34 100644 --- a/rollout/sof-app02-service.yaml +++ b/rollout/sof-app02-service.yaml @@ -6,7 +6,7 @@ spec: ports: - name: 3000app02 port: 3000 - targetPort: http + targetPort: 3000 protocol: TCP selector: app: sof-app02-rollouts \ No newline at end of file From 846360ec70cbb9a879a9d9c9ee47866b03513688 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 14 Jan 2025 01:31:43 +0200 Subject: [PATCH 138/308] add namespace to sof-app02 --- rollout/sof-app02.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rollout/sof-app02.yaml b/rollout/sof-app02.yaml index 7b0dee8c9..b93acfda1 100644 --- a/rollout/sof-app02.yaml +++ b/rollout/sof-app02.yaml @@ -2,6 +2,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Rollout metadata: name: sof-app02-rollouts + namespace: sof-app02 spec: replicas: 5 strategy: @@ -21,7 +22,6 @@ spec: app: sof-app02-rollouts template: metadata: - namespace: sof-app02 labels: app: sof-app02-rollouts spec: From bd6194cdcb67d6d38f41e6e25b7c8382b13b6260 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 14 Jan 2025 02:30:39 +0200 Subject: [PATCH 139/308] fix rollout demo --- rollout/sof-app02-service.yaml | 10 +++++----- rollout/sof-app02.yaml | 5 +---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/rollout/sof-app02-service.yaml b/rollout/sof-app02-service.yaml index ca4939a34..7969e7f98 100644 --- a/rollout/sof-app02-service.yaml +++ b/rollout/sof-app02-service.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: sof-app02-service + name: rollouts-demo spec: ports: - - name: 3000app02 - port: 3000 - targetPort: 3000 + - port: 3000 + targetPort: http protocol: TCP + name: http selector: - app: sof-app02-rollouts \ No newline at end of file + app: rollouts-demo \ No newline at end of file diff --git a/rollout/sof-app02.yaml b/rollout/sof-app02.yaml index b93acfda1..bf7dc90da 100644 --- a/rollout/sof-app02.yaml +++ b/rollout/sof-app02.yaml @@ -32,7 +32,4 @@ spec: - name: 3000app02 containerPort: 3000 protocol: TCP - resources: - requests: - memory: 32Mi - cpu: 5m + From d957d642d10b7f678864d205459e1ca7632a2b66 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 14 Jan 2025 02:31:13 +0200 Subject: [PATCH 140/308] fix rollout demo --- rollout/sof-app02.yaml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/rollout/sof-app02.yaml b/rollout/sof-app02.yaml index bf7dc90da..af22bea41 100644 --- a/rollout/sof-app02.yaml +++ b/rollout/sof-app02.yaml @@ -1,8 +1,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Rollout metadata: - name: sof-app02-rollouts - namespace: sof-app02 + name: rollouts-demo spec: replicas: 5 strategy: @@ -19,17 +18,20 @@ spec: revisionHistoryLimit: 2 selector: matchLabels: - app: sof-app02-rollouts + app: rollouts-demo template: metadata: labels: - app: sof-app02-rollouts + app: rollouts-demo spec: containers: - - name: sof-app02 + - name: rollouts-demo image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 ports: - - name: 3000app02 + - name: http containerPort: 3000 protocol: TCP - + resources: + requests: + memory: 32Mi + cpu: 5m From 1f39bcb9b83b3ad9ecc13531cae04a2e41d6adb3 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 14 Jan 2025 02:35:19 +0200 Subject: [PATCH 141/308] rollout ingress --- rollout/sof-app02-ingress.yaml | 5 ++--- rollout/sof-app02-service.yaml | 4 ++-- rollout/sof-app02.yaml | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/rollout/sof-app02-ingress.yaml b/rollout/sof-app02-ingress.yaml index 805b42aab..a360cae72 100644 --- a/rollout/sof-app02-ingress.yaml +++ b/rollout/sof-app02-ingress.yaml @@ -1,8 +1,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: sof-app02-ingress - namespace: sof-app02 + name: sof-app02 annotations: kubernetes.io/ingress.class: "nginx" spec: @@ -14,6 +13,6 @@ spec: pathType: Prefix backend: service: - name: sof-app02-service + name: sof-app02 port: number: 3000 diff --git a/rollout/sof-app02-service.yaml b/rollout/sof-app02-service.yaml index 7969e7f98..49ce525a5 100644 --- a/rollout/sof-app02-service.yaml +++ b/rollout/sof-app02-service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: rollouts-demo + name: sof-app02 spec: ports: - port: 3000 @@ -9,4 +9,4 @@ spec: protocol: TCP name: http selector: - app: rollouts-demo \ No newline at end of file + app: sof-app02 \ No newline at end of file diff --git a/rollout/sof-app02.yaml b/rollout/sof-app02.yaml index af22bea41..1fb50634b 100644 --- a/rollout/sof-app02.yaml +++ b/rollout/sof-app02.yaml @@ -18,14 +18,14 @@ spec: revisionHistoryLimit: 2 selector: matchLabels: - app: rollouts-demo + app: sof-app02 template: metadata: labels: - app: rollouts-demo + app: sof-app02 spec: containers: - - name: rollouts-demo + - name: sof-app02 image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 ports: - name: http From 8306d1aaf65c95c39ef495e3a0159cc26362f475 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 14 Jan 2025 02:37:12 +0200 Subject: [PATCH 142/308] sof-app02 rollout --- rollout/sof-app02.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rollout/sof-app02.yaml b/rollout/sof-app02.yaml index 1fb50634b..e1f40a29c 100644 --- a/rollout/sof-app02.yaml +++ b/rollout/sof-app02.yaml @@ -1,7 +1,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Rollout metadata: - name: rollouts-demo + name: sof-app02 spec: replicas: 5 strategy: From b8bd862f9a296afc28797af6fa493840d13da24d Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 14 Jan 2025 12:58:19 +0200 Subject: [PATCH 143/308] fix new line ending in sof-app02-service --- rollout/sof-app02-service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rollout/sof-app02-service.yaml b/rollout/sof-app02-service.yaml index 49ce525a5..701531c21 100644 --- a/rollout/sof-app02-service.yaml +++ b/rollout/sof-app02-service.yaml @@ -9,4 +9,4 @@ spec: protocol: TCP name: http selector: - app: sof-app02 \ No newline at end of file + app: sof-app02 From df1a724709b9baed10b858b11b6d38eac2bd0f80 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 14 Jan 2025 13:43:00 +0200 Subject: [PATCH 144/308] reorganazi terraform per folder --- .github/workflows/github-actions-demo.yml | 2 +- .gitignore | 2 ++ terraform/argo-install.tf | 23 ------------------- terraform/argo-rollouts/argo-rollouts.tf | 11 +++++++++ terraform/argo-rollouts/provider.tf | 16 +++++++++++++ .../argo-app01.tf} | 10 -------- terraform/argocd/argo-install.tf | 11 +++++++++ terraform/{ => argocd}/provider.tf | 2 +- terraform/config.tf | 0 terraform/kubernetes/namespace.tf | 11 +++++++++ terraform/kubernetes/provider.tf | 10 ++++++++ 11 files changed, 63 insertions(+), 35 deletions(-) delete mode 100644 terraform/argo-install.tf create mode 100644 terraform/argo-rollouts/argo-rollouts.tf create mode 100644 terraform/argo-rollouts/provider.tf rename terraform/{argo-app01.tf.back => argocd/argo-app01.tf} (85%) create mode 100644 terraform/argocd/argo-install.tf rename terraform/{ => argocd}/provider.tf (81%) delete mode 100644 terraform/config.tf create mode 100644 terraform/kubernetes/namespace.tf create mode 100644 terraform/kubernetes/provider.tf diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 28bdd7a32..dda11d573 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -4,7 +4,7 @@ on: push: branches: - main - - dimitardd-281024 +# - dimitardd-281024 env: IMAGE_TAG: dimitardd/dimitar-app02 diff --git a/.gitignore b/.gitignore index a0d3d547f..90c382801 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,8 @@ terraform/.terraform **/.terraform/* terraform/.terraform.lock.hcl terrafrom/*/.terraform.lock.hcl +terraform/**/*/.terraform.lock.hcl +terrafrom/**/.terraform.lock.hcl # Distribution / packaging .Python diff --git a/terraform/argo-install.tf b/terraform/argo-install.tf deleted file mode 100644 index 7e2f8f8e7..000000000 --- a/terraform/argo-install.tf +++ /dev/null @@ -1,23 +0,0 @@ -resource "helm_release" "argocd" { - name = "argo-cd-7-1734333419" - - repository = "http://slo-it-nexus01.pt.playtech.corp/repository/helm-argocd" - chart = "argo-cd" - namespace = "argocd" - create_namespace = true - version = "7.7.15" - - values = [file("values/argocd.yaml")] -} - -resource "helm_release" "argo-rollouts" { - name = "argo-rollouts" - - repository = "http://slo-it-nexus01.pt.playtech.corp/repository/helm-argocd" - chart = "argo-rollouts" - namespace = "argocd" - create_namespace = false - version = "2.38.2" - - values = [file("values/argo-rollouts.yaml")] -} diff --git a/terraform/argo-rollouts/argo-rollouts.tf b/terraform/argo-rollouts/argo-rollouts.tf new file mode 100644 index 000000000..f16e75151 --- /dev/null +++ b/terraform/argo-rollouts/argo-rollouts.tf @@ -0,0 +1,11 @@ +resource "helm_release" "argo-rollouts" { + name = "argo-rollouts" + + repository = "http://slo-it-nexus01.pt.playtech.corp/repository/helm-argocd" + chart = "argo-rollouts" + namespace = "argo-rollouts" + create_namespace = false + version = "2.38.2" + + values = [file("../values/argo-rollouts.yaml")] +} diff --git a/terraform/argo-rollouts/provider.tf b/terraform/argo-rollouts/provider.tf new file mode 100644 index 000000000..a600dbe8c --- /dev/null +++ b/terraform/argo-rollouts/provider.tf @@ -0,0 +1,16 @@ +provider "helm" { + kubernetes { + config_path = "~/.kube/sof-lab03" + } +} + +provider "kubernetes" { + config_path = "~/.kube/sof-lab03" + config_context = "sof-lab03" +} + +terraform { + backend "local" { + path = "~/devops/telerik/terraform-argo-rollouts.tfstate" + } +} diff --git a/terraform/argo-app01.tf.back b/terraform/argocd/argo-app01.tf similarity index 85% rename from terraform/argo-app01.tf.back rename to terraform/argocd/argo-app01.tf index 538e76b54..f0f14a3bb 100644 --- a/terraform/argo-app01.tf.back +++ b/terraform/argocd/argo-app01.tf @@ -14,14 +14,6 @@ resource "argocd_application" "sof-app01" { repo_url = "https://github.com/dimitardd/devops-programme" path = "deployment" target_revision = "dimitardd-281024" - kustomize { - name_prefix = "foo-" - name_suffix = "-bar" - images = ["hashicorp/terraform:light"] - common_labels = { - "this.is.a.common" = "la-bel" - "another.io/one" = "true" - } } } @@ -69,5 +61,3 @@ resource "argocd_application" "sof-app01" { # ] } } -#} - diff --git a/terraform/argocd/argo-install.tf b/terraform/argocd/argo-install.tf new file mode 100644 index 000000000..d844ae121 --- /dev/null +++ b/terraform/argocd/argo-install.tf @@ -0,0 +1,11 @@ +resource "helm_release" "argocd" { + name = "argo-cd-7-1734333419" + + repository = "http://slo-it-nexus01.pt.playtech.corp/repository/helm-argocd" + chart = "argo-cd" + namespace = "argocd" + create_namespace = false + version = "7.7.15" + + values = [file("../values/argocd.yaml")] +} diff --git a/terraform/provider.tf b/terraform/argocd/provider.tf similarity index 81% rename from terraform/provider.tf rename to terraform/argocd/provider.tf index 6125793f6..ee9026ba5 100644 --- a/terraform/provider.tf +++ b/terraform/argocd/provider.tf @@ -17,6 +17,6 @@ resource "kubernetes_namespace" "sof-app01" { terraform { backend "local" { - path = "/Users/dimitar.dimitrov/devops/telerik/terraform.tfstate" + path = "~/devops/telerik/terraform-argocd.tfstate" } } diff --git a/terraform/config.tf b/terraform/config.tf deleted file mode 100644 index e69de29bb..000000000 diff --git a/terraform/kubernetes/namespace.tf b/terraform/kubernetes/namespace.tf new file mode 100644 index 000000000..8dd554708 --- /dev/null +++ b/terraform/kubernetes/namespace.tf @@ -0,0 +1,11 @@ +resource "kubernetes_namespace" "sof-app01" { + metadata { + name = "sof-app01" + } +} + +resource "kubernetes_namespace" "sof-app02" { + metadata { + name = "sof-app02" + } +} diff --git a/terraform/kubernetes/provider.tf b/terraform/kubernetes/provider.tf new file mode 100644 index 000000000..64e78481a --- /dev/null +++ b/terraform/kubernetes/provider.tf @@ -0,0 +1,10 @@ +provider "kubernetes" { + config_path = "~/.kube/sof-lab03" + config_context = "sof-lab03" +} + +terraform { + backend "local" { + path = "~/devops/telerik/terraform-kubernetes.tfstate" + } +} From 83b8da7c8d3996cd5352a7002abe57f4e361ff8c Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 14 Jan 2025 13:52:46 +0200 Subject: [PATCH 145/308] argocd terrafrom provider is desabled for debugging --- terraform/argocd/argo-app01.tf | 63 ---------------------------------- terraform/argocd/provider.tf | 7 +--- 2 files changed, 1 insertion(+), 69 deletions(-) delete mode 100644 terraform/argocd/argo-app01.tf diff --git a/terraform/argocd/argo-app01.tf b/terraform/argocd/argo-app01.tf deleted file mode 100644 index f0f14a3bb..000000000 --- a/terraform/argocd/argo-app01.tf +++ /dev/null @@ -1,63 +0,0 @@ -resource "argocd_application" "sof-app01" { - metadata { - name = "sof-app01" - namespace = "sof-app01" - labels = { - test = "true" - } - } - - spec { - project = "default" - - source { - repo_url = "https://github.com/dimitardd/devops-programme" - path = "deployment" - target_revision = "dimitardd-281024" - } - } - - destination { - server = "https://kubernetes.default.svc" - namespace = "sof-app01" - } - - sync_policy { - automated = { - prune = true - self_heal = true - allow_empty = true - } - # Only available from ArgoCD 1.5.0 onwards - sync_options = ["Validate=false"] - retry { - limit = "5" - backoff = { - duration = "30s" - max_duration = "2m" - factor = "2" - } - } - } - - # ignore_difference { - # group = "apps" - # kind = "Deployment" - # json_pointers = ["/spec/replicas"] - # } - - # ignore_difference { - # group = "apps" - # kind = "StatefulSet" - # name = "someStatefulSet" - # json_pointers = [ - # "/spec/replicas", - # "/spec/template/spec/metadata/labels/bar", - # ] - # Only available from ArgoCD 2.1.0 onwards - # jq_path_expressions = [ - # ".spec.replicas", - # ".spec.template.spec.metadata.labels.bar", - # ] - } -} diff --git a/terraform/argocd/provider.tf b/terraform/argocd/provider.tf index ee9026ba5..18dc8fa00 100644 --- a/terraform/argocd/provider.tf +++ b/terraform/argocd/provider.tf @@ -9,14 +9,9 @@ provider "kubernetes" { config_context = "sof-lab03" } -resource "kubernetes_namespace" "sof-app01" { - metadata { - name = "sof-app01" - } -} - terraform { backend "local" { path = "~/devops/telerik/terraform-argocd.tfstate" } } + From 278323cd26b3146ffe5736184f723f291d5d71b4 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 14 Jan 2025 13:54:56 +0200 Subject: [PATCH 146/308] gitignor files added --- terraform/argocd/argo-app01.tf.back | 64 +++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 terraform/argocd/argo-app01.tf.back diff --git a/terraform/argocd/argo-app01.tf.back b/terraform/argocd/argo-app01.tf.back new file mode 100644 index 000000000..df3551453 --- /dev/null +++ b/terraform/argocd/argo-app01.tf.back @@ -0,0 +1,64 @@ +resource "argocd_application" "sof-app01" { + metadata { + name = "sof-app01" + namespace = "sof-app01" + labels = { + test = "true" + } + } + + spec { + project = "default" + + source { + repo_url = "https://github.com/dimitardd/devops-programme" + path = "deployment" + target_revision = "dimitardd-281024" + } + } + + destination { + server = "https://kubernetes.default.svc" + namespace = "sof-app01" + } + + sync_policy { + automated = { + prune = true + self_heal = true + allow_empty = true + } + # Only available from ArgoCD 1.5.0 onwards + sync_options = ["Validate=false"] + retry { + limit = "5" + backoff = { + duration = "30s" + max_duration = "2m" + factor = "2" + } + } + } + + # ignore_difference { + # group = "apps" + # kind = "Deployment" + # json_pointers = ["/spec/replicas"] + # } + + # ignore_difference { + # group = "apps" + # kind = "StatefulSet" + # name = "someStatefulSet" + # json_pointers = [ + # "/spec/replicas", + # "/spec/template/spec/metadata/labels/bar", + # ] + # Only available from ArgoCD 2.1.0 onwards + # jq_path_expressions = [ + # ".spec.replicas", + # ".spec.template.spec.metadata.labels.bar", + # ] + # } +} + From b2187e89cc69c4941d15e5fedca2b6f1551da034 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 14 Jan 2025 13:55:00 +0200 Subject: [PATCH 147/308] gitignor files --- .gitignore | 1 + .../telerik/terraform-kubernetes.tfstate | 70 +++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 terraform/kubernetes/~/devops/telerik/terraform-kubernetes.tfstate diff --git a/.gitignore b/.gitignore index 90c382801..55e99037b 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ terraform/.terraform.lock.hcl terrafrom/*/.terraform.lock.hcl terraform/**/*/.terraform.lock.hcl terrafrom/**/.terraform.lock.hcl +terrafrom/kubernetes/~/ # Distribution / packaging .Python diff --git a/terraform/kubernetes/~/devops/telerik/terraform-kubernetes.tfstate b/terraform/kubernetes/~/devops/telerik/terraform-kubernetes.tfstate new file mode 100644 index 000000000..7e5c26d89 --- /dev/null +++ b/terraform/kubernetes/~/devops/telerik/terraform-kubernetes.tfstate @@ -0,0 +1,70 @@ +{ + "version": 4, + "terraform_version": "1.10.3", + "serial": 3, + "lineage": "8691916b-f4f7-3b0b-7207-a09e5ae8c716", + "outputs": {}, + "resources": [ + { + "mode": "managed", + "type": "kubernetes_namespace", + "name": "sof-app01", + "provider": "provider[\"registry.terraform.io/hashicorp/kubernetes\"]", + "instances": [ + { + "schema_version": 0, + "attributes": { + "id": "sof-app01", + "metadata": [ + { + "annotations": { + "cattle.io/status": "{\"Conditions\":[{\"Type\":\"ResourceQuotaInit\",\"Status\":\"True\",\"Message\":\"\",\"LastUpdateTime\":\"2025-01-14T11:44:19Z\"}]}" + }, + "generate_name": "", + "generation": 0, + "labels": null, + "name": "sof-app01", + "resource_version": "17709547", + "uid": "76dac381-14a8-4973-9570-48c9bc5a5f48" + } + ], + "timeouts": null, + "wait_for_default_service_account": false + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiZGVsZXRlIjozMDAwMDAwMDAwMDB9fQ==" + } + ] + }, + { + "mode": "managed", + "type": "kubernetes_namespace", + "name": "sof-app02", + "provider": "provider[\"registry.terraform.io/hashicorp/kubernetes\"]", + "instances": [ + { + "schema_version": 0, + "attributes": { + "id": "sof-app02", + "metadata": [ + { + "annotations": null, + "generate_name": "", + "generation": 0, + "labels": null, + "name": "sof-app02", + "resource_version": "17709539", + "uid": "8cbaf2b6-9aeb-4ebf-931f-f3e606577a16" + } + ], + "timeouts": null, + "wait_for_default_service_account": false + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiZGVsZXRlIjozMDAwMDAwMDAwMDB9fQ==" + } + ] + } + ], + "check_results": null +} From 00944e3e8a691bced5780fad063027338a905602 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 14 Jan 2025 14:16:04 +0200 Subject: [PATCH 148/308] fix ~ --- .../telerik/terraform-kubernetes.tfstate | 70 ------------------- 1 file changed, 70 deletions(-) delete mode 100644 terraform/kubernetes/~/devops/telerik/terraform-kubernetes.tfstate diff --git a/terraform/kubernetes/~/devops/telerik/terraform-kubernetes.tfstate b/terraform/kubernetes/~/devops/telerik/terraform-kubernetes.tfstate deleted file mode 100644 index 7e5c26d89..000000000 --- a/terraform/kubernetes/~/devops/telerik/terraform-kubernetes.tfstate +++ /dev/null @@ -1,70 +0,0 @@ -{ - "version": 4, - "terraform_version": "1.10.3", - "serial": 3, - "lineage": "8691916b-f4f7-3b0b-7207-a09e5ae8c716", - "outputs": {}, - "resources": [ - { - "mode": "managed", - "type": "kubernetes_namespace", - "name": "sof-app01", - "provider": "provider[\"registry.terraform.io/hashicorp/kubernetes\"]", - "instances": [ - { - "schema_version": 0, - "attributes": { - "id": "sof-app01", - "metadata": [ - { - "annotations": { - "cattle.io/status": "{\"Conditions\":[{\"Type\":\"ResourceQuotaInit\",\"Status\":\"True\",\"Message\":\"\",\"LastUpdateTime\":\"2025-01-14T11:44:19Z\"}]}" - }, - "generate_name": "", - "generation": 0, - "labels": null, - "name": "sof-app01", - "resource_version": "17709547", - "uid": "76dac381-14a8-4973-9570-48c9bc5a5f48" - } - ], - "timeouts": null, - "wait_for_default_service_account": false - }, - "sensitive_attributes": [], - "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiZGVsZXRlIjozMDAwMDAwMDAwMDB9fQ==" - } - ] - }, - { - "mode": "managed", - "type": "kubernetes_namespace", - "name": "sof-app02", - "provider": "provider[\"registry.terraform.io/hashicorp/kubernetes\"]", - "instances": [ - { - "schema_version": 0, - "attributes": { - "id": "sof-app02", - "metadata": [ - { - "annotations": null, - "generate_name": "", - "generation": 0, - "labels": null, - "name": "sof-app02", - "resource_version": "17709539", - "uid": "8cbaf2b6-9aeb-4ebf-931f-f3e606577a16" - } - ], - "timeouts": null, - "wait_for_default_service_account": false - }, - "sensitive_attributes": [], - "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiZGVsZXRlIjozMDAwMDAwMDAwMDB9fQ==" - } - ] - } - ], - "check_results": null -} From ccd27718d17b644bdd1cae40ac96d2c059157685 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 14 Jan 2025 14:27:37 +0200 Subject: [PATCH 149/308] terrafrom state file location fix --- terraform/argo-rollouts/provider.tf | 2 +- terraform/argocd/provider.tf | 2 +- terraform/kubernetes/namespace.tf | 12 ++++++++++++ terraform/kubernetes/provider.tf | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/terraform/argo-rollouts/provider.tf b/terraform/argo-rollouts/provider.tf index a600dbe8c..7ad472ba8 100644 --- a/terraform/argo-rollouts/provider.tf +++ b/terraform/argo-rollouts/provider.tf @@ -11,6 +11,6 @@ provider "kubernetes" { terraform { backend "local" { - path = "~/devops/telerik/terraform-argo-rollouts.tfstate" + path = "/Users/dimitar.dimitrov/devops/telerik/terraform-argo-rollouts.tfstate" } } diff --git a/terraform/argocd/provider.tf b/terraform/argocd/provider.tf index 18dc8fa00..a4bfbdf28 100644 --- a/terraform/argocd/provider.tf +++ b/terraform/argocd/provider.tf @@ -11,7 +11,7 @@ provider "kubernetes" { terraform { backend "local" { - path = "~/devops/telerik/terraform-argocd.tfstate" + path = "/Users/dimitar.dimitrov/devops/telerik/terraform-argocd.tfstate" } } diff --git a/terraform/kubernetes/namespace.tf b/terraform/kubernetes/namespace.tf index 8dd554708..7161b9c66 100644 --- a/terraform/kubernetes/namespace.tf +++ b/terraform/kubernetes/namespace.tf @@ -9,3 +9,15 @@ resource "kubernetes_namespace" "sof-app02" { name = "sof-app02" } } + +resource "kubernetes_namespace" "argocd" { + metadata { + name = "argocd" + } +} + +resource "kubernetes_namespace" "argo-rollouts" { + metadata { + name = "argo-rollouts" + } +} \ No newline at end of file diff --git a/terraform/kubernetes/provider.tf b/terraform/kubernetes/provider.tf index 64e78481a..198ec822c 100644 --- a/terraform/kubernetes/provider.tf +++ b/terraform/kubernetes/provider.tf @@ -5,6 +5,6 @@ provider "kubernetes" { terraform { backend "local" { - path = "~/devops/telerik/terraform-kubernetes.tfstate" + path = "/Users/dimitar.dimitrov/devops/telerik/terraform-kubernetes.tfstate" } } From e25ca6756e565a3f357ef31368765306c0b40a7a Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 14 Jan 2025 14:29:04 +0200 Subject: [PATCH 150/308] new empty line on end of files --- terraform/argocd/argo-app01.tf.back | 1 - terraform/kubernetes/namespace.tf | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/terraform/argocd/argo-app01.tf.back b/terraform/argocd/argo-app01.tf.back index df3551453..a0f3180fb 100644 --- a/terraform/argocd/argo-app01.tf.back +++ b/terraform/argocd/argo-app01.tf.back @@ -61,4 +61,3 @@ resource "argocd_application" "sof-app01" { # ] # } } - diff --git a/terraform/kubernetes/namespace.tf b/terraform/kubernetes/namespace.tf index 7161b9c66..6f740bc05 100644 --- a/terraform/kubernetes/namespace.tf +++ b/terraform/kubernetes/namespace.tf @@ -20,4 +20,4 @@ resource "kubernetes_namespace" "argo-rollouts" { metadata { name = "argo-rollouts" } -} \ No newline at end of file +} From 31576690bacb89de3d3aa3b544ca8c0031836077 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 14 Jan 2025 23:18:54 +0200 Subject: [PATCH 151/308] terraform configuration for application in argocd sof-app01 --- terraform/argo-rollouts/argo-rollouts.tf | 1 + terraform/argocd/argo-app01.tf | 23 +++++++++ terraform/argocd/argo-app01.tf.back | 63 ------------------------ terraform/argocd/argo-install.tf | 1 + terraform/argocd/provider.tf | 19 ++++++- terraform/argocd/variables.tf | 4 ++ terraform/kubernetes/namespace.tf | 4 ++ 7 files changed, 51 insertions(+), 64 deletions(-) create mode 100644 terraform/argocd/argo-app01.tf delete mode 100644 terraform/argocd/argo-app01.tf.back create mode 100644 terraform/argocd/variables.tf diff --git a/terraform/argo-rollouts/argo-rollouts.tf b/terraform/argo-rollouts/argo-rollouts.tf index f16e75151..401a30a02 100644 --- a/terraform/argo-rollouts/argo-rollouts.tf +++ b/terraform/argo-rollouts/argo-rollouts.tf @@ -1,4 +1,5 @@ resource "helm_release" "argo-rollouts" { + description = "Deplayte Argo Rollouts" name = "argo-rollouts" repository = "http://slo-it-nexus01.pt.playtech.corp/repository/helm-argocd" diff --git a/terraform/argocd/argo-app01.tf b/terraform/argocd/argo-app01.tf new file mode 100644 index 000000000..56226dd14 --- /dev/null +++ b/terraform/argocd/argo-app01.tf @@ -0,0 +1,23 @@ +resource "argocd_application" "sof-app01" { + description = "Add Application sof-app01 in ArgoCD" + metadata { + name = "sof-app01" + } + + spec { + project = "default" + + destination { + server = "https://kubernetes.default.svc" + namespace = "sof-app01" + } + + source { + repo_url = "https://github.com/dimitardd/devops-programme" + path = "deployment" + target_revision = "dimitardd-281024" + # Uncomment and add if required: + # repo = "https://github.com/dimitardd/devops-programme" + } + } +} diff --git a/terraform/argocd/argo-app01.tf.back b/terraform/argocd/argo-app01.tf.back deleted file mode 100644 index a0f3180fb..000000000 --- a/terraform/argocd/argo-app01.tf.back +++ /dev/null @@ -1,63 +0,0 @@ -resource "argocd_application" "sof-app01" { - metadata { - name = "sof-app01" - namespace = "sof-app01" - labels = { - test = "true" - } - } - - spec { - project = "default" - - source { - repo_url = "https://github.com/dimitardd/devops-programme" - path = "deployment" - target_revision = "dimitardd-281024" - } - } - - destination { - server = "https://kubernetes.default.svc" - namespace = "sof-app01" - } - - sync_policy { - automated = { - prune = true - self_heal = true - allow_empty = true - } - # Only available from ArgoCD 1.5.0 onwards - sync_options = ["Validate=false"] - retry { - limit = "5" - backoff = { - duration = "30s" - max_duration = "2m" - factor = "2" - } - } - } - - # ignore_difference { - # group = "apps" - # kind = "Deployment" - # json_pointers = ["/spec/replicas"] - # } - - # ignore_difference { - # group = "apps" - # kind = "StatefulSet" - # name = "someStatefulSet" - # json_pointers = [ - # "/spec/replicas", - # "/spec/template/spec/metadata/labels/bar", - # ] - # Only available from ArgoCD 2.1.0 onwards - # jq_path_expressions = [ - # ".spec.replicas", - # ".spec.template.spec.metadata.labels.bar", - # ] - # } -} diff --git a/terraform/argocd/argo-install.tf b/terraform/argocd/argo-install.tf index d844ae121..673254933 100644 --- a/terraform/argocd/argo-install.tf +++ b/terraform/argocd/argo-install.tf @@ -1,4 +1,5 @@ resource "helm_release" "argocd" { + destination = "Deplay ArgoCD" name = "argo-cd-7-1734333419" repository = "http://slo-it-nexus01.pt.playtech.corp/repository/helm-argocd" diff --git a/terraform/argocd/provider.tf b/terraform/argocd/provider.tf index a4bfbdf28..fadeca30d 100644 --- a/terraform/argocd/provider.tf +++ b/terraform/argocd/provider.tf @@ -1,3 +1,13 @@ +terraform { + required_version = ">= 1.10" + required_providers { + argocd = { + source = "argoproj-labs/argocd" + version = "7.3.0" + } + } +} + provider "helm" { kubernetes { config_path = "~/.kube/sof-lab03" @@ -9,9 +19,16 @@ provider "kubernetes" { config_context = "sof-lab03" } +provider "argocd" { + server_addr = "localhost:8080" + plain_text = true + insecure = true + username = "admin" + password = var.password +} + terraform { backend "local" { path = "/Users/dimitar.dimitrov/devops/telerik/terraform-argocd.tfstate" } } - diff --git a/terraform/argocd/variables.tf b/terraform/argocd/variables.tf new file mode 100644 index 000000000..207ec7ed9 --- /dev/null +++ b/terraform/argocd/variables.tf @@ -0,0 +1,4 @@ +variable "password" { + description = "The password for ArgoCD" + type = string +} \ No newline at end of file diff --git a/terraform/kubernetes/namespace.tf b/terraform/kubernetes/namespace.tf index 6f740bc05..0bc8d5e81 100644 --- a/terraform/kubernetes/namespace.tf +++ b/terraform/kubernetes/namespace.tf @@ -1,22 +1,26 @@ resource "kubernetes_namespace" "sof-app01" { + description = "Create Namespace sof-app01" metadata { name = "sof-app01" } } resource "kubernetes_namespace" "sof-app02" { + description = "Create Namespace sof-app02" metadata { name = "sof-app02" } } resource "kubernetes_namespace" "argocd" { + description = "Create Namespace argocd" metadata { name = "argocd" } } resource "kubernetes_namespace" "argo-rollouts" { + description = "Create Namespace argo-rollouts" metadata { name = "argo-rollouts" } From c82f7829642eee0f70daaf1296b288d09d993619 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 14 Jan 2025 23:23:29 +0200 Subject: [PATCH 152/308] remove description as it is not supported --- terraform/argo-rollouts/argo-rollouts.tf | 1 - terraform/argocd/argo-app01.tf | 1 - terraform/argocd/argo-install.tf | 1 - terraform/kubernetes/namespace.tf | 4 ---- 4 files changed, 7 deletions(-) diff --git a/terraform/argo-rollouts/argo-rollouts.tf b/terraform/argo-rollouts/argo-rollouts.tf index 401a30a02..f16e75151 100644 --- a/terraform/argo-rollouts/argo-rollouts.tf +++ b/terraform/argo-rollouts/argo-rollouts.tf @@ -1,5 +1,4 @@ resource "helm_release" "argo-rollouts" { - description = "Deplayte Argo Rollouts" name = "argo-rollouts" repository = "http://slo-it-nexus01.pt.playtech.corp/repository/helm-argocd" diff --git a/terraform/argocd/argo-app01.tf b/terraform/argocd/argo-app01.tf index 56226dd14..5a3f18036 100644 --- a/terraform/argocd/argo-app01.tf +++ b/terraform/argocd/argo-app01.tf @@ -1,5 +1,4 @@ resource "argocd_application" "sof-app01" { - description = "Add Application sof-app01 in ArgoCD" metadata { name = "sof-app01" } diff --git a/terraform/argocd/argo-install.tf b/terraform/argocd/argo-install.tf index 673254933..d844ae121 100644 --- a/terraform/argocd/argo-install.tf +++ b/terraform/argocd/argo-install.tf @@ -1,5 +1,4 @@ resource "helm_release" "argocd" { - destination = "Deplay ArgoCD" name = "argo-cd-7-1734333419" repository = "http://slo-it-nexus01.pt.playtech.corp/repository/helm-argocd" diff --git a/terraform/kubernetes/namespace.tf b/terraform/kubernetes/namespace.tf index 0bc8d5e81..6f740bc05 100644 --- a/terraform/kubernetes/namespace.tf +++ b/terraform/kubernetes/namespace.tf @@ -1,26 +1,22 @@ resource "kubernetes_namespace" "sof-app01" { - description = "Create Namespace sof-app01" metadata { name = "sof-app01" } } resource "kubernetes_namespace" "sof-app02" { - description = "Create Namespace sof-app02" metadata { name = "sof-app02" } } resource "kubernetes_namespace" "argocd" { - description = "Create Namespace argocd" metadata { name = "argocd" } } resource "kubernetes_namespace" "argo-rollouts" { - description = "Create Namespace argo-rollouts" metadata { name = "argo-rollouts" } From 51970c559c7e36b4b9428f1d34a232fc09649ad3 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 14 Jan 2025 23:39:23 +0200 Subject: [PATCH 153/308] separates terraform argocd application sof-app01 --- terraform/argocd/provider.tf | 18 ---------- terraform/{argocd => sof-app01}/argo-app01.tf | 0 terraform/sof-app01/provider.tf | 34 +++++++++++++++++++ terraform/{argocd => sof-app01}/variables.tf | 2 +- 4 files changed, 35 insertions(+), 19 deletions(-) rename terraform/{argocd => sof-app01}/argo-app01.tf (100%) create mode 100644 terraform/sof-app01/provider.tf rename terraform/{argocd => sof-app01}/variables.tf (97%) diff --git a/terraform/argocd/provider.tf b/terraform/argocd/provider.tf index fadeca30d..bb50b2388 100644 --- a/terraform/argocd/provider.tf +++ b/terraform/argocd/provider.tf @@ -1,13 +1,3 @@ -terraform { - required_version = ">= 1.10" - required_providers { - argocd = { - source = "argoproj-labs/argocd" - version = "7.3.0" - } - } -} - provider "helm" { kubernetes { config_path = "~/.kube/sof-lab03" @@ -19,14 +9,6 @@ provider "kubernetes" { config_context = "sof-lab03" } -provider "argocd" { - server_addr = "localhost:8080" - plain_text = true - insecure = true - username = "admin" - password = var.password -} - terraform { backend "local" { path = "/Users/dimitar.dimitrov/devops/telerik/terraform-argocd.tfstate" diff --git a/terraform/argocd/argo-app01.tf b/terraform/sof-app01/argo-app01.tf similarity index 100% rename from terraform/argocd/argo-app01.tf rename to terraform/sof-app01/argo-app01.tf diff --git a/terraform/sof-app01/provider.tf b/terraform/sof-app01/provider.tf new file mode 100644 index 000000000..1b3e3aec0 --- /dev/null +++ b/terraform/sof-app01/provider.tf @@ -0,0 +1,34 @@ +terraform { + required_version = ">= 1.10" + required_providers { + argocd = { + source = "argoproj-labs/argocd" + version = "7.3.0" + } + } +} + +provider "helm" { + kubernetes { + config_path = "~/.kube/sof-lab03" + } +} + +provider "kubernetes" { + config_path = "~/.kube/sof-lab03" + config_context = "sof-lab03" +} + +provider "argocd" { + server_addr = "localhost:8080" + plain_text = true + insecure = true + username = "admin" + password = var.password +} + +terraform { + backend "local" { + path = "/Users/dimitar.dimitrov/devops/telerik/terraform-argocd-sof-app01.tfstate" + } +} diff --git a/terraform/argocd/variables.tf b/terraform/sof-app01/variables.tf similarity index 97% rename from terraform/argocd/variables.tf rename to terraform/sof-app01/variables.tf index 207ec7ed9..fd17de099 100644 --- a/terraform/argocd/variables.tf +++ b/terraform/sof-app01/variables.tf @@ -1,4 +1,4 @@ variable "password" { description = "The password for ArgoCD" type = string -} \ No newline at end of file +} From bf53dc3fe71c54f412dfa03cd5d51a0ae56fad5c Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 14 Jan 2025 23:57:38 +0200 Subject: [PATCH 154/308] change sof-app01 image to blue --- deployment/sof-app01.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 84d17ae3a..90595bdd5 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -17,6 +17,7 @@ spec: spec: containers: - name: sof-app01 - image: dimitardd/dimitar-app02:4d8f5c0aba5f446b4822a1b79c561c3e18850cba +# image: dimitardd/dimitar-app02:4d8f5c0aba5f446b4822a1b79c561c3e18850cba + image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 ports: - containerPort: 3000 From ffc5e94cae4bff6ccaa85da7d11e45268c00927c Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Wed, 15 Jan 2025 00:10:46 +0200 Subject: [PATCH 155/308] update image in sof-app01 --- rollout/sof-app02.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rollout/sof-app02.yaml b/rollout/sof-app02.yaml index e1f40a29c..1b333ce58 100644 --- a/rollout/sof-app02.yaml +++ b/rollout/sof-app02.yaml @@ -26,7 +26,8 @@ spec: spec: containers: - name: sof-app02 - image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 +# image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 + image: dimitardd/dimitar-app02:4d8f5c0aba5f446b4822a1b79c561c3e18850cba ports: - name: http containerPort: 3000 From 68abd1e90f4e5a605dbc4577c09cf89ce7a456e3 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Wed, 15 Jan 2025 00:15:34 +0200 Subject: [PATCH 156/308] enable github action for branch dimitardd-281024 --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index dda11d573..28bdd7a32 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -4,7 +4,7 @@ on: push: branches: - main -# - dimitardd-281024 + - dimitardd-281024 env: IMAGE_TAG: dimitardd/dimitar-app02 From 7310526aa83946836c96d0c69c66c4f99d880602 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Wed, 15 Jan 2025 11:31:58 +0200 Subject: [PATCH 157/308] sof-app01 cert --- deployment/sof-app01-secret.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 deployment/sof-app01-secret.yaml diff --git a/deployment/sof-app01-secret.yaml b/deployment/sof-app01-secret.yaml new file mode 100644 index 000000000..5580757ec --- /dev/null +++ b/deployment/sof-app01-secret.yaml @@ -0,0 +1,9 @@ +apiVersion: v1 +kind: Secret +metadata: + name: sof-app01-tls + namespace: sof-app01 +type: kubernetes.io/tls +data: + tls.crt: QmFnIEF0dHJpYnV0ZXMKICAgIGxvY2FsS2V5SUQ6IDAxIDAwIDAwIDAwIAogICAgZnJpZW5kbHlO YW1lOiBzb2YtYXBwMDEKc3ViamVjdD1DTiA9IHNvZi1hcHAwMS5wdC5wbGF5dGVjaC5jb3JwLCBD TiA9IHNvZi1hcHAwMQppc3N1ZXI9REMgPSBjb3JwLCBEQyA9IHBsYXl0ZWNoLCBEQyA9IHB0LCBD TiA9IFBUIEdsb2JhbCBDQQotLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KTUlJR3B6Q0NCWStn QXdJQkFnSVRNZ0JPMVZpTzMvSjc5bmQxL3dBQ0FFN1ZXREFOQmdrcWhraUc5dzBCQVFzRgpBREJi TVJRd0VnWUtDWkltaVpQeUxHUUJHUllFWTI5eWNERVlNQllHQ2dtU0pvbVQ4aXhrQVJrV0NIQnNZ WGwwClpXTm9NUkl3RUFZS0NaSW1pWlB5TEdRQkdSWUNjSFF4RlRBVEJnTlZCQU1UREZCVUlFZHNi MkpoYkNCRFFUQWUKRncweU5UQXhNVFV3T0RFd01qTmFGdzB5TnpBeE1UVXdPREV3TWpOYU1Ea3hJ ekFoQmdOVkJBTVRHbk52WmkxaApjSEF3TVM1d2RDNXdiR0Y1ZEdWamFDNWpiM0p3TVJJd0VBWURW UVFERXdsemIyWXRZWEJ3TURFd2dnRWlNQTBHCkNTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtB b0lCQVFDdERWaThTNGhHMmlldmZSNVVQU3UwOUphT1FBUmoKSGhraXBFQ2wxdnNSTGptMlg0UVdG cDNXajBmOVhuejR0L3NUaDMzUEpVUWhpNkFJNUxSaHA5WWZhaVAwWVBHbgpLOURpVkJCc09EQ2pU LzRFYklab0hobGp2Ym4wQWo2QkRHQW1ETFkzUGNBRVZkTmxKb1lLSnRwd2FkRFJwNjJyCklQOTNG bHhNMnVZYzM1YTFXWkoxWG5MUDV1NXRvOUppZVdxTWt6bGM5QnJYSm5YcGEzaVQ3bCtudTlWNUU5 cWQKRkw4ZjZQc0dKWi9kZ2RQTDE3eHNyNFlERWhNMm42Qi8zRmVNaFpvVDB1dlp4STEzRk1GbnRJ ZFhuWHh2aEFQRwplTHBZWmZlQjNKWWthSSsvZHQrOW5vNndrNFNXL3JHZjZWc1Rjbkp3TklpS2My MFY4dWRtVDBFWkFnTUJBQUdqCmdnT0VNSUlEZ0RBOUJna3JCZ0VFQVlJM0ZRY0VNREF1QmlZckJn RUVBWUkzRlFpRThKUUxoK1MwZllYMWpUajMKcEUyQng1UnlnUnFHNDYwRmhiL0ZUZ0lCWkFJQklE QVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBVEFMQmdOVgpIUThFQkFNQ0JMQXdHd1lKS3dZQkJB R0NOeFVLQkE0d0REQUtCZ2dyQmdFRkJRY0RBVEFkQmdOVkhRNEVGZ1FVClZiWWFLOVQwMk5YTzcv MXlwc3ZmYTZxazZROHdNQVlEVlIwUkJDa3dKNElhYzI5bUxXRndjREF4TG5CMExuQnMKWVhsMFpX Tm9MbU52Y25DQ0NYTnZaaTFoY0hBd01UQWZCZ05WSFNNRUdEQVdnQlJRQnJXaU1yWloyb2tUSzg0 RwpkVUZRMGtMRlVEQ0NBVnNHQTFVZEh3U0NBVkl3Z2dGT01JSUJTcUNDQVVhZ2dnRkNob0c3YkdS aGNEb3ZMeTlEClRqMVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxFTk9QWFJ5ZEMxcGJqQXdPU3hEVGox RFJGQXNRMDQ5VUhWaWJHbGoKSlRJd1MyVjVKVEl3VTJWeWRtbGpaWE1zUTA0OVUyVnlkbWxqWlhN c1EwNDlRMjl1Wm1sbmRYSmhkR2x2Yml4RQpRejF3YkdGNWRHVmphQ3hFUXoxamIzSndQMk5sY25S cFptbGpZWFJsVW1WMmIyTmhkR2x2Ymt4cGMzUS9ZbUZ6ClpUOXZZbXBsWTNSRGJHRnpjejFqVWt4 RWFYTjBjbWxpZFhScGIyNVFiMmx1ZElaQmFIUjBjRG92TDNSeWRDMXAKYmpBd09TNXdkQzV3YkdG NWRHVmphQzVqYjNKd0wwTmxjblJGYm5KdmJHd3ZVRlFsTWpCSGJHOWlZV3dsTWpCRApRUzVqY215 R1AyaDBkSEE2THk5d2RHZHNiMkpoYkdOaExuQnNZWGwwWldOb0xtTnZjbkF2UTJWeWRFVnVjbTlz CmJDOVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxtTnliRENDQVMwR0NDc0dBUVVGQndFQkJJSUJIekND QVJzd2diRUcKQ0NzR0FRVUZCekFDaG9Ha2JHUmhjRG92THk5RFRqMVFWQ1V5TUVkc2IySmhiQ1V5 TUVOQkxFTk9QVUZKUVN4RApUajFRZFdKc2FXTWxNakJMWlhrbE1qQlRaWEoyYVdObGN5eERUajFU WlhKMmFXTmxjeXhEVGoxRGIyNW1hV2QxCmNtRjBhVzl1TEVSRFBYQnNZWGwwWldOb0xFUkRQV052 Y25BL1kwRkRaWEowYVdacFkyRjBaVDlpWVhObFAyOWkKYW1WamRFTnNZWE56UFdObGNuUnBabWxq WVhScGIyNUJkWFJvYjNKcGRIa3daUVlJS3dZQkJRVUhNQUtHV1doMApkSEE2THk5amNtd3RhVzUw TG5Cc1lYbDBaV05vTG1OdmJTOURaWEowUlc1eWIyeHNMM1J5ZEMxcGJqQXdPUzV3CmRDNXdiR0Y1 ZEdWamFDNWpiM0p3WDFCVUpUSXdSMnh2WW1Gc0pUSXdRMEVvTWlrdVkzSjBNQTBHQ1NxR1NJYjMK RFFFQkN3VUFBNElCQVFCYXlVWkF2Y1lBNld4S2tOakdNOGNRam42U3daZmdicFQ0YkViZWhQN1li UWlrRVZSTApCbFpxeGZBUUVBWGtycUFpNnNDekJFN0hjS3I5VzBXbWJlZkdubVl3RkN5MzB1a0Nh aXFVdTNRM05Uelh5RVJMCjVON29BakRLeWVQSStXUWVqcEhIWnE2am5RNHJhVUhhb1ZPQklRN1Jz S0pqbnZOYW1RSlU0S0dBNEVQeTh4cnUKcGMxdkJ5V0Y4UG85enpFV25mbUlDdmxwQzhyYjBNSlNq TGJZK0RseXQwYm5vUnhHMUNPSlMrVkJENlpvdWNEeQpLT0gzYVNrVTdON1FTZk5naFk1b2lVMzNU NkdYY3k0RElXcE1RUEc3ZGJkSGo3UW1jZExnS2VPWEc3eHZtc1ZoCjRxUHdDZjNhSmZnc1JDM1o1 MzdsTWJvc0tCeFlNSWFnQVpocwotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== + tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2Z0lCQURBTkJna3Foa2lHOXcwQkFRRUZB QVNDQktnd2dnU2tBZ0VBQW9JQkFRQ3REVmk4UzRoRzJpZXYKZlI1VVBTdTA5SmFPUUFSakhoa2lw RUNsMXZzUkxqbTJYNFFXRnAzV2owZjlYbno0dC9zVGgzM1BKVVFoaTZBSQo1TFJocDlZZmFpUDBZ UEduSzlEaVZCQnNPRENqVC80RWJJWm9IaGxqdmJuMEFqNkJER0FtRExZM1BjQUVWZE5sCkpvWUtK dHB3YWREUnA2MnJJUDkzRmx4TTJ1WWMzNWExV1pKMVhuTFA1dTV0bzlKaWVXcU1remxjOUJyWEpu WHAKYTNpVDdsK251OVY1RTlxZEZMOGY2UHNHSlovZGdkUEwxN3hzcjRZREVoTTJuNkIvM0ZlTWha b1QwdXZaeEkxMwpGTUZudElkWG5YeHZoQVBHZUxwWVpmZUIzSllrYUkrL2R0KzlubzZ3azRTVy9y R2Y2VnNUY25Kd05JaUtjMjBWCjh1ZG1UMEVaQWdNQkFBRUNnZ0VBT2pjMk5jbjNJMWE2YVFmZlR4 bHcvYVFXamU0dFM2YlJiOXp2dnBxT3haM1cKWG1yTmhaekFKbkQzRjk1VWpsdGVSSmlkRXpXSE1Q M0dyWmM2czJ1QjFmbWY5Tk0wR0RmZVFuVmpQUFMrTUFKMgpBc2o3Z2tVMTUxN3BFcFE2c0xFWUcx VEZhOW9ESWJJNXRscDZWeW53N0VZOHNIc0hLbjJrVTB5YmFtTnRiQ0toCjdHbTF2WFBiSE03a29H dndERmJwQ0dRZlNEUWdyc3BqTFdDRHBzN2lkV2xLS2NLSWdpdFFuTmREVlJlYVNjR1YKMU1jWkhC Tlh2T1FkbDljM1NaUjdtUTRZY3dFb3ZZSkI3UGJLWTRra1p3WWRObVZ1cE1ON0cvaFpZWWtLd1pV VApTL0ppUTdUaW1FYjJ0UTRQM3pESDdBeEFHcnNLT1ZDMzNtN044VElEVFFLQmdRRE9LU29zRHdz UUxucDB4dXRpClRSbkphenB1aloyR3piRVNJV2FTeFA4N1ZOMS82YmViaGRjZ0FYc2p5aU9NUWk5 M2k4WWtkaDdTejhVVGxnZmEKSklnYUVKaTA2R01DdngrY1dZTUZ5MU5pWW1YN3JuS1Q4by9rZm0w OUJQemRjNjUyWVErd2s2THFwRjZCeG1uNQo0MEpLTlRoM2ZtZHEwZ3pPVkRMbG1zUW8zd0tCZ1FE VzR5ajBMTWlWOVNHaU4rZWlJei8xMnpZVDFNcDJnbndvCjRPM3o4bzFiblZBbjJEL21Sd1k1c0tx ZEYxbm02T0IwclVERnpiWGszRDB3aVNQR0hZTUZaTjVPSXhIY0kwaUkKTTlmeG44Q1VtZC9TUXVt a3dEL3NhMGp2NFFxNkxsVEVOWmVYSWdFTVhURHlkeW02ektoSXB1Z3l3dkpwdHIyMwpYeUFRcUdz OUJ3S0JnR1ljODV1QkUveSsyTDZ3ckhRek5qdVMxZzFlTFpGUW5vMFphQ0g0VzJjNjRMOXp0eExj ClZ6S3VLUjBRQ1UxMmx1WkNvREQ5Sk1WTVRoUW1jdHMwendrQ0FYRlJ6WURWdzhXQWZLcEpESk1s bzlmbWp6QUMKckEwRUpmMWNWQmNvTGxqS09LaEFhQ2lLbzVqcCt5SGYwN3pINGFFbVJma2Q4MlBi UnA1OWF2M0hBb0dCQU1oeQplNGhSb2dabjlDakt0MUtDU1M2QWZsQS9aV0RvMVFLWTFyNkJHaVZF ZURuQ3VkQ0huaUlBVHhaY2F1cy9mZWk0Cm1Ed3JhS29FV3p2RUlVK3p4YjBwVzBsTjQySVNzNTBC cDBUbnZRK2cvYXkzNkJSYmxRVm5DbEZnL2Myd1hEZnUKdWVvcnVRaWNnWVViYlJ5bnZhNlBxdmQy N0FONmlEdmVDeDRlekhIUEFvR0JBTVowdWhUWVdGMHJ3alZDc0t5cAp3OWJpd3A1dTBjR3VxOE9j S1BsSnEyL1g3d0hpR0ZpSVJxV2RndWk1Um8ydmUyTkNkS0oyVE5VYWd1a0NPSjduCnBVeE9LNXFh ZmZPWVhWWG1tbnRZejAzQWFSSElUWWx0TXpMUUVHbDBwdHU4Zm9zb0FQR0hXRWdHd1RsTFNRU1gK WVNDWVIyL3JxRGRpaVlZWlFWR3pjeVJDCi0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K From fb7abbe79fe7ec4744017df0c126e28677ade3f9 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Wed, 15 Jan 2025 11:45:52 +0200 Subject: [PATCH 158/308] sof-app01-tls secret name --- deployment/sof-app01-ingress.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deployment/sof-app01-ingress.yaml b/deployment/sof-app01-ingress.yaml index 5e4c224f4..b64ac3cfc 100644 --- a/deployment/sof-app01-ingress.yaml +++ b/deployment/sof-app01-ingress.yaml @@ -17,3 +17,7 @@ spec: name: sof-app01-service port: number: 3000 +tls: + - hosts: + - sof-app01.pt.playtech.corp + secretName: sof-app01-tls From bd12a27d60053c603ba9fb76f7a83ce92dcb9e0c Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Wed, 15 Jan 2025 12:00:56 +0200 Subject: [PATCH 159/308] sof-app01-tls fir crt and key base64 --- deployment/sof-app01-secret.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/sof-app01-secret.yaml b/deployment/sof-app01-secret.yaml index 5580757ec..5c54ab12a 100644 --- a/deployment/sof-app01-secret.yaml +++ b/deployment/sof-app01-secret.yaml @@ -5,5 +5,5 @@ metadata: namespace: sof-app01 type: kubernetes.io/tls data: - tls.crt: QmFnIEF0dHJpYnV0ZXMKICAgIGxvY2FsS2V5SUQ6IDAxIDAwIDAwIDAwIAogICAgZnJpZW5kbHlO YW1lOiBzb2YtYXBwMDEKc3ViamVjdD1DTiA9IHNvZi1hcHAwMS5wdC5wbGF5dGVjaC5jb3JwLCBD TiA9IHNvZi1hcHAwMQppc3N1ZXI9REMgPSBjb3JwLCBEQyA9IHBsYXl0ZWNoLCBEQyA9IHB0LCBD TiA9IFBUIEdsb2JhbCBDQQotLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KTUlJR3B6Q0NCWStn QXdJQkFnSVRNZ0JPMVZpTzMvSjc5bmQxL3dBQ0FFN1ZXREFOQmdrcWhraUc5dzBCQVFzRgpBREJi TVJRd0VnWUtDWkltaVpQeUxHUUJHUllFWTI5eWNERVlNQllHQ2dtU0pvbVQ4aXhrQVJrV0NIQnNZ WGwwClpXTm9NUkl3RUFZS0NaSW1pWlB5TEdRQkdSWUNjSFF4RlRBVEJnTlZCQU1UREZCVUlFZHNi MkpoYkNCRFFUQWUKRncweU5UQXhNVFV3T0RFd01qTmFGdzB5TnpBeE1UVXdPREV3TWpOYU1Ea3hJ ekFoQmdOVkJBTVRHbk52WmkxaApjSEF3TVM1d2RDNXdiR0Y1ZEdWamFDNWpiM0p3TVJJd0VBWURW UVFERXdsemIyWXRZWEJ3TURFd2dnRWlNQTBHCkNTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtB b0lCQVFDdERWaThTNGhHMmlldmZSNVVQU3UwOUphT1FBUmoKSGhraXBFQ2wxdnNSTGptMlg0UVdG cDNXajBmOVhuejR0L3NUaDMzUEpVUWhpNkFJNUxSaHA5WWZhaVAwWVBHbgpLOURpVkJCc09EQ2pU LzRFYklab0hobGp2Ym4wQWo2QkRHQW1ETFkzUGNBRVZkTmxKb1lLSnRwd2FkRFJwNjJyCklQOTNG bHhNMnVZYzM1YTFXWkoxWG5MUDV1NXRvOUppZVdxTWt6bGM5QnJYSm5YcGEzaVQ3bCtudTlWNUU5 cWQKRkw4ZjZQc0dKWi9kZ2RQTDE3eHNyNFlERWhNMm42Qi8zRmVNaFpvVDB1dlp4STEzRk1GbnRJ ZFhuWHh2aEFQRwplTHBZWmZlQjNKWWthSSsvZHQrOW5vNndrNFNXL3JHZjZWc1Rjbkp3TklpS2My MFY4dWRtVDBFWkFnTUJBQUdqCmdnT0VNSUlEZ0RBOUJna3JCZ0VFQVlJM0ZRY0VNREF1QmlZckJn RUVBWUkzRlFpRThKUUxoK1MwZllYMWpUajMKcEUyQng1UnlnUnFHNDYwRmhiL0ZUZ0lCWkFJQklE QVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBVEFMQmdOVgpIUThFQkFNQ0JMQXdHd1lKS3dZQkJB R0NOeFVLQkE0d0REQUtCZ2dyQmdFRkJRY0RBVEFkQmdOVkhRNEVGZ1FVClZiWWFLOVQwMk5YTzcv MXlwc3ZmYTZxazZROHdNQVlEVlIwUkJDa3dKNElhYzI5bUxXRndjREF4TG5CMExuQnMKWVhsMFpX Tm9MbU52Y25DQ0NYTnZaaTFoY0hBd01UQWZCZ05WSFNNRUdEQVdnQlJRQnJXaU1yWloyb2tUSzg0 RwpkVUZRMGtMRlVEQ0NBVnNHQTFVZEh3U0NBVkl3Z2dGT01JSUJTcUNDQVVhZ2dnRkNob0c3YkdS aGNEb3ZMeTlEClRqMVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxFTk9QWFJ5ZEMxcGJqQXdPU3hEVGox RFJGQXNRMDQ5VUhWaWJHbGoKSlRJd1MyVjVKVEl3VTJWeWRtbGpaWE1zUTA0OVUyVnlkbWxqWlhN c1EwNDlRMjl1Wm1sbmRYSmhkR2x2Yml4RQpRejF3YkdGNWRHVmphQ3hFUXoxamIzSndQMk5sY25S cFptbGpZWFJsVW1WMmIyTmhkR2x2Ymt4cGMzUS9ZbUZ6ClpUOXZZbXBsWTNSRGJHRnpjejFqVWt4 RWFYTjBjbWxpZFhScGIyNVFiMmx1ZElaQmFIUjBjRG92TDNSeWRDMXAKYmpBd09TNXdkQzV3YkdG NWRHVmphQzVqYjNKd0wwTmxjblJGYm5KdmJHd3ZVRlFsTWpCSGJHOWlZV3dsTWpCRApRUzVqY215 R1AyaDBkSEE2THk5d2RHZHNiMkpoYkdOaExuQnNZWGwwWldOb0xtTnZjbkF2UTJWeWRFVnVjbTlz CmJDOVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxtTnliRENDQVMwR0NDc0dBUVVGQndFQkJJSUJIekND QVJzd2diRUcKQ0NzR0FRVUZCekFDaG9Ha2JHUmhjRG92THk5RFRqMVFWQ1V5TUVkc2IySmhiQ1V5 TUVOQkxFTk9QVUZKUVN4RApUajFRZFdKc2FXTWxNakJMWlhrbE1qQlRaWEoyYVdObGN5eERUajFU WlhKMmFXTmxjeXhEVGoxRGIyNW1hV2QxCmNtRjBhVzl1TEVSRFBYQnNZWGwwWldOb0xFUkRQV052 Y25BL1kwRkRaWEowYVdacFkyRjBaVDlpWVhObFAyOWkKYW1WamRFTnNZWE56UFdObGNuUnBabWxq WVhScGIyNUJkWFJvYjNKcGRIa3daUVlJS3dZQkJRVUhNQUtHV1doMApkSEE2THk5amNtd3RhVzUw TG5Cc1lYbDBaV05vTG1OdmJTOURaWEowUlc1eWIyeHNMM1J5ZEMxcGJqQXdPUzV3CmRDNXdiR0Y1 ZEdWamFDNWpiM0p3WDFCVUpUSXdSMnh2WW1Gc0pUSXdRMEVvTWlrdVkzSjBNQTBHQ1NxR1NJYjMK RFFFQkN3VUFBNElCQVFCYXlVWkF2Y1lBNld4S2tOakdNOGNRam42U3daZmdicFQ0YkViZWhQN1li UWlrRVZSTApCbFpxeGZBUUVBWGtycUFpNnNDekJFN0hjS3I5VzBXbWJlZkdubVl3RkN5MzB1a0Nh aXFVdTNRM05Uelh5RVJMCjVON29BakRLeWVQSStXUWVqcEhIWnE2am5RNHJhVUhhb1ZPQklRN1Jz S0pqbnZOYW1RSlU0S0dBNEVQeTh4cnUKcGMxdkJ5V0Y4UG85enpFV25mbUlDdmxwQzhyYjBNSlNq TGJZK0RseXQwYm5vUnhHMUNPSlMrVkJENlpvdWNEeQpLT0gzYVNrVTdON1FTZk5naFk1b2lVMzNU NkdYY3k0RElXcE1RUEc3ZGJkSGo3UW1jZExnS2VPWEc3eHZtc1ZoCjRxUHdDZjNhSmZnc1JDM1o1 MzdsTWJvc0tCeFlNSWFnQVpocwotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== - tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2Z0lCQURBTkJna3Foa2lHOXcwQkFRRUZB QVNDQktnd2dnU2tBZ0VBQW9JQkFRQ3REVmk4UzRoRzJpZXYKZlI1VVBTdTA5SmFPUUFSakhoa2lw RUNsMXZzUkxqbTJYNFFXRnAzV2owZjlYbno0dC9zVGgzM1BKVVFoaTZBSQo1TFJocDlZZmFpUDBZ UEduSzlEaVZCQnNPRENqVC80RWJJWm9IaGxqdmJuMEFqNkJER0FtRExZM1BjQUVWZE5sCkpvWUtK dHB3YWREUnA2MnJJUDkzRmx4TTJ1WWMzNWExV1pKMVhuTFA1dTV0bzlKaWVXcU1remxjOUJyWEpu WHAKYTNpVDdsK251OVY1RTlxZEZMOGY2UHNHSlovZGdkUEwxN3hzcjRZREVoTTJuNkIvM0ZlTWha b1QwdXZaeEkxMwpGTUZudElkWG5YeHZoQVBHZUxwWVpmZUIzSllrYUkrL2R0KzlubzZ3azRTVy9y R2Y2VnNUY25Kd05JaUtjMjBWCjh1ZG1UMEVaQWdNQkFBRUNnZ0VBT2pjMk5jbjNJMWE2YVFmZlR4 bHcvYVFXamU0dFM2YlJiOXp2dnBxT3haM1cKWG1yTmhaekFKbkQzRjk1VWpsdGVSSmlkRXpXSE1Q M0dyWmM2czJ1QjFmbWY5Tk0wR0RmZVFuVmpQUFMrTUFKMgpBc2o3Z2tVMTUxN3BFcFE2c0xFWUcx VEZhOW9ESWJJNXRscDZWeW53N0VZOHNIc0hLbjJrVTB5YmFtTnRiQ0toCjdHbTF2WFBiSE03a29H dndERmJwQ0dRZlNEUWdyc3BqTFdDRHBzN2lkV2xLS2NLSWdpdFFuTmREVlJlYVNjR1YKMU1jWkhC Tlh2T1FkbDljM1NaUjdtUTRZY3dFb3ZZSkI3UGJLWTRra1p3WWRObVZ1cE1ON0cvaFpZWWtLd1pV VApTL0ppUTdUaW1FYjJ0UTRQM3pESDdBeEFHcnNLT1ZDMzNtN044VElEVFFLQmdRRE9LU29zRHdz UUxucDB4dXRpClRSbkphenB1aloyR3piRVNJV2FTeFA4N1ZOMS82YmViaGRjZ0FYc2p5aU9NUWk5 M2k4WWtkaDdTejhVVGxnZmEKSklnYUVKaTA2R01DdngrY1dZTUZ5MU5pWW1YN3JuS1Q4by9rZm0w OUJQemRjNjUyWVErd2s2THFwRjZCeG1uNQo0MEpLTlRoM2ZtZHEwZ3pPVkRMbG1zUW8zd0tCZ1FE VzR5ajBMTWlWOVNHaU4rZWlJei8xMnpZVDFNcDJnbndvCjRPM3o4bzFiblZBbjJEL21Sd1k1c0tx ZEYxbm02T0IwclVERnpiWGszRDB3aVNQR0hZTUZaTjVPSXhIY0kwaUkKTTlmeG44Q1VtZC9TUXVt a3dEL3NhMGp2NFFxNkxsVEVOWmVYSWdFTVhURHlkeW02ektoSXB1Z3l3dkpwdHIyMwpYeUFRcUdz OUJ3S0JnR1ljODV1QkUveSsyTDZ3ckhRek5qdVMxZzFlTFpGUW5vMFphQ0g0VzJjNjRMOXp0eExj ClZ6S3VLUjBRQ1UxMmx1WkNvREQ5Sk1WTVRoUW1jdHMwendrQ0FYRlJ6WURWdzhXQWZLcEpESk1s bzlmbWp6QUMKckEwRUpmMWNWQmNvTGxqS09LaEFhQ2lLbzVqcCt5SGYwN3pINGFFbVJma2Q4MlBi UnA1OWF2M0hBb0dCQU1oeQplNGhSb2dabjlDakt0MUtDU1M2QWZsQS9aV0RvMVFLWTFyNkJHaVZF ZURuQ3VkQ0huaUlBVHhaY2F1cy9mZWk0Cm1Ed3JhS29FV3p2RUlVK3p4YjBwVzBsTjQySVNzNTBC cDBUbnZRK2cvYXkzNkJSYmxRVm5DbEZnL2Myd1hEZnUKdWVvcnVRaWNnWVViYlJ5bnZhNlBxdmQy N0FONmlEdmVDeDRlekhIUEFvR0JBTVowdWhUWVdGMHJ3alZDc0t5cAp3OWJpd3A1dTBjR3VxOE9j S1BsSnEyL1g3d0hpR0ZpSVJxV2RndWk1Um8ydmUyTkNkS0oyVE5VYWd1a0NPSjduCnBVeE9LNXFh ZmZPWVhWWG1tbnRZejAzQWFSSElUWWx0TXpMUUVHbDBwdHU4Zm9zb0FQR0hXRWdHd1RsTFNRU1gK WVNDWVIyL3JxRGRpaVlZWlFWR3pjeVJDCi0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K + tls.crt: QmFnIEF0dHJpYnV0ZXMKICAgIGxvY2FsS2V5SUQ6IDAxIDAwIDAwIDAwIAogICAgZnJpZW5kbHlOYW1lOiBzb2YtYXBwMDEKc3ViamVjdD1DTiA9IHNvZi1hcHAwMS5wdC5wbGF5dGVjaC5jb3JwLCBDTiA9IHNvZi1hcHAwMQppc3N1ZXI9REMgPSBjb3JwLCBEQyA9IHBsYXl0ZWNoLCBEQyA9IHB0LCBDTiA9IFBUIEdsb2JhbCBDQQotLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KTUlJR3B6Q0NCWStnQXdJQkFnSVRNZ0JPMVZpTzMvSjc5bmQxL3dBQ0FFN1ZXREFOQmdrcWhraUc5dzBCQVFzRgpBREJiTVJRd0VnWUtDWkltaVpQeUxHUUJHUllFWTI5eWNERVlNQllHQ2dtU0pvbVQ4aXhrQVJrV0NIQnNZWGwwClpXTm9NUkl3RUFZS0NaSW1pWlB5TEdRQkdSWUNjSFF4RlRBVEJnTlZCQU1UREZCVUlFZHNiMkpoYkNCRFFUQWUKRncweU5UQXhNVFV3T0RFd01qTmFGdzB5TnpBeE1UVXdPREV3TWpOYU1Ea3hJekFoQmdOVkJBTVRHbk52WmkxaApjSEF3TVM1d2RDNXdiR0Y1ZEdWamFDNWpiM0p3TVJJd0VBWURWUVFERXdsemIyWXRZWEJ3TURFd2dnRWlNQTBHCkNTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFDdERWaThTNGhHMmlldmZSNVVQU3UwOUphT1FBUmoKSGhraXBFQ2wxdnNSTGptMlg0UVdGcDNXajBmOVhuejR0L3NUaDMzUEpVUWhpNkFJNUxSaHA5WWZhaVAwWVBHbgpLOURpVkJCc09EQ2pULzRFYklab0hobGp2Ym4wQWo2QkRHQW1ETFkzUGNBRVZkTmxKb1lLSnRwd2FkRFJwNjJyCklQOTNGbHhNMnVZYzM1YTFXWkoxWG5MUDV1NXRvOUppZVdxTWt6bGM5QnJYSm5YcGEzaVQ3bCtudTlWNUU5cWQKRkw4ZjZQc0dKWi9kZ2RQTDE3eHNyNFlERWhNMm42Qi8zRmVNaFpvVDB1dlp4STEzRk1GbnRJZFhuWHh2aEFQRwplTHBZWmZlQjNKWWthSSsvZHQrOW5vNndrNFNXL3JHZjZWc1Rjbkp3TklpS2MyMFY4dWRtVDBFWkFnTUJBQUdqCmdnT0VNSUlEZ0RBOUJna3JCZ0VFQVlJM0ZRY0VNREF1QmlZckJnRUVBWUkzRlFpRThKUUxoK1MwZllYMWpUajMKcEUyQng1UnlnUnFHNDYwRmhiL0ZUZ0lCWkFJQklEQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBVEFMQmdOVgpIUThFQkFNQ0JMQXdHd1lKS3dZQkJBR0NOeFVLQkE0d0REQUtCZ2dyQmdFRkJRY0RBVEFkQmdOVkhRNEVGZ1FVClZiWWFLOVQwMk5YTzcvMXlwc3ZmYTZxazZROHdNQVlEVlIwUkJDa3dKNElhYzI5bUxXRndjREF4TG5CMExuQnMKWVhsMFpXTm9MbU52Y25DQ0NYTnZaaTFoY0hBd01UQWZCZ05WSFNNRUdEQVdnQlJRQnJXaU1yWloyb2tUSzg0RwpkVUZRMGtMRlVEQ0NBVnNHQTFVZEh3U0NBVkl3Z2dGT01JSUJTcUNDQVVhZ2dnRkNob0c3YkdSaGNEb3ZMeTlEClRqMVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxFTk9QWFJ5ZEMxcGJqQXdPU3hEVGoxRFJGQXNRMDQ5VUhWaWJHbGoKSlRJd1MyVjVKVEl3VTJWeWRtbGpaWE1zUTA0OVUyVnlkbWxqWlhNc1EwNDlRMjl1Wm1sbmRYSmhkR2x2Yml4RQpRejF3YkdGNWRHVmphQ3hFUXoxamIzSndQMk5sY25ScFptbGpZWFJsVW1WMmIyTmhkR2x2Ymt4cGMzUS9ZbUZ6ClpUOXZZbXBsWTNSRGJHRnpjejFqVWt4RWFYTjBjbWxpZFhScGIyNVFiMmx1ZElaQmFIUjBjRG92TDNSeWRDMXAKYmpBd09TNXdkQzV3YkdGNWRHVmphQzVqYjNKd0wwTmxjblJGYm5KdmJHd3ZVRlFsTWpCSGJHOWlZV3dsTWpCRApRUzVqY215R1AyaDBkSEE2THk5d2RHZHNiMkpoYkdOaExuQnNZWGwwWldOb0xtTnZjbkF2UTJWeWRFVnVjbTlzCmJDOVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxtTnliRENDQVMwR0NDc0dBUVVGQndFQkJJSUJIekNDQVJzd2diRUcKQ0NzR0FRVUZCekFDaG9Ha2JHUmhjRG92THk5RFRqMVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxFTk9QVUZKUVN4RApUajFRZFdKc2FXTWxNakJMWlhrbE1qQlRaWEoyYVdObGN5eERUajFUWlhKMmFXTmxjeXhEVGoxRGIyNW1hV2QxCmNtRjBhVzl1TEVSRFBYQnNZWGwwWldOb0xFUkRQV052Y25BL1kwRkRaWEowYVdacFkyRjBaVDlpWVhObFAyOWkKYW1WamRFTnNZWE56UFdObGNuUnBabWxqWVhScGIyNUJkWFJvYjNKcGRIa3daUVlJS3dZQkJRVUhNQUtHV1doMApkSEE2THk5amNtd3RhVzUwTG5Cc1lYbDBaV05vTG1OdmJTOURaWEowUlc1eWIyeHNMM1J5ZEMxcGJqQXdPUzV3CmRDNXdiR0Y1ZEdWamFDNWpiM0p3WDFCVUpUSXdSMnh2WW1Gc0pUSXdRMEVvTWlrdVkzSjBNQTBHQ1NxR1NJYjMKRFFFQkN3VUFBNElCQVFCYXlVWkF2Y1lBNld4S2tOakdNOGNRam42U3daZmdicFQ0YkViZWhQN1liUWlrRVZSTApCbFpxeGZBUUVBWGtycUFpNnNDekJFN0hjS3I5VzBXbWJlZkdubVl3RkN5MzB1a0NhaXFVdTNRM05Uelh5RVJMCjVON29BakRLeWVQSStXUWVqcEhIWnE2am5RNHJhVUhhb1ZPQklRN1JzS0pqbnZOYW1RSlU0S0dBNEVQeTh4cnUKcGMxdkJ5V0Y4UG85enpFV25mbUlDdmxwQzhyYjBNSlNqTGJZK0RseXQwYm5vUnhHMUNPSlMrVkJENlpvdWNEeQpLT0gzYVNrVTdON1FTZk5naFk1b2lVMzNUNkdYY3k0RElXcE1RUEc3ZGJkSGo3UW1jZExnS2VPWEc3eHZtc1ZoCjRxUHdDZjNhSmZnc1JDM1oMzdsTWJvc0tCeFlNSWFnQVpocwotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== + tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2Z0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktnd2dnU2tBZ0VBQW9JQkFRQ3REVmk4UzRoRzJpZXYKZlI1VVBTdTA5SmFPUUFSakhoa2lwRUNsMXZzUkxqbTJYNFFXRnAzV2owZjlYbno0dC9zVGgzM1BKVVFoaTZBSQo1TFJocDlZZmFpUDBZUEduSzlEaVZCQnNPRENqVC80RWJJWm9IaGxqdmJuMEFqNkJER0FtRExZM1BjQUVWZE5sCkpvWUtKdHB3YWREUnA2MnJJUDkzRmx4TTJ1WWMzNWExV1pKMVhuTFA1dTV0bzlKaWVXcU1remxjOUJyWEpuWHAKYTNpVDdsK251OVY1RTlxZEZMOGY2UHNHSlovZGdkUEwxN3hzcjRZREVoTTJuNkIvM0ZlTWhab1QwdXZaeEkxMwpGTUZudElkWG5YeHZoQVBHZUxwWVpmZUIzSllrYUkrL2R0KzlubzZ3azRTVy9yR2Y2VnNUY25Kd05JaUtjMjBWCjh1ZG1UMEVaQWdNQkFBRUNnZ0VBT2pjMk5jbjNJMWE2YVFmZlR4bHcvYVFXamU0dFM2YlJiOXp2dnBxT3haM1cKWG1yTmhaekFKbkQzRjk1VWpsdGVSSmlkRXpXSE1QM0dyWmM2czJ1QjFmbWY5Tk0wR0RmZVFuVmpQUFMrTUFKMgpBc2o3Z2tVMTUxN3BFcFE2c0xFWUcxVEZhOW9ESWJJNXRscDZWeW53N0VZOHNIc0hLbjJrVTB5YmFtTnRiQ0toCjdHbTF2WFBiSE03a29HdndERmJwQ0dRZlNEUWdyc3BqTFdDRHBzN2lkV2xLS2NLSWdpdFFuTmREVlJlYVNjR1YKMU1jWkhCTlh2T1FkbDljM1NaUjdtUTRZY3dFb3ZZSkI3UGJLWTRra1p3WWRObVZ1cE1ON0cvaFpZWWtLd1pVVApTL0ppUTdUaW1FYjJ0UTRQM3pESDdBeEFHcnNLT1ZDMzNtN044VElEVFFLQmdRRE9LU29zRHdzUUxucDB4dXRpClRSbkphenB1aloyR3piRVNJV2FTeFA4N1ZOMS82YmViaGRjZ0FYc2p5aU9NUWk5M2k4WWtkaDdTejhVVGxnZmEKSklnYUVKaTA2R01DdngrY1dZTUZ5MU5pWW1YN3JuS1Q4by9rZm0wOUJQemRjNjUyWVErd2s2THFwRjZCeG1uNQo0MEpLTlRoM2ZtZHEwZ3pPVkRMbG1zUW8zd0tCZ1FEVzR5ajBMTWlWOVNHaU4rZWlJei8xMnpZVDFNcDJnbndvCjRPM3o4bzFiblZBbjJEL21Sd1k1c0txZEYxbm02T0IwclVERnpiWGszRDB3aVNQR0hZTUZaTjVPSXhIY0kwaUkKTTlmeG44Q1VtZC9TUXVta3dEL3NhMGp2NFFxNkxsVEVOWmVYSWdFTVhURHlkeW02ektoSXB1Z3l3dkpwdHIyMwpYeUFRcUdzOUJ3S0JnR1ljODV1QkUveSsyTDZ3ckhRek5qdVMxZzFlTFpGUW5vMFphQ0g0VzJjNjRMOXp0eExjClZ6S3VLUjBRQ1UxMmx1WkNvREQ5Sk1WTVRoUW1jdHMwendrQ0FYRlJ6WURWdzhXQWZLcEpESk1sbzlmbWp6QUMKckEwRUpmMWNWQmNvTGxqS09LaEFhQ2lLbzVqcCt5SGYwN3pINGFFbVJma2Q4MlBiUnA1OWF2M0hBb0dCQU1oeQplNGhSb2dabjlDakt0MUtDU1M2QWZsQS9aV0RvMVFLWTFyNkJHaVZFZURuQ3VkQ0huaUlBVHhaY2F1cy9mZWk0Cm1Ed3JhS29FV3p2RUlVK3p4YjBwVzBsTjQySVNzNTBCcDBUbnZRK2cvYXkzNkJSYmxRVm5DbEZnL2Myd1hEZnUKdWVvcnVRaWNnWVViYlJ5bnZhNlBxdmQyN0FONmlEdmVDeDRlekhIUEFvR0JBTVowdWhUWVdGMHJ3alZDc0t5cAp3OWJpd3A1dTBjR3VxOE9jS1BsSnEyL1g3d0hpR0ZpSVJxV2RndWk1Um8ydmUyTkNkS0oyVE5VYWd1a0NPSjduCnBVeE9LNXFhZmZPWVhWWG1tbnRZejAzQWFSSElUWWx0TXpMUUVHbDBwdHU4Zm9zb0FQR0hXRWdHd1RsTFNRU1gKWVNDWVIyL3JxRGRpaVlZWlFWR3pjeVJDCi0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K From b7eb1b155eeaee5ac44e25702fd43d105706eb28 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Wed, 15 Jan 2025 12:02:40 +0200 Subject: [PATCH 160/308] sof-app01-tls --- deployment/sof-app01-secret.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/sof-app01-secret.yaml b/deployment/sof-app01-secret.yaml index 5c54ab12a..c6932f26b 100644 --- a/deployment/sof-app01-secret.yaml +++ b/deployment/sof-app01-secret.yaml @@ -5,5 +5,5 @@ metadata: namespace: sof-app01 type: kubernetes.io/tls data: - tls.crt: QmFnIEF0dHJpYnV0ZXMKICAgIGxvY2FsS2V5SUQ6IDAxIDAwIDAwIDAwIAogICAgZnJpZW5kbHlOYW1lOiBzb2YtYXBwMDEKc3ViamVjdD1DTiA9IHNvZi1hcHAwMS5wdC5wbGF5dGVjaC5jb3JwLCBDTiA9IHNvZi1hcHAwMQppc3N1ZXI9REMgPSBjb3JwLCBEQyA9IHBsYXl0ZWNoLCBEQyA9IHB0LCBDTiA9IFBUIEdsb2JhbCBDQQotLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KTUlJR3B6Q0NCWStnQXdJQkFnSVRNZ0JPMVZpTzMvSjc5bmQxL3dBQ0FFN1ZXREFOQmdrcWhraUc5dzBCQVFzRgpBREJiTVJRd0VnWUtDWkltaVpQeUxHUUJHUllFWTI5eWNERVlNQllHQ2dtU0pvbVQ4aXhrQVJrV0NIQnNZWGwwClpXTm9NUkl3RUFZS0NaSW1pWlB5TEdRQkdSWUNjSFF4RlRBVEJnTlZCQU1UREZCVUlFZHNiMkpoYkNCRFFUQWUKRncweU5UQXhNVFV3T0RFd01qTmFGdzB5TnpBeE1UVXdPREV3TWpOYU1Ea3hJekFoQmdOVkJBTVRHbk52WmkxaApjSEF3TVM1d2RDNXdiR0Y1ZEdWamFDNWpiM0p3TVJJd0VBWURWUVFERXdsemIyWXRZWEJ3TURFd2dnRWlNQTBHCkNTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFDdERWaThTNGhHMmlldmZSNVVQU3UwOUphT1FBUmoKSGhraXBFQ2wxdnNSTGptMlg0UVdGcDNXajBmOVhuejR0L3NUaDMzUEpVUWhpNkFJNUxSaHA5WWZhaVAwWVBHbgpLOURpVkJCc09EQ2pULzRFYklab0hobGp2Ym4wQWo2QkRHQW1ETFkzUGNBRVZkTmxKb1lLSnRwd2FkRFJwNjJyCklQOTNGbHhNMnVZYzM1YTFXWkoxWG5MUDV1NXRvOUppZVdxTWt6bGM5QnJYSm5YcGEzaVQ3bCtudTlWNUU5cWQKRkw4ZjZQc0dKWi9kZ2RQTDE3eHNyNFlERWhNMm42Qi8zRmVNaFpvVDB1dlp4STEzRk1GbnRJZFhuWHh2aEFQRwplTHBZWmZlQjNKWWthSSsvZHQrOW5vNndrNFNXL3JHZjZWc1Rjbkp3TklpS2MyMFY4dWRtVDBFWkFnTUJBQUdqCmdnT0VNSUlEZ0RBOUJna3JCZ0VFQVlJM0ZRY0VNREF1QmlZckJnRUVBWUkzRlFpRThKUUxoK1MwZllYMWpUajMKcEUyQng1UnlnUnFHNDYwRmhiL0ZUZ0lCWkFJQklEQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBVEFMQmdOVgpIUThFQkFNQ0JMQXdHd1lKS3dZQkJBR0NOeFVLQkE0d0REQUtCZ2dyQmdFRkJRY0RBVEFkQmdOVkhRNEVGZ1FVClZiWWFLOVQwMk5YTzcvMXlwc3ZmYTZxazZROHdNQVlEVlIwUkJDa3dKNElhYzI5bUxXRndjREF4TG5CMExuQnMKWVhsMFpXTm9MbU52Y25DQ0NYTnZaaTFoY0hBd01UQWZCZ05WSFNNRUdEQVdnQlJRQnJXaU1yWloyb2tUSzg0RwpkVUZRMGtMRlVEQ0NBVnNHQTFVZEh3U0NBVkl3Z2dGT01JSUJTcUNDQVVhZ2dnRkNob0c3YkdSaGNEb3ZMeTlEClRqMVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxFTk9QWFJ5ZEMxcGJqQXdPU3hEVGoxRFJGQXNRMDQ5VUhWaWJHbGoKSlRJd1MyVjVKVEl3VTJWeWRtbGpaWE1zUTA0OVUyVnlkbWxqWlhNc1EwNDlRMjl1Wm1sbmRYSmhkR2x2Yml4RQpRejF3YkdGNWRHVmphQ3hFUXoxamIzSndQMk5sY25ScFptbGpZWFJsVW1WMmIyTmhkR2x2Ymt4cGMzUS9ZbUZ6ClpUOXZZbXBsWTNSRGJHRnpjejFqVWt4RWFYTjBjbWxpZFhScGIyNVFiMmx1ZElaQmFIUjBjRG92TDNSeWRDMXAKYmpBd09TNXdkQzV3YkdGNWRHVmphQzVqYjNKd0wwTmxjblJGYm5KdmJHd3ZVRlFsTWpCSGJHOWlZV3dsTWpCRApRUzVqY215R1AyaDBkSEE2THk5d2RHZHNiMkpoYkdOaExuQnNZWGwwWldOb0xtTnZjbkF2UTJWeWRFVnVjbTlzCmJDOVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxtTnliRENDQVMwR0NDc0dBUVVGQndFQkJJSUJIekNDQVJzd2diRUcKQ0NzR0FRVUZCekFDaG9Ha2JHUmhjRG92THk5RFRqMVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxFTk9QVUZKUVN4RApUajFRZFdKc2FXTWxNakJMWlhrbE1qQlRaWEoyYVdObGN5eERUajFUWlhKMmFXTmxjeXhEVGoxRGIyNW1hV2QxCmNtRjBhVzl1TEVSRFBYQnNZWGwwWldOb0xFUkRQV052Y25BL1kwRkRaWEowYVdacFkyRjBaVDlpWVhObFAyOWkKYW1WamRFTnNZWE56UFdObGNuUnBabWxqWVhScGIyNUJkWFJvYjNKcGRIa3daUVlJS3dZQkJRVUhNQUtHV1doMApkSEE2THk5amNtd3RhVzUwTG5Cc1lYbDBaV05vTG1OdmJTOURaWEowUlc1eWIyeHNMM1J5ZEMxcGJqQXdPUzV3CmRDNXdiR0Y1ZEdWamFDNWpiM0p3WDFCVUpUSXdSMnh2WW1Gc0pUSXdRMEVvTWlrdVkzSjBNQTBHQ1NxR1NJYjMKRFFFQkN3VUFBNElCQVFCYXlVWkF2Y1lBNld4S2tOakdNOGNRam42U3daZmdicFQ0YkViZWhQN1liUWlrRVZSTApCbFpxeGZBUUVBWGtycUFpNnNDekJFN0hjS3I5VzBXbWJlZkdubVl3RkN5MzB1a0NhaXFVdTNRM05Uelh5RVJMCjVON29BakRLeWVQSStXUWVqcEhIWnE2am5RNHJhVUhhb1ZPQklRN1JzS0pqbnZOYW1RSlU0S0dBNEVQeTh4cnUKcGMxdkJ5V0Y4UG85enpFV25mbUlDdmxwQzhyYjBNSlNqTGJZK0RseXQwYm5vUnhHMUNPSlMrVkJENlpvdWNEeQpLT0gzYVNrVTdON1FTZk5naFk1b2lVMzNUNkdYY3k0RElXcE1RUEc3ZGJkSGo3UW1jZExnS2VPWEc3eHZtc1ZoCjRxUHdDZjNhSmZnc1JDM1oMzdsTWJvc0tCeFlNSWFnQVpocwotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== + tls.crt: QmFnIEF0dHJpYnV0ZXMKICAgIGxvY2FsS2V5SUQ6IDAxIDAwIDAwIDAwIAogICAgZnJpZW5kbHlOYW1lOiBzb2YtYXBwMDEKc3ViamVjdD1DTiA9IHNvZi1hcHAwMS5wdC5wbGF5dGVjaC5jb3JwLCBDTiA9IHNvZi1hcHAwMQppc3N1ZXI9REMgPSBjb3JwLCBEQyA9IHBsYXl0ZWNoLCBEQyA9IHB0LCBDTiA9IFBUIEdsb2JhbCBDQQotLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KTUlJR3B6Q0NCWStnQXdJQkFnSVRNZ0JPMVZpTzMvSjc5bmQxL3dBQ0FFN1ZXREFOQmdrcWhraUc5dzBCQVFzRgpBREJiTVJRd0VnWUtDWkltaVpQeUxHUUJHUllFWTI5eWNERVlNQllHQ2dtU0pvbVQ4aXhrQVJrV0NIQnNZWGwwClpXTm9NUkl3RUFZS0NaSW1pWlB5TEdRQkdSWUNjSFF4RlRBVEJnTlZCQU1UREZCVUlFZHNiMkpoYkNCRFFUQWUKRncweU5UQXhNVFV3T0RFd01qTmFGdzB5TnpBeE1UVXdPREV3TWpOYU1Ea3hJekFoQmdOVkJBTVRHbk52WmkxaApjSEF3TVM1d2RDNXdiR0Y1ZEdWamFDNWpiM0p3TVJJd0VBWURWUVFERXdsemIyWXRZWEJ3TURFd2dnRWlNQTBHCkNTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFDdERWaThTNGhHMmlldmZSNVVQU3UwOUphT1FBUmoKSGhraXBFQ2wxdnNSTGptMlg0UVdGcDNXajBmOVhuejR0L3NUaDMzUEpVUWhpNkFJNUxSaHA5WWZhaVAwWVBHbgpLOURpVkJCc09EQ2pULzRFYklab0hobGp2Ym4wQWo2QkRHQW1ETFkzUGNBRVZkTmxKb1lLSnRwd2FkRFJwNjJyCklQOTNGbHhNMnVZYzM1YTFXWkoxWG5MUDV1NXRvOUppZVdxTWt6bGM5QnJYSm5YcGEzaVQ3bCtudTlWNUU5cWQKRkw4ZjZQc0dKWi9kZ2RQTDE3eHNyNFlERWhNMm42Qi8zRmVNaFpvVDB1dlp4STEzRk1GbnRJZFhuWHh2aEFQRwplTHBZWmZlQjNKWWthSSsvZHQrOW5vNndrNFNXL3JHZjZWc1Rjbkp3TklpS2MyMFY4dWRtVDBFWkFnTUJBQUdqCmdnT0VNSUlEZ0RBOUJna3JCZ0VFQVlJM0ZRY0VNREF1QmlZckJnRUVBWUkzRlFpRThKUUxoK1MwZllYMWpUajMKcEUyQng1UnlnUnFHNDYwRmhiL0ZUZ0lCWkFJQklEQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBVEFMQmdOVgpIUThFQkFNQ0JMQXdHd1lKS3dZQkJBR0NOeFVLQkE0d0REQUtCZ2dyQmdFRkJRY0RBVEFkQmdOVkhRNEVGZ1FVClZiWWFLOVQwMk5YTzcvMXlwc3ZmYTZxazZROHdNQVlEVlIwUkJDa3dKNElhYzI5bUxXRndjREF4TG5CMExuQnMKWVhsMFpXTm9MbU52Y25DQ0NYTnZaaTFoY0hBd01UQWZCZ05WSFNNRUdEQVdnQlJRQnJXaU1yWloyb2tUSzg0RwpkVUZRMGtMRlVEQ0NBVnNHQTFVZEh3U0NBVkl3Z2dGT01JSUJTcUNDQVVhZ2dnRkNob0c3YkdSaGNEb3ZMeTlEClRqMVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxFTk9QWFJ5ZEMxcGJqQXdPU3hEVGoxRFJGQXNRMDQ5VUhWaWJHbGoKSlRJd1MyVjVKVEl3VTJWeWRtbGpaWE1zUTA0OVUyVnlkbWxqWlhNc1EwNDlRMjl1Wm1sbmRYSmhkR2x2Yml4RQpRejF3YkdGNWRHVmphQ3hFUXoxamIzSndQMk5sY25ScFptbGpZWFJsVW1WMmIyTmhkR2x2Ymt4cGMzUS9ZbUZ6ClpUOXZZbXBsWTNSRGJHRnpjejFqVWt4RWFYTjBjbWxpZFhScGIyNVFiMmx1ZElaQmFIUjBjRG92TDNSeWRDMXAKYmpBd09TNXdkQzV3YkdGNWRHVmphQzVqYjNKd0wwTmxjblJGYm5KdmJHd3ZVRlFsTWpCSGJHOWlZV3dsTWpCRApRUzVqY215R1AyaDBkSEE2THk5d2RHZHNiMkpoYkdOaExuQnNZWGwwWldOb0xtTnZjbkF2UTJWeWRFVnVjbTlzCmJDOVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxtTnliRENDQVMwR0NDc0dBUVVGQndFQkJJSUJIekNDQVJzd2diRUcKQ0NzR0FRVUZCekFDaG9Ha2JHUmhjRG92THk5RFRqMVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxFTk9QVUZKUVN4RApUajFRZFdKc2FXTWxNakJMWlhrbE1qQlRaWEoyYVdObGN5eERUajFUWlhKMmFXTmxjeXhEVGoxRGIyNW1hV2QxCmNtRjBhVzl1TEVSRFBYQnNZWGwwWldOb0xFUkRQV052Y25BL1kwRkRaWEowYVdacFkyRjBaVDlpWVhObFAyOWkKYW1WamRFTnNZWE56UFdObGNuUnBabWxqWVhScGIyNUJkWFJvYjNKcGRIa3daUVlJS3dZQkJRVUhNQUtHV1doMApkSEE2THk5amNtd3RhVzUwTG5Cc1lYbDBaV05vTG1OdmJTOURaWEowUlc1eWIyeHNMM1J5ZEMxcGJqQXdPUzV3CmRDNXdiR0Y1ZEdWamFDNWpiM0p3WDFCVUpUSXdSMnh2WW1Gc0pUSXdRMEVvTWlrdVkzSjBNQTBHQ1NxR1NJYjMKRFFFQkN3VUFBNElCQVFCYXlVWkF2Y1lBNld4S2tOakdNOGNRam42U3daZmdicFQ0YkViZWhQN1liUWlrRVZSTApCbFpxeGZBUUVBWGtycUFpNnNDekJFN0hjS3I5VzBXbWJlZkdubVl3RkN5MzB1a0NhaXFVdTNRM05Uelh5RVJMCjVON29BakRLeWVQSStXUWVqcEhIWnE2am5RNHJhVUhhb1ZPQklRN1JzS0pqbnZOYW1RSlU0S0dBNEVQeTh4cnUKcGMxdkJ5V0Y4UG85enpFV25mbUlDdmxwQzhyYjBNSlNqTGJZK0RseXQwYm5vUnhHMUNPSlMrVkJENlpvdWNEeQpLT0gzYVNrVTdON1FTZk5naFk1b2lVMzNUNkdYY3k0RElXcE1RUEc3ZGJkSGo3UW1jZExnS2VPWEc3eHZtc1ZoCjRxUHdDZjNhSmZnc1JDM1oMzdsTWJvc0tCeFlNSWFnQVpocwotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2Z0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktnd2dnU2tBZ0VBQW9JQkFRQ3REVmk4UzRoRzJpZXYKZlI1VVBTdTA5SmFPUUFSakhoa2lwRUNsMXZzUkxqbTJYNFFXRnAzV2owZjlYbno0dC9zVGgzM1BKVVFoaTZBSQo1TFJocDlZZmFpUDBZUEduSzlEaVZCQnNPRENqVC80RWJJWm9IaGxqdmJuMEFqNkJER0FtRExZM1BjQUVWZE5sCkpvWUtKdHB3YWREUnA2MnJJUDkzRmx4TTJ1WWMzNWExV1pKMVhuTFA1dTV0bzlKaWVXcU1remxjOUJyWEpuWHAKYTNpVDdsK251OVY1RTlxZEZMOGY2UHNHSlovZGdkUEwxN3hzcjRZREVoTTJuNkIvM0ZlTWhab1QwdXZaeEkxMwpGTUZudElkWG5YeHZoQVBHZUxwWVpmZUIzSllrYUkrL2R0KzlubzZ3azRTVy9yR2Y2VnNUY25Kd05JaUtjMjBWCjh1ZG1UMEVaQWdNQkFBRUNnZ0VBT2pjMk5jbjNJMWE2YVFmZlR4bHcvYVFXamU0dFM2YlJiOXp2dnBxT3haM1cKWG1yTmhaekFKbkQzRjk1VWpsdGVSSmlkRXpXSE1QM0dyWmM2czJ1QjFmbWY5Tk0wR0RmZVFuVmpQUFMrTUFKMgpBc2o3Z2tVMTUxN3BFcFE2c0xFWUcxVEZhOW9ESWJJNXRscDZWeW53N0VZOHNIc0hLbjJrVTB5YmFtTnRiQ0toCjdHbTF2WFBiSE03a29HdndERmJwQ0dRZlNEUWdyc3BqTFdDRHBzN2lkV2xLS2NLSWdpdFFuTmREVlJlYVNjR1YKMU1jWkhCTlh2T1FkbDljM1NaUjdtUTRZY3dFb3ZZSkI3UGJLWTRra1p3WWRObVZ1cE1ON0cvaFpZWWtLd1pVVApTL0ppUTdUaW1FYjJ0UTRQM3pESDdBeEFHcnNLT1ZDMzNtN044VElEVFFLQmdRRE9LU29zRHdzUUxucDB4dXRpClRSbkphenB1aloyR3piRVNJV2FTeFA4N1ZOMS82YmViaGRjZ0FYc2p5aU9NUWk5M2k4WWtkaDdTejhVVGxnZmEKSklnYUVKaTA2R01DdngrY1dZTUZ5MU5pWW1YN3JuS1Q4by9rZm0wOUJQemRjNjUyWVErd2s2THFwRjZCeG1uNQo0MEpLTlRoM2ZtZHEwZ3pPVkRMbG1zUW8zd0tCZ1FEVzR5ajBMTWlWOVNHaU4rZWlJei8xMnpZVDFNcDJnbndvCjRPM3o4bzFiblZBbjJEL21Sd1k1c0txZEYxbm02T0IwclVERnpiWGszRDB3aVNQR0hZTUZaTjVPSXhIY0kwaUkKTTlmeG44Q1VtZC9TUXVta3dEL3NhMGp2NFFxNkxsVEVOWmVYSWdFTVhURHlkeW02ektoSXB1Z3l3dkpwdHIyMwpYeUFRcUdzOUJ3S0JnR1ljODV1QkUveSsyTDZ3ckhRek5qdVMxZzFlTFpGUW5vMFphQ0g0VzJjNjRMOXp0eExjClZ6S3VLUjBRQ1UxMmx1WkNvREQ5Sk1WTVRoUW1jdHMwendrQ0FYRlJ6WURWdzhXQWZLcEpESk1sbzlmbWp6QUMKckEwRUpmMWNWQmNvTGxqS09LaEFhQ2lLbzVqcCt5SGYwN3pINGFFbVJma2Q4MlBiUnA1OWF2M0hBb0dCQU1oeQplNGhSb2dabjlDakt0MUtDU1M2QWZsQS9aV0RvMVFLWTFyNkJHaVZFZURuQ3VkQ0huaUlBVHhaY2F1cy9mZWk0Cm1Ed3JhS29FV3p2RUlVK3p4YjBwVzBsTjQySVNzNTBCcDBUbnZRK2cvYXkzNkJSYmxRVm5DbEZnL2Myd1hEZnUKdWVvcnVRaWNnWVViYlJ5bnZhNlBxdmQyN0FONmlEdmVDeDRlekhIUEFvR0JBTVowdWhUWVdGMHJ3alZDc0t5cAp3OWJpd3A1dTBjR3VxOE9jS1BsSnEyL1g3d0hpR0ZpSVJxV2RndWk1Um8ydmUyTkNkS0oyVE5VYWd1a0NPSjduCnBVeE9LNXFhZmZPWVhWWG1tbnRZejAzQWFSSElUWWx0TXpMUUVHbDBwdHU4Zm9zb0FQR0hXRWdHd1RsTFNRU1gKWVNDWVIyL3JxRGRpaVlZWlFWR3pjeVJDCi0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K From debc82acfd1292ee92e3ef4ef54d64d715e3634c Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Wed, 15 Jan 2025 12:11:24 +0200 Subject: [PATCH 161/308] sof-app01-tls --- .github/workflows/github-actions-demo.yml | 2 +- deployment/sof-app01-secret.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 28bdd7a32..dda11d573 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -4,7 +4,7 @@ on: push: branches: - main - - dimitardd-281024 +# - dimitardd-281024 env: IMAGE_TAG: dimitardd/dimitar-app02 diff --git a/deployment/sof-app01-secret.yaml b/deployment/sof-app01-secret.yaml index c6932f26b..c1176663a 100644 --- a/deployment/sof-app01-secret.yaml +++ b/deployment/sof-app01-secret.yaml @@ -5,5 +5,5 @@ metadata: namespace: sof-app01 type: kubernetes.io/tls data: - tls.crt: QmFnIEF0dHJpYnV0ZXMKICAgIGxvY2FsS2V5SUQ6IDAxIDAwIDAwIDAwIAogICAgZnJpZW5kbHlOYW1lOiBzb2YtYXBwMDEKc3ViamVjdD1DTiA9IHNvZi1hcHAwMS5wdC5wbGF5dGVjaC5jb3JwLCBDTiA9IHNvZi1hcHAwMQppc3N1ZXI9REMgPSBjb3JwLCBEQyA9IHBsYXl0ZWNoLCBEQyA9IHB0LCBDTiA9IFBUIEdsb2JhbCBDQQotLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KTUlJR3B6Q0NCWStnQXdJQkFnSVRNZ0JPMVZpTzMvSjc5bmQxL3dBQ0FFN1ZXREFOQmdrcWhraUc5dzBCQVFzRgpBREJiTVJRd0VnWUtDWkltaVpQeUxHUUJHUllFWTI5eWNERVlNQllHQ2dtU0pvbVQ4aXhrQVJrV0NIQnNZWGwwClpXTm9NUkl3RUFZS0NaSW1pWlB5TEdRQkdSWUNjSFF4RlRBVEJnTlZCQU1UREZCVUlFZHNiMkpoYkNCRFFUQWUKRncweU5UQXhNVFV3T0RFd01qTmFGdzB5TnpBeE1UVXdPREV3TWpOYU1Ea3hJekFoQmdOVkJBTVRHbk52WmkxaApjSEF3TVM1d2RDNXdiR0Y1ZEdWamFDNWpiM0p3TVJJd0VBWURWUVFERXdsemIyWXRZWEJ3TURFd2dnRWlNQTBHCkNTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFDdERWaThTNGhHMmlldmZSNVVQU3UwOUphT1FBUmoKSGhraXBFQ2wxdnNSTGptMlg0UVdGcDNXajBmOVhuejR0L3NUaDMzUEpVUWhpNkFJNUxSaHA5WWZhaVAwWVBHbgpLOURpVkJCc09EQ2pULzRFYklab0hobGp2Ym4wQWo2QkRHQW1ETFkzUGNBRVZkTmxKb1lLSnRwd2FkRFJwNjJyCklQOTNGbHhNMnVZYzM1YTFXWkoxWG5MUDV1NXRvOUppZVdxTWt6bGM5QnJYSm5YcGEzaVQ3bCtudTlWNUU5cWQKRkw4ZjZQc0dKWi9kZ2RQTDE3eHNyNFlERWhNMm42Qi8zRmVNaFpvVDB1dlp4STEzRk1GbnRJZFhuWHh2aEFQRwplTHBZWmZlQjNKWWthSSsvZHQrOW5vNndrNFNXL3JHZjZWc1Rjbkp3TklpS2MyMFY4dWRtVDBFWkFnTUJBQUdqCmdnT0VNSUlEZ0RBOUJna3JCZ0VFQVlJM0ZRY0VNREF1QmlZckJnRUVBWUkzRlFpRThKUUxoK1MwZllYMWpUajMKcEUyQng1UnlnUnFHNDYwRmhiL0ZUZ0lCWkFJQklEQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBVEFMQmdOVgpIUThFQkFNQ0JMQXdHd1lKS3dZQkJBR0NOeFVLQkE0d0REQUtCZ2dyQmdFRkJRY0RBVEFkQmdOVkhRNEVGZ1FVClZiWWFLOVQwMk5YTzcvMXlwc3ZmYTZxazZROHdNQVlEVlIwUkJDa3dKNElhYzI5bUxXRndjREF4TG5CMExuQnMKWVhsMFpXTm9MbU52Y25DQ0NYTnZaaTFoY0hBd01UQWZCZ05WSFNNRUdEQVdnQlJRQnJXaU1yWloyb2tUSzg0RwpkVUZRMGtMRlVEQ0NBVnNHQTFVZEh3U0NBVkl3Z2dGT01JSUJTcUNDQVVhZ2dnRkNob0c3YkdSaGNEb3ZMeTlEClRqMVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxFTk9QWFJ5ZEMxcGJqQXdPU3hEVGoxRFJGQXNRMDQ5VUhWaWJHbGoKSlRJd1MyVjVKVEl3VTJWeWRtbGpaWE1zUTA0OVUyVnlkbWxqWlhNc1EwNDlRMjl1Wm1sbmRYSmhkR2x2Yml4RQpRejF3YkdGNWRHVmphQ3hFUXoxamIzSndQMk5sY25ScFptbGpZWFJsVW1WMmIyTmhkR2x2Ymt4cGMzUS9ZbUZ6ClpUOXZZbXBsWTNSRGJHRnpjejFqVWt4RWFYTjBjbWxpZFhScGIyNVFiMmx1ZElaQmFIUjBjRG92TDNSeWRDMXAKYmpBd09TNXdkQzV3YkdGNWRHVmphQzVqYjNKd0wwTmxjblJGYm5KdmJHd3ZVRlFsTWpCSGJHOWlZV3dsTWpCRApRUzVqY215R1AyaDBkSEE2THk5d2RHZHNiMkpoYkdOaExuQnNZWGwwWldOb0xtTnZjbkF2UTJWeWRFVnVjbTlzCmJDOVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxtTnliRENDQVMwR0NDc0dBUVVGQndFQkJJSUJIekNDQVJzd2diRUcKQ0NzR0FRVUZCekFDaG9Ha2JHUmhjRG92THk5RFRqMVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxFTk9QVUZKUVN4RApUajFRZFdKc2FXTWxNakJMWlhrbE1qQlRaWEoyYVdObGN5eERUajFUWlhKMmFXTmxjeXhEVGoxRGIyNW1hV2QxCmNtRjBhVzl1TEVSRFBYQnNZWGwwWldOb0xFUkRQV052Y25BL1kwRkRaWEowYVdacFkyRjBaVDlpWVhObFAyOWkKYW1WamRFTnNZWE56UFdObGNuUnBabWxqWVhScGIyNUJkWFJvYjNKcGRIa3daUVlJS3dZQkJRVUhNQUtHV1doMApkSEE2THk5amNtd3RhVzUwTG5Cc1lYbDBaV05vTG1OdmJTOURaWEowUlc1eWIyeHNMM1J5ZEMxcGJqQXdPUzV3CmRDNXdiR0Y1ZEdWamFDNWpiM0p3WDFCVUpUSXdSMnh2WW1Gc0pUSXdRMEVvTWlrdVkzSjBNQTBHQ1NxR1NJYjMKRFFFQkN3VUFBNElCQVFCYXlVWkF2Y1lBNld4S2tOakdNOGNRam42U3daZmdicFQ0YkViZWhQN1liUWlrRVZSTApCbFpxeGZBUUVBWGtycUFpNnNDekJFN0hjS3I5VzBXbWJlZkdubVl3RkN5MzB1a0NhaXFVdTNRM05Uelh5RVJMCjVON29BakRLeWVQSStXUWVqcEhIWnE2am5RNHJhVUhhb1ZPQklRN1JzS0pqbnZOYW1RSlU0S0dBNEVQeTh4cnUKcGMxdkJ5V0Y4UG85enpFV25mbUlDdmxwQzhyYjBNSlNqTGJZK0RseXQwYm5vUnhHMUNPSlMrVkJENlpvdWNEeQpLT0gzYVNrVTdON1FTZk5naFk1b2lVMzNUNkdYY3k0RElXcE1RUEc3ZGJkSGo3UW1jZExnS2VPWEc3eHZtc1ZoCjRxUHdDZjNhSmZnc1JDM1oMzdsTWJvc0tCeFlNSWFnQVpocwotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg + tls.crt: QmFnIEF0dHJpYnV0ZXMKICAgIGxvY2FsS2V5SUQ6IDAxIDAwIDAwIDAwIAogICAgZnJpZW5kbHlOYW1lOiBzb2YtYXBwMDEKc3ViamVjdD1DTiA9IHNvZi1hcHAwMS5wdC5wbGF5dGVjaC5jb3JwLCBDTiA9IHNvZi1hcHAwMQppc3N1ZXI9REMgPSBjb3JwLCBEQyA9IHBsYXl0ZWNoLCBEQyA9IHB0LCBDTiA9IFBUIEdsb2JhbCBDQQotLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KTUlJR3B6Q0NCWStnQXdJQkFnSVRNZ0JPMVZpTzMvSjc5bmQxL3dBQ0FFN1ZXREFOQmdrcWhraUc5dzBCQVFzRgpBREJiTVJRd0VnWUtDWkltaVpQeUxHUUJHUllFWTI5eWNERVlNQllHQ2dtU0pvbVQ4aXhrQVJrV0NIQnNZWGwwClpXTm9NUkl3RUFZS0NaSW1pWlB5TEdRQkdSWUNjSFF4RlRBVEJnTlZCQU1UREZCVUlFZHNiMkpoYkNCRFFUQWUKRncweU5UQXhNVFV3T0RFd01qTmFGdzB5TnpBeE1UVXdPREV3TWpOYU1Ea3hJekFoQmdOVkJBTVRHbk52WmkxaApjSEF3TVM1d2RDNXdiR0Y1ZEdWamFDNWpiM0p3TVJJd0VBWURWUVFERXdsemIyWXRZWEJ3TURFd2dnRWlNQTBHCkNTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFDdERWaThTNGhHMmlldmZSNVVQU3UwOUphT1FBUmoKSGhraXBFQ2wxdnNSTGptMlg0UVdGcDNXajBmOVhuejR0L3NUaDMzUEpVUWhpNkFJNUxSaHA5WWZhaVAwWVBHbgpLOURpVkJCc09EQ2pULzRFYklab0hobGp2Ym4wQWo2QkRHQW1ETFkzUGNBRVZkTmxKb1lLSnRwd2FkRFJwNjJyCklQOTNGbHhNMnVZYzM1YTFXWkoxWG5MUDV1NXRvOUppZVdxTWt6bGM5QnJYSm5YcGEzaVQ3bCtudTlWNUU5cWQKRkw4ZjZQc0dKWi9kZ2RQTDE3eHNyNFlERWhNMm42Qi8zRmVNaFpvVDB1dlp4STEzRk1GbnRJZFhuWHh2aEFQRwplTHBZWmZlQjNKWWthSSsvZHQrOW5vNndrNFNXL3JHZjZWc1Rjbkp3TklpS2MyMFY4dWRtVDBFWkFnTUJBQUdqCmdnT0VNSUlEZ0RBOUJna3JCZ0VFQVlJM0ZRY0VNREF1QmlZckJnRUVBWUkzRlFpRThKUUxoK1MwZllYMWpUajMKcEUyQng1UnlnUnFHNDYwRmhiL0ZUZ0lCWkFJQklEQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBVEFMQmdOVgpIUThFQkFNQ0JMQXdHd1lKS3dZQkJBR0NOeFVLQkE0d0REQUtCZ2dyQmdFRkJRY0RBVEFkQmdOVkhRNEVGZ1FVClZiWWFLOVQwMk5YTzcvMXlwc3ZmYTZxazZROHdNQVlEVlIwUkJDa3dKNElhYzI5bUxXRndjREF4TG5CMExuQnMKWVhsMFpXTm9MbU52Y25DQ0NYTnZaaTFoY0hBd01UQWZCZ05WSFNNRUdEQVdnQlJRQnJXaU1yWloyb2tUSzg0RwpkVUZRMGtMRlVEQ0NBVnNHQTFVZEh3U0NBVkl3Z2dGT01JSUJTcUNDQVVhZ2dnRkNob0c3YkdSaGNEb3ZMeTlEClRqMVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxFTk9QWFJ5ZEMxcGJqQXdPU3hEVGoxRFJGQXNRMDQ5VUhWaWJHbGoKSlRJd1MyVjVKVEl3VTJWeWRtbGpaWE1zUTA0OVUyVnlkbWxqWlhNc1EwNDlRMjl1Wm1sbmRYSmhkR2x2Yml4RQpRejF3YkdGNWRHVmphQ3hFUXoxamIzSndQMk5sY25ScFptbGpZWFJsVW1WMmIyTmhkR2x2Ymt4cGMzUS9ZbUZ6ClpUOXZZbXBsWTNSRGJHRnpjejFqVWt4RWFYTjBjbWxpZFhScGIyNVFiMmx1ZElaQmFIUjBjRG92TDNSeWRDMXAKYmpBd09TNXdkQzV3YkdGNWRHVmphQzVqYjNKd0wwTmxjblJGYm5KdmJHd3ZVRlFsTWpCSGJHOWlZV3dsTWpCRApRUzVqY215R1AyaDBkSEE2THk5d2RHZHNiMkpoYkdOaExuQnNZWGwwWldOb0xtTnZjbkF2UTJWeWRFVnVjbTlzCmJDOVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxtTnliRENDQVMwR0NDc0dBUVVGQndFQkJJSUJIekNDQVJzd2diRUcKQ0NzR0FRVUZCekFDaG9Ha2JHUmhjRG92THk5RFRqMVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxFTk9QVUZKUVN4RApUajFRZFdKc2FXTWxNakJMWlhrbE1qQlRaWEoyYVdObGN5eERUajFUWlhKMmFXTmxjeXhEVGoxRGIyNW1hV2QxCmNtRjBhVzl1TEVSRFBYQnNZWGwwWldOb0xFUkRQV052Y25BL1kwRkRaWEowYVdacFkyRjBaVDlpWVhObFAyOWkKYW1WamRFTnNZWE56UFdObGNuUnBabWxqWVhScGIyNUJkWFJvYjNKcGRIa3daUVlJS3dZQkJRVUhNQUtHV1doMApkSEE2THk5amNtd3RhVzUwTG5Cc1lYbDBaV05vTG1OdmJTOURaWEowUlc1eWIyeHNMM1J5ZEMxcGJqQXdPUzV3CmRDNXdiR0Y1ZEdWamFDNWpiM0p3WDFCVUpUSXdSMnh2WW1Gc0pUSXdRMEVvTWlrdVkzSjBNQTBHQ1NxR1NJYjMKRFFFQkN3VUFBNElCQVFCYXlVWkF2Y1lBNld4S2tOakdNOGNRam42U3daZmdicFQ0YkViZWhQN1liUWlrRVZSTApCbFpxeGZBUUVBWGtycUFpNnNDekJFN0hjS3I5VzBXbWJlZkdubVl3RkN5MzB1a0NhaXFVdTNRM05Uelh5RVJMCjVON29BakRLeWVQSStXUWVqcEhIWnE2am5RNHJhVUhhb1ZPQklRN1JzS0pqbnZOYW1RSlU0S0dBNEVQeTh4cnUKcGMxdkJ5V0Y4UG85enpFV25mbUlDdmxwQzhyYjBNSlNqTGJZK0RseXQwYm5vUnhHMUNPSlMrVkJENlpvdWNEeQpLT0gzYVNrVTdON1FTZk5naFk1b2lVMzNUNkdYY3k0RElXcE1RUEc3ZGJkSGo3UW1jZExnS2VPWEc3eHZtc1ZoCjRxUHdDZjNhSmZnc1JDM1o1MzdsTWJvc0tCeFlNSWFnQVpocwotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2Z0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktnd2dnU2tBZ0VBQW9JQkFRQ3REVmk4UzRoRzJpZXYKZlI1VVBTdTA5SmFPUUFSakhoa2lwRUNsMXZzUkxqbTJYNFFXRnAzV2owZjlYbno0dC9zVGgzM1BKVVFoaTZBSQo1TFJocDlZZmFpUDBZUEduSzlEaVZCQnNPRENqVC80RWJJWm9IaGxqdmJuMEFqNkJER0FtRExZM1BjQUVWZE5sCkpvWUtKdHB3YWREUnA2MnJJUDkzRmx4TTJ1WWMzNWExV1pKMVhuTFA1dTV0bzlKaWVXcU1remxjOUJyWEpuWHAKYTNpVDdsK251OVY1RTlxZEZMOGY2UHNHSlovZGdkUEwxN3hzcjRZREVoTTJuNkIvM0ZlTWhab1QwdXZaeEkxMwpGTUZudElkWG5YeHZoQVBHZUxwWVpmZUIzSllrYUkrL2R0KzlubzZ3azRTVy9yR2Y2VnNUY25Kd05JaUtjMjBWCjh1ZG1UMEVaQWdNQkFBRUNnZ0VBT2pjMk5jbjNJMWE2YVFmZlR4bHcvYVFXamU0dFM2YlJiOXp2dnBxT3haM1cKWG1yTmhaekFKbkQzRjk1VWpsdGVSSmlkRXpXSE1QM0dyWmM2czJ1QjFmbWY5Tk0wR0RmZVFuVmpQUFMrTUFKMgpBc2o3Z2tVMTUxN3BFcFE2c0xFWUcxVEZhOW9ESWJJNXRscDZWeW53N0VZOHNIc0hLbjJrVTB5YmFtTnRiQ0toCjdHbTF2WFBiSE03a29HdndERmJwQ0dRZlNEUWdyc3BqTFdDRHBzN2lkV2xLS2NLSWdpdFFuTmREVlJlYVNjR1YKMU1jWkhCTlh2T1FkbDljM1NaUjdtUTRZY3dFb3ZZSkI3UGJLWTRra1p3WWRObVZ1cE1ON0cvaFpZWWtLd1pVVApTL0ppUTdUaW1FYjJ0UTRQM3pESDdBeEFHcnNLT1ZDMzNtN044VElEVFFLQmdRRE9LU29zRHdzUUxucDB4dXRpClRSbkphenB1aloyR3piRVNJV2FTeFA4N1ZOMS82YmViaGRjZ0FYc2p5aU9NUWk5M2k4WWtkaDdTejhVVGxnZmEKSklnYUVKaTA2R01DdngrY1dZTUZ5MU5pWW1YN3JuS1Q4by9rZm0wOUJQemRjNjUyWVErd2s2THFwRjZCeG1uNQo0MEpLTlRoM2ZtZHEwZ3pPVkRMbG1zUW8zd0tCZ1FEVzR5ajBMTWlWOVNHaU4rZWlJei8xMnpZVDFNcDJnbndvCjRPM3o4bzFiblZBbjJEL21Sd1k1c0txZEYxbm02T0IwclVERnpiWGszRDB3aVNQR0hZTUZaTjVPSXhIY0kwaUkKTTlmeG44Q1VtZC9TUXVta3dEL3NhMGp2NFFxNkxsVEVOWmVYSWdFTVhURHlkeW02ektoSXB1Z3l3dkpwdHIyMwpYeUFRcUdzOUJ3S0JnR1ljODV1QkUveSsyTDZ3ckhRek5qdVMxZzFlTFpGUW5vMFphQ0g0VzJjNjRMOXp0eExjClZ6S3VLUjBRQ1UxMmx1WkNvREQ5Sk1WTVRoUW1jdHMwendrQ0FYRlJ6WURWdzhXQWZLcEpESk1sbzlmbWp6QUMKckEwRUpmMWNWQmNvTGxqS09LaEFhQ2lLbzVqcCt5SGYwN3pINGFFbVJma2Q4MlBiUnA1OWF2M0hBb0dCQU1oeQplNGhSb2dabjlDakt0MUtDU1M2QWZsQS9aV0RvMVFLWTFyNkJHaVZFZURuQ3VkQ0huaUlBVHhaY2F1cy9mZWk0Cm1Ed3JhS29FV3p2RUlVK3p4YjBwVzBsTjQySVNzNTBCcDBUbnZRK2cvYXkzNkJSYmxRVm5DbEZnL2Myd1hEZnUKdWVvcnVRaWNnWVViYlJ5bnZhNlBxdmQyN0FONmlEdmVDeDRlekhIUEFvR0JBTVowdWhUWVdGMHJ3alZDc0t5cAp3OWJpd3A1dTBjR3VxOE9jS1BsSnEyL1g3d0hpR0ZpSVJxV2RndWk1Um8ydmUyTkNkS0oyVE5VYWd1a0NPSjduCnBVeE9LNXFhZmZPWVhWWG1tbnRZejAzQWFSSElUWWx0TXpMUUVHbDBwdHU4Zm9zb0FQR0hXRWdHd1RsTFNRU1gKWVNDWVIyL3JxRGRpaVlZWlFWR3pjeVJDCi0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K From 1a117c4015d5411eba85f944e62ad3b935610b9b Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Wed, 15 Jan 2025 12:22:42 +0200 Subject: [PATCH 162/308] sof-app01-tls --- deployment/sof-app01-ingress.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deployment/sof-app01-ingress.yaml b/deployment/sof-app01-ingress.yaml index b64ac3cfc..ca58c1a6e 100644 --- a/deployment/sof-app01-ingress.yaml +++ b/deployment/sof-app01-ingress.yaml @@ -17,7 +17,7 @@ spec: name: sof-app01-service port: number: 3000 -tls: - - hosts: - - sof-app01.pt.playtech.corp - secretName: sof-app01-tls + tls: + - hosts: + - sof-app01.pt.playtech.corp + secretName: sof-app01-tls From 5aedbc434f4208acb655ce01a74a734d4890d1ac Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Wed, 15 Jan 2025 12:31:52 +0200 Subject: [PATCH 163/308] add resorurce limit to sof-app01 --- deployment/sof-app01.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 90595bdd5..3c0e9f69f 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -21,3 +21,10 @@ spec: image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 ports: - containerPort: 3000 + resources: + requests: + memory: "256Mi" + cpu: "500m" + limits: + memory: "512Mi" + cpu: "1" From 517b1d507c35662eb6b473425355d1f0999296ca Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Wed, 15 Jan 2025 13:41:37 +0200 Subject: [PATCH 164/308] deplay Green image --- deployment/sof-app01.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 3c0e9f69f..d7a446678 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -17,8 +17,8 @@ spec: spec: containers: - name: sof-app01 -# image: dimitardd/dimitar-app02:4d8f5c0aba5f446b4822a1b79c561c3e18850cba - image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 + image: dimitardd/dimitar-app02:4d8f5c0aba5f446b4822a1b79c561c3e18850cba +# image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 ports: - containerPort: 3000 resources: From 5a7e3178294cb2889c6f50e7b60057ecb96b189a Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Wed, 15 Jan 2025 14:09:24 +0200 Subject: [PATCH 165/308] add auto sync in argocd delayment for sof-app01 --- terraform/sof-app01/argo-app01.tf | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/terraform/sof-app01/argo-app01.tf b/terraform/sof-app01/argo-app01.tf index 5a3f18036..2f205dbde 100644 --- a/terraform/sof-app01/argo-app01.tf +++ b/terraform/sof-app01/argo-app01.tf @@ -6,6 +6,24 @@ resource "argocd_application" "sof-app01" { spec { project = "default" + sync_policy { + sync_options = ["Validate=true"] + + retry { + limit = "5" + + backoff { + duration = "5s" + factor = "2" + max_duration = "3m0s" + } + } + automated { + allow_empty = false + prune = false + self_heal = false + } + } destination { server = "https://kubernetes.default.svc" namespace = "sof-app01" From 3b53ba22bdac86eba6148f9934216c23f0450d50 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Wed, 15 Jan 2025 14:11:36 +0200 Subject: [PATCH 166/308] deploy Blue image for sof-app01 --- deployment/sof-app01.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index d7a446678..3c0e9f69f 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -17,8 +17,8 @@ spec: spec: containers: - name: sof-app01 - image: dimitardd/dimitar-app02:4d8f5c0aba5f446b4822a1b79c561c3e18850cba -# image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 +# image: dimitardd/dimitar-app02:4d8f5c0aba5f446b4822a1b79c561c3e18850cba + image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 ports: - containerPort: 3000 resources: From 47321c222229808d1a7eb0e67fc496da515e914c Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Wed, 15 Jan 2025 14:45:39 +0200 Subject: [PATCH 167/308] deploy Green image --- deployment/sof-app01.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 3c0e9f69f..9894825d6 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -17,8 +17,8 @@ spec: spec: containers: - name: sof-app01 -# image: dimitardd/dimitar-app02:4d8f5c0aba5f446b4822a1b79c561c3e18850cba - image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 + image: dimitardd/dimitar-app02:4d8f5c0aba5f446b4822a1b79c561c3e18850cba #Green +# image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 #Blue ports: - containerPort: 3000 resources: From ada5860e5281dcdede98a79c20b0a717004d2a04 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Wed, 15 Jan 2025 18:57:00 +0200 Subject: [PATCH 168/308] move dockerfile to app folder --- .github/workflows/github-actions-demo.yml | 2 +- m1-3-1-docker.yml => _homework/m1-3-1-docker.yml | 0 Dockerfile => app/Dockerfile | 0 requirements.txt => app/requirements.txt | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename m1-3-1-docker.yml => _homework/m1-3-1-docker.yml (100%) rename Dockerfile => app/Dockerfile (100%) rename requirements.txt => app/requirements.txt (100%) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index dda11d573..28bdd7a32 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -4,7 +4,7 @@ on: push: branches: - main -# - dimitardd-281024 + - dimitardd-281024 env: IMAGE_TAG: dimitardd/dimitar-app02 diff --git a/m1-3-1-docker.yml b/_homework/m1-3-1-docker.yml similarity index 100% rename from m1-3-1-docker.yml rename to _homework/m1-3-1-docker.yml diff --git a/Dockerfile b/app/Dockerfile similarity index 100% rename from Dockerfile rename to app/Dockerfile diff --git a/requirements.txt b/app/requirements.txt similarity index 100% rename from requirements.txt rename to app/requirements.txt From cdeea78d694918726bba317b45bbfc3adee72315 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Wed, 15 Jan 2025 19:01:21 +0200 Subject: [PATCH 169/308] fix loacation of docker file for build proccess --- .github/workflows/github-actions-demo.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 28bdd7a32..d0384d690 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -111,6 +111,7 @@ jobs: uses: actions/checkout@v4 - name: Build an image from Dockerfile run: | + cd app docker build -t ${{ env.IMAGE_TAG }}:${{ github.sha }} . - name: Run Trivy vulnerability scanner uses: aquasecurity/trivy-action@0.28.0 From 709e1adc8ca1fca238b1a5639c76fcd4f79db999 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Wed, 15 Jan 2025 19:18:19 +0200 Subject: [PATCH 170/308] dockerfile working dir change --- app/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Dockerfile b/app/Dockerfile index d4295163e..f0f7b9bf0 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update -y && \ groupadd -r appgroup && \ useradd -r -g appgroup appuser -WORKDIR /app +#WORKDIR /app COPY --chown=appuser:appgroup --chmod=755 ./app . From fe65a1b61a79e14b3498a55bc03696a17d3503a2 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Wed, 15 Jan 2025 20:07:11 +0200 Subject: [PATCH 171/308] revert docker file --- .github/workflows/github-actions-demo.yml | 1 - app/Dockerfile => Dockerfile | 2 +- app/requirements.txt => requirements.txt | 0 3 files changed, 1 insertion(+), 2 deletions(-) rename app/Dockerfile => Dockerfile (96%) rename app/requirements.txt => requirements.txt (100%) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index d0384d690..28bdd7a32 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -111,7 +111,6 @@ jobs: uses: actions/checkout@v4 - name: Build an image from Dockerfile run: | - cd app docker build -t ${{ env.IMAGE_TAG }}:${{ github.sha }} . - name: Run Trivy vulnerability scanner uses: aquasecurity/trivy-action@0.28.0 diff --git a/app/Dockerfile b/Dockerfile similarity index 96% rename from app/Dockerfile rename to Dockerfile index f0f7b9bf0..d4295163e 100644 --- a/app/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update -y && \ groupadd -r appgroup && \ useradd -r -g appgroup appuser -#WORKDIR /app +WORKDIR /app COPY --chown=appuser:appgroup --chmod=755 ./app . diff --git a/app/requirements.txt b/requirements.txt similarity index 100% rename from app/requirements.txt rename to requirements.txt From 90d13a901e59c0ab4b4687a2c055e77682fed11b Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 10:01:24 +0200 Subject: [PATCH 172/308] auto chnage doker image tag in deplayment for sof-app01 --- .github/workflows/github-actions-demo.yml | 26 ++++++++++++++++++++++- app/app.py | 2 +- app/app_test.py | 2 +- deployment/sof-app01.yaml | 3 ++- rollout/sof-app02.yaml | 4 ++-- 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 28bdd7a32..07fb25b83 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -2,6 +2,9 @@ name: GitHub Actions Demo run-name: ${{ github.actor }} is testing out GitHub Actions πŸš€ on: push: + paths-ignore: + - 'deployment/*' + - 'terraform/*' branches: - main - dimitardd-281024 @@ -122,7 +125,7 @@ jobs: uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results-container.sarif' - Deploy: + UploadtoDockerHub: name: Push container to docker hub runs-on: ubuntu-latest if: ${{ !cancelled() && !failure() }} @@ -139,3 +142,24 @@ jobs: push: true tags: '${{ env.IMAGE_TAG }}:${{ github.sha }}' if: success() # Only push if get login is ok + PushforArgoCD: + name: Update deplayment for ArgoCD + runs-on: ubuntu-latest + if: ${{ !cancelled() && !failure() }} + needs: [ UploadtoDockerHub ] + steps: + - name: Checkout code + uses: actions/checkout@v2 + - name: Update sof-app01 deployment image + run: | + apt-get install yq + IMAGE_TAG=$(echo $github.sha) + yq eval ".spec.template.spec.containers[0].image = \"deployment/dimitardd/dimitar-app02:${IMAGE_TAG}\"" -i deployment/sof-app01.yaml + git config --local user.email "dhd.dimitrov@gmail.com" + git config --local user.name "Dimitar Dimitrov" + git add deployment/sof-app01.yaml + git commit -m "Update image to ${{ github.sha }}" + git push origin main + env: + github_token: ${{ secrets.GIT_TOKEN }} + GITHUB_SHA: ${{ github.sha }} diff --git a/app/app.py b/app/app.py index 51ee7acf9..67e0180c0 100644 --- a/app/app.py +++ b/app/app.py @@ -7,7 +7,7 @@ @app.route("/") def hello_world(): - return "Hello, Blue World!" + return "Hello, World!" if __name__ == "__main__": diff --git a/app/app_test.py b/app/app_test.py index d67c26993..a1b1bacb2 100644 --- a/app/app_test.py +++ b/app/app_test.py @@ -10,7 +10,7 @@ def setUp(self): def test_hello_world(self): response = self.client.get("/") self.assertEqual(response.status_code, 200) - self.assertEqual(response.data, b"Hello, Blue World!") + self.assertEqual(response.data, b"Hello, World!") if __name__ == "__main__": diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 9894825d6..1ba6538c0 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -17,7 +17,8 @@ spec: spec: containers: - name: sof-app01 - image: dimitardd/dimitar-app02:4d8f5c0aba5f446b4822a1b79c561c3e18850cba #Green + image: dimitardd/dimitar-app02:${{TAG}} +# image: dimitardd/dimitar-app02:4d8f5c0aba5f446b4822a1b79c561c3e18850cba #Green # image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 #Blue ports: - containerPort: 3000 diff --git a/rollout/sof-app02.yaml b/rollout/sof-app02.yaml index 1b333ce58..8700c8f83 100644 --- a/rollout/sof-app02.yaml +++ b/rollout/sof-app02.yaml @@ -26,8 +26,8 @@ spec: spec: containers: - name: sof-app02 -# image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 - image: dimitardd/dimitar-app02:4d8f5c0aba5f446b4822a1b79c561c3e18850cba + image: dimitardd/dimitar-app02:4d8f5c0aba5f446b4822a1b79c561c3e18850cba #Green +# image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 #Blue ports: - name: http containerPort: 3000 From 7e8b5c739edcea83ce40280adfbe5f79e13617b2 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 10:06:43 +0200 Subject: [PATCH 173/308] add sudo for installatiuon of yq under Update deployment --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 07fb25b83..61e1f5671 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -152,7 +152,7 @@ jobs: uses: actions/checkout@v2 - name: Update sof-app01 deployment image run: | - apt-get install yq + sudo apt-get install yq -y IMAGE_TAG=$(echo $github.sha) yq eval ".spec.template.spec.containers[0].image = \"deployment/dimitardd/dimitar-app02:${IMAGE_TAG}\"" -i deployment/sof-app01.yaml git config --local user.email "dhd.dimitrov@gmail.com" From 2e2d85f777497138a37f64fc59e1eaea857fd5ad Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 10:15:31 +0200 Subject: [PATCH 174/308] fixing locatagion for checkout repo --- .github/workflows/github-actions-demo.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 61e1f5671..8bd2bc388 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -154,6 +154,7 @@ jobs: run: | sudo apt-get install yq -y IMAGE_TAG=$(echo $github.sha) + cd devops-programme yq eval ".spec.template.spec.containers[0].image = \"deployment/dimitardd/dimitar-app02:${IMAGE_TAG}\"" -i deployment/sof-app01.yaml git config --local user.email "dhd.dimitrov@gmail.com" git config --local user.name "Dimitar Dimitrov" From 210d3a0254f57e7bc293b7a60bcd9d88f7bef37a Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 10:24:38 +0200 Subject: [PATCH 175/308] fix location of the folder to replace deplyment image tag with newest --- .github/workflows/github-actions-demo.yml | 92 +++++++++++------------ 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 8bd2bc388..6a40809ef 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -60,55 +60,55 @@ jobs: run: | cd app python -m unittest app_test.py - CheckforSecrets: - needs: UnitTest - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Gitleaks scan - uses: gitleaks/gitleaks-action@v2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - TrivySecurity: - runs-on: ubuntu-latest - needs: UnitTest - steps: - - uses: actions/checkout@v4 - - name: Trivy Vulnerability Scan - uses: aquasecurity/trivy-action@master - with: - scan-type: 'fs' - ignore-unfixed: true - format: 'sarif' - output: 'trivy-output.sarif' - severity: 'CRITICAL' - - name: Trivy Scan Output - uses: github/codeql-action/upload-sarif@v3 - with: - sarif_file: 'trivy-output.sarif' - SonarcloudSecurity: - runs-on: ubuntu-latest - needs: UnitTest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: SonarCloud Scan - uses: sonarsource/sonarcloud-github-action@master - env: - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - with: - projectBaseDir: app - args: > - -Dsonar.projectKey=dimitardd_devops-programme - -Dsonar.organization=dimitardd +# CheckforSecrets: +# needs: UnitTest +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v4 +# with: +# fetch-depth: 0 +# - name: Gitleaks scan +# uses: gitleaks/gitleaks-action@v2 +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# TrivySecurity: +# runs-on: ubuntu-latest +# needs: UnitTest +# steps: +# - uses: actions/checkout@v4 +# - name: Trivy Vulnerability Scan +# uses: aquasecurity/trivy-action@master +# with: +# scan-type: 'fs' +# ignore-unfixed: true +# format: 'sarif' +# output: 'trivy-output.sarif' +# severity: 'CRITICAL' +# - name: Trivy Scan Output +# uses: github/codeql-action/upload-sarif@v3 +# with: +# sarif_file: 'trivy-output.sarif' +# SonarcloudSecurity: +# runs-on: ubuntu-latest +# needs: UnitTest +# steps: +# - uses: actions/checkout@v4 +# with: +# fetch-depth: 0 +# - name: SonarCloud Scan +# uses: sonarsource/sonarcloud-github-action@master +# env: +# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} +# with: +# projectBaseDir: app +# args: > +# -Dsonar.projectKey=dimitardd_devops-programme +# -Dsonar.organization=dimitardd Build-Test: name: Build Image and Test runs-on: ubuntu-latest if: ${{ !cancelled() && !failure() }} - needs: [ SonarcloudSecurity, TrivySecurity, CheckforSecrets ] + needs: UnitTest #[ SonarcloudSecurity, TrivySecurity, CheckforSecrets ] steps: - name: Checkout code uses: actions/checkout@v4 @@ -154,7 +154,7 @@ jobs: run: | sudo apt-get install yq -y IMAGE_TAG=$(echo $github.sha) - cd devops-programme + cd $GITHUB_WORKSPACE/devops-programme yq eval ".spec.template.spec.containers[0].image = \"deployment/dimitardd/dimitar-app02:${IMAGE_TAG}\"" -i deployment/sof-app01.yaml git config --local user.email "dhd.dimitrov@gmail.com" git config --local user.name "Dimitar Dimitrov" From 15a8776e898cd73af52ebb3038383233e3a27f2f Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 10:28:23 +0200 Subject: [PATCH 176/308] fixyng the location of git clone --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 6a40809ef..392a01776 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -154,7 +154,7 @@ jobs: run: | sudo apt-get install yq -y IMAGE_TAG=$(echo $github.sha) - cd $GITHUB_WORKSPACE/devops-programme + cd $GITHUB_WORKSPACE yq eval ".spec.template.spec.containers[0].image = \"deployment/dimitardd/dimitar-app02:${IMAGE_TAG}\"" -i deployment/sof-app01.yaml git config --local user.email "dhd.dimitrov@gmail.com" git config --local user.name "Dimitar Dimitrov" From a6d0994a537632ced097080ff691ed61b24e2eea Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 10:33:44 +0200 Subject: [PATCH 177/308] fixing the location of git clone folder --- .github/workflows/github-actions-demo.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 392a01776..d424a589d 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -154,8 +154,10 @@ jobs: run: | sudo apt-get install yq -y IMAGE_TAG=$(echo $github.sha) - cd $GITHUB_WORKSPACE - yq eval ".spec.template.spec.containers[0].image = \"deployment/dimitardd/dimitar-app02:${IMAGE_TAG}\"" -i deployment/sof-app01.yaml + cd $GITHUB_WORKSPACE/deployment/ + ls -la $GITHUB_WORKSPACE + pwd + yq eval ".spec.template.spec.containers[0].image = \"dimitardd/dimitar-app02:${IMAGE_TAG}\"" -i sof-app01.yaml git config --local user.email "dhd.dimitrov@gmail.com" git config --local user.name "Dimitar Dimitrov" git add deployment/sof-app01.yaml From d9846ee30a65bd14f75d6ffd412cef9f033e9aa2 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 10:40:17 +0200 Subject: [PATCH 178/308] fix --- .github/workflows/github-actions-demo.yml | 40 +++++++++++------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index d424a589d..b9f861145 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -125,28 +125,28 @@ jobs: uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results-container.sarif' - UploadtoDockerHub: - name: Push container to docker hub - runs-on: ubuntu-latest - if: ${{ !cancelled() && !failure() }} - needs: [ Build-Test ] - steps: - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Push - uses: docker/build-push-action@v6 - with: - push: true - tags: '${{ env.IMAGE_TAG }}:${{ github.sha }}' - if: success() # Only push if get login is ok +# UploadtoDockerHub: +# name: Push container to docker hub +# runs-on: ubuntu-latest +# if: ${{ !cancelled() && !failure() }} +# needs: [ Build-Test ] +# steps: +# - name: Login to Docker Hub +# uses: docker/login-action@v3 +# with: +# username: ${{ secrets.DOCKERHUB_USERNAME }} +# password: ${{ secrets.DOCKERHUB_TOKEN }} +# - name: Push +# uses: docker/build-push-action@v6 +# with: +# push: true +# tags: '${{ env.IMAGE_TAG }}:${{ github.sha }}' +# if: success() # Only push if get login is ok PushforArgoCD: name: Update deplayment for ArgoCD runs-on: ubuntu-latest if: ${{ !cancelled() && !failure() }} - needs: [ UploadtoDockerHub ] + needs: Build-Test #[ UploadtoDockerHub ] steps: - name: Checkout code uses: actions/checkout@v2 @@ -154,10 +154,10 @@ jobs: run: | sudo apt-get install yq -y IMAGE_TAG=$(echo $github.sha) - cd $GITHUB_WORKSPACE/deployment/ + cd $GITHUB_WORKSPACE ls -la $GITHUB_WORKSPACE pwd - yq eval ".spec.template.spec.containers[0].image = \"dimitardd/dimitar-app02:${IMAGE_TAG}\"" -i sof-app01.yaml + yq eval ".spec.template.spec.containers[0].image = \"dimitardd/dimitar-app02:${IMAGE_TAG}\"" -i deployment/sof-app01.yaml git config --local user.email "dhd.dimitrov@gmail.com" git config --local user.name "Dimitar Dimitrov" git add deployment/sof-app01.yaml From 5d75b19d0ce7b47f7bcab39217bed9577300a2ff Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 10:49:38 +0200 Subject: [PATCH 179/308] debug mode --- .github/workflows/github-actions-demo.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index b9f861145..f69c8f2c4 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -153,9 +153,14 @@ jobs: - name: Update sof-app01 deployment image run: | sudo apt-get install yq -y + echo $GITHUB_WORKSPACE + echo $github.sha IMAGE_TAG=$(echo $github.sha) + echo "cd to hithub_workspace" cd $GITHUB_WORKSPACE + echo "Github workspace" ls -la $GITHUB_WORKSPACE + echo "PWD command" pwd yq eval ".spec.template.spec.containers[0].image = \"dimitardd/dimitar-app02:${IMAGE_TAG}\"" -i deployment/sof-app01.yaml git config --local user.email "dhd.dimitrov@gmail.com" From 86f9478f0ef7b944e40731f338e5325af6c3b16e Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 10:55:08 +0200 Subject: [PATCH 180/308] debugging --- .github/workflows/github-actions-demo.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index f69c8f2c4..1c49ca51a 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -162,7 +162,9 @@ jobs: ls -la $GITHUB_WORKSPACE echo "PWD command" pwd - yq eval ".spec.template.spec.containers[0].image = \"dimitardd/dimitar-app02:${IMAGE_TAG}\"" -i deployment/sof-app01.yaml + echo "Github workspace/deploymen" + ls -la $GITHUB_WORKSPACE/deployment + yq eval ".spec.template.spec.containers[0].image = \"dimitardd/dimitar-app02:${IMAGE_TAG}\"" -i $GITHUB_WORKSPACE/deployment/sof-app01.yaml git config --local user.email "dhd.dimitrov@gmail.com" git config --local user.name "Dimitar Dimitrov" git add deployment/sof-app01.yaml From 8587172e5a433235131c51c64c90322690b86727 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 11:06:02 +0200 Subject: [PATCH 181/308] debugging --- .github/workflows/github-actions-demo.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 1c49ca51a..18270dafb 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -153,21 +153,30 @@ jobs: - name: Update sof-app01 deployment image run: | sudo apt-get install yq -y + echo "===============" echo $GITHUB_WORKSPACE echo $github.sha - IMAGE_TAG=$(echo $github.sha) + echo "===============" + IMAGE_NEWTAG=$(echo $github.sha) + echo "IMAGE_NEWTAG" + echo $IMAGE_NEWTAG + echo "===============" echo "cd to hithub_workspace" cd $GITHUB_WORKSPACE + echo "===============" echo "Github workspace" ls -la $GITHUB_WORKSPACE + echo "===============" echo "PWD command" pwd + echo "===============" echo "Github workspace/deploymen" ls -la $GITHUB_WORKSPACE/deployment - yq eval ".spec.template.spec.containers[0].image = \"dimitardd/dimitar-app02:${IMAGE_TAG}\"" -i $GITHUB_WORKSPACE/deployment/sof-app01.yaml + echo "===============" + yq eval ".spec.template.spec.containers[0].image = \"dimitardd/dimitar-app02:${IMAGE_NEWTAG}\"" -i $GITHUB_WORKSPACE/deployment/sof-app01.yaml git config --local user.email "dhd.dimitrov@gmail.com" git config --local user.name "Dimitar Dimitrov" - git add deployment/sof-app01.yaml + git add $GITHUB_WORKSPACE/deployment/sof-app01.yaml git commit -m "Update image to ${{ github.sha }}" git push origin main env: From 68ab94ba9b991a8c211edaee764e36adef7cafe4 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 11:08:34 +0200 Subject: [PATCH 182/308] image tag green --- deployment/sof-app01.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 1ba6538c0..1b4f6aef9 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: sof-app01 - image: dimitardd/dimitar-app02:${{TAG}} + image: dimitardd/dimitar-app02:4d8f5c0aba5f446b4822a1b79c561c3e18850cba # image: dimitardd/dimitar-app02:4d8f5c0aba5f446b4822a1b79c561c3e18850cba #Green # image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 #Blue ports: From c777b0bd4e6b2d2bf82e1a63b9b761029860490d Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 11:11:56 +0200 Subject: [PATCH 183/308] debug --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 18270dafb..f66bdfeda 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -166,7 +166,7 @@ jobs: echo "===============" echo "Github workspace" ls -la $GITHUB_WORKSPACE - echo "===============" + echo "====================" echo "PWD command" pwd echo "===============" From 2911866c419c7e5905fedc0fde90870fbd4403e3 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 11:15:36 +0200 Subject: [PATCH 184/308] debug --- .github/workflows/github-actions-demo.yml | 38 +++++++++++------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index f66bdfeda..812d58960 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -125,28 +125,28 @@ jobs: uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results-container.sarif' -# UploadtoDockerHub: -# name: Push container to docker hub -# runs-on: ubuntu-latest -# if: ${{ !cancelled() && !failure() }} -# needs: [ Build-Test ] -# steps: -# - name: Login to Docker Hub -# uses: docker/login-action@v3 -# with: -# username: ${{ secrets.DOCKERHUB_USERNAME }} -# password: ${{ secrets.DOCKERHUB_TOKEN }} -# - name: Push -# uses: docker/build-push-action@v6 -# with: -# push: true -# tags: '${{ env.IMAGE_TAG }}:${{ github.sha }}' -# if: success() # Only push if get login is ok + UploadtoDockerHub: + name: Push container to docker hub + runs-on: ubuntu-latest + if: ${{ !cancelled() && !failure() }} + needs: [ Build-Test ] + steps: + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Push + uses: docker/build-push-action@v6 + with: + push: true + tags: '${{ env.IMAGE_TAG }}:${{ github.sha }}' + if: success() # Only push if get login is ok PushforArgoCD: name: Update deplayment for ArgoCD runs-on: ubuntu-latest if: ${{ !cancelled() && !failure() }} - needs: Build-Test #[ UploadtoDockerHub ] + needs: [ UploadtoDockerHub ] steps: - name: Checkout code uses: actions/checkout@v2 @@ -157,7 +157,7 @@ jobs: echo $GITHUB_WORKSPACE echo $github.sha echo "===============" - IMAGE_NEWTAG=$(echo $github.sha) + IMAGE_NEWTAG=$(echo ${{ github.sha }}) echo "IMAGE_NEWTAG" echo $IMAGE_NEWTAG echo "===============" From 0abc51e1def63c5635ad92af948a127622fd2938 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 11:30:09 +0200 Subject: [PATCH 185/308] debug --- .github/workflows/github-actions-demo.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 812d58960..115de7956 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -173,7 +173,9 @@ jobs: echo "Github workspace/deploymen" ls -la $GITHUB_WORKSPACE/deployment echo "===============" - yq eval ".spec.template.spec.containers[0].image = \"dimitardd/dimitar-app02:${IMAGE_NEWTAG}\"" -i $GITHUB_WORKSPACE/deployment/sof-app01.yaml + cd $GITHUB_WORKSPACE + whereis yq + yq eval ".spec.template.spec.containers[0].image = \"dimitardd/dimitar-app02:${IMAGE_NEWTAG}\"" -i deployment/sof-app01.yaml git config --local user.email "dhd.dimitrov@gmail.com" git config --local user.name "Dimitar Dimitrov" git add $GITHUB_WORKSPACE/deployment/sof-app01.yaml From b44c349c9126cf24c02580d755676dfed9914413 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 11:35:05 +0200 Subject: [PATCH 186/308] debug --- .github/workflows/github-actions-demo.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 115de7956..7ed56a981 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -175,6 +175,7 @@ jobs: echo "===============" cd $GITHUB_WORKSPACE whereis yq + cat deployment/sof-app01.yaml yq eval ".spec.template.spec.containers[0].image = \"dimitardd/dimitar-app02:${IMAGE_NEWTAG}\"" -i deployment/sof-app01.yaml git config --local user.email "dhd.dimitrov@gmail.com" git config --local user.name "Dimitar Dimitrov" From 1c48f5082d6141e268a1adbf9e26afc8a231f3db Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 11:41:50 +0200 Subject: [PATCH 187/308] debug --- .github/workflows/github-actions-demo.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 7ed56a981..c4356203c 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -176,6 +176,7 @@ jobs: cd $GITHUB_WORKSPACE whereis yq cat deployment/sof-app01.yaml + yq eval deployment/sof-app01.yaml yq eval ".spec.template.spec.containers[0].image = \"dimitardd/dimitar-app02:${IMAGE_NEWTAG}\"" -i deployment/sof-app01.yaml git config --local user.email "dhd.dimitrov@gmail.com" git config --local user.name "Dimitar Dimitrov" From cfd402fa49d4e9ba99a6d3e2122e4942219e00fd Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 11:45:39 +0200 Subject: [PATCH 188/308] debug --- .github/workflows/github-actions-demo.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index c4356203c..3a8f638e8 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -173,11 +173,11 @@ jobs: echo "Github workspace/deploymen" ls -la $GITHUB_WORKSPACE/deployment echo "===============" - cd $GITHUB_WORKSPACE + cd $GITHUB_WORKSPACE/deployment/ whereis yq cat deployment/sof-app01.yaml - yq eval deployment/sof-app01.yaml - yq eval ".spec.template.spec.containers[0].image = \"dimitardd/dimitar-app02:${IMAGE_NEWTAG}\"" -i deployment/sof-app01.yaml + /usr/bin/yq eval sof-app01.yaml + /usr/bin/yq eval ".spec.template.spec.containers[0].image = \"dimitardd/dimitar-app02:${IMAGE_NEWTAG}\"" -i deployment/sof-app01.yaml git config --local user.email "dhd.dimitrov@gmail.com" git config --local user.name "Dimitar Dimitrov" git add $GITHUB_WORKSPACE/deployment/sof-app01.yaml From e5d31c243a1383e06da91e323d767920ff81ba40 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 11:50:25 +0200 Subject: [PATCH 189/308] debug --- .github/workflows/github-actions-demo.yml | 41 ++++++++++++----------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 3a8f638e8..de2947bd3 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -125,28 +125,28 @@ jobs: uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results-container.sarif' - UploadtoDockerHub: - name: Push container to docker hub - runs-on: ubuntu-latest - if: ${{ !cancelled() && !failure() }} - needs: [ Build-Test ] - steps: - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Push - uses: docker/build-push-action@v6 - with: - push: true - tags: '${{ env.IMAGE_TAG }}:${{ github.sha }}' - if: success() # Only push if get login is ok +# UploadtoDockerHub: +# name: Push container to docker hub +# runs-on: ubuntu-latest +# if: ${{ !cancelled() && !failure() }} +# needs: [ Build-Test ] +# steps: +# - name: Login to Docker Hub +# uses: docker/login-action@v3 +# with: +# username: ${{ secrets.DOCKERHUB_USERNAME }} +# password: ${{ secrets.DOCKERHUB_TOKEN }} +# - name: Push +# uses: docker/build-push-action@v6 +# with: +# push: true +# tags: '${{ env.IMAGE_TAG }}:${{ github.sha }}' +# if: success() # Only push if get login is ok PushforArgoCD: name: Update deplayment for ArgoCD runs-on: ubuntu-latest if: ${{ !cancelled() && !failure() }} - needs: [ UploadtoDockerHub ] + needs: Build-Test #[ UploadtoDockerHub ] steps: - name: Checkout code uses: actions/checkout@v2 @@ -175,8 +175,9 @@ jobs: echo "===============" cd $GITHUB_WORKSPACE/deployment/ whereis yq - cat deployment/sof-app01.yaml - /usr/bin/yq eval sof-app01.yaml + cat sof-app01.yaml + cat $GITHUB_WORKSPACE/deployment/sof-app01.yaml + /usr/bin/yq eval '.' sof-app01.yaml /usr/bin/yq eval ".spec.template.spec.containers[0].image = \"dimitardd/dimitar-app02:${IMAGE_NEWTAG}\"" -i deployment/sof-app01.yaml git config --local user.email "dhd.dimitrov@gmail.com" git config --local user.name "Dimitar Dimitrov" From 02c45489dd22b838b8445ab7126ac37e7eecd932 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 11:53:55 +0200 Subject: [PATCH 190/308] debug --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index de2947bd3..8e6010ffe 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -177,7 +177,7 @@ jobs: whereis yq cat sof-app01.yaml cat $GITHUB_WORKSPACE/deployment/sof-app01.yaml - /usr/bin/yq eval '.' sof-app01.yaml + /usr/bin/yq eval $GITHUB_WORKSPACE/deployment/sof-app01.yaml /usr/bin/yq eval ".spec.template.spec.containers[0].image = \"dimitardd/dimitar-app02:${IMAGE_NEWTAG}\"" -i deployment/sof-app01.yaml git config --local user.email "dhd.dimitrov@gmail.com" git config --local user.name "Dimitar Dimitrov" From 24ba7e55c1567fd3f410936975cf40ee710aad3d Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 11:59:13 +0200 Subject: [PATCH 191/308] install jq --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 8e6010ffe..2e6ba1971 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -152,7 +152,7 @@ jobs: uses: actions/checkout@v2 - name: Update sof-app01 deployment image run: | - sudo apt-get install yq -y + sudo apt-get install yq jq -y echo "===============" echo $GITHUB_WORKSPACE echo $github.sha From f7f702d15d3d80cb330d1379ce8244bd9169aaa3 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 12:02:17 +0200 Subject: [PATCH 192/308] sudo apt-get install jq --- .github/workflows/github-actions-demo.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 2e6ba1971..a47f248e4 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -152,7 +152,8 @@ jobs: uses: actions/checkout@v2 - name: Update sof-app01 deployment image run: | - sudo apt-get install yq jq -y + sudo apt-get install yq -y + sudo apt-get install jq -y echo "===============" echo $GITHUB_WORKSPACE echo $github.sha From 941b9688dc49c0ba16b20b03001eeed0171bba54 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 12:02:36 +0200 Subject: [PATCH 193/308] fix --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index a47f248e4..d5c988c51 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -153,7 +153,7 @@ jobs: - name: Update sof-app01 deployment image run: | sudo apt-get install yq -y - sudo apt-get install jq -y + sudo apt-get install jq -y echo "===============" echo $GITHUB_WORKSPACE echo $github.sha From 7a763bbf8cb80e33884b54389740f1abbe204f29 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 12:07:04 +0200 Subject: [PATCH 194/308] debug --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index d5c988c51..e7336fa88 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -167,7 +167,7 @@ jobs: echo "===============" echo "Github workspace" ls -la $GITHUB_WORKSPACE - echo "====================" + echo "================" echo "PWD command" pwd echo "===============" From f2db8724c31aad88995eb9f065be01233a128d2c Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 12:20:37 +0200 Subject: [PATCH 195/308] debug --- .github/workflows/github-actions-demo.yml | 27 ++--------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index e7336fa88..868876c11 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -152,32 +152,9 @@ jobs: uses: actions/checkout@v2 - name: Update sof-app01 deployment image run: | - sudo apt-get install yq -y + #sudo apt-get install yq -y + sudo snap install yq sudo apt-get install jq -y - echo "===============" - echo $GITHUB_WORKSPACE - echo $github.sha - echo "===============" - IMAGE_NEWTAG=$(echo ${{ github.sha }}) - echo "IMAGE_NEWTAG" - echo $IMAGE_NEWTAG - echo "===============" - echo "cd to hithub_workspace" - cd $GITHUB_WORKSPACE - echo "===============" - echo "Github workspace" - ls -la $GITHUB_WORKSPACE - echo "================" - echo "PWD command" - pwd - echo "===============" - echo "Github workspace/deploymen" - ls -la $GITHUB_WORKSPACE/deployment - echo "===============" - cd $GITHUB_WORKSPACE/deployment/ - whereis yq - cat sof-app01.yaml - cat $GITHUB_WORKSPACE/deployment/sof-app01.yaml /usr/bin/yq eval $GITHUB_WORKSPACE/deployment/sof-app01.yaml /usr/bin/yq eval ".spec.template.spec.containers[0].image = \"dimitardd/dimitar-app02:${IMAGE_NEWTAG}\"" -i deployment/sof-app01.yaml git config --local user.email "dhd.dimitrov@gmail.com" From be8d5b4a5f1fe6bdfced102b3354a39ecc29089d Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 12:29:33 +0200 Subject: [PATCH 196/308] configure git commit to deployment folder --- .github/workflows/github-actions-demo.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 868876c11..bde87c292 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -152,16 +152,14 @@ jobs: uses: actions/checkout@v2 - name: Update sof-app01 deployment image run: | - #sudo apt-get install yq -y sudo snap install yq - sudo apt-get install jq -y - /usr/bin/yq eval $GITHUB_WORKSPACE/deployment/sof-app01.yaml + apt-get install git -y /usr/bin/yq eval ".spec.template.spec.containers[0].image = \"dimitardd/dimitar-app02:${IMAGE_NEWTAG}\"" -i deployment/sof-app01.yaml git config --local user.email "dhd.dimitrov@gmail.com" git config --local user.name "Dimitar Dimitrov" git add $GITHUB_WORKSPACE/deployment/sof-app01.yaml git commit -m "Update image to ${{ github.sha }}" - git push origin main + git push origin dimitardd-281024 env: github_token: ${{ secrets.GIT_TOKEN }} GITHUB_SHA: ${{ github.sha }} From 16f8863edb5d936e95be1ca6ffff6373b29bb222 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 12:31:59 +0200 Subject: [PATCH 197/308] missing sudo --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index bde87c292..674e493a0 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -153,7 +153,7 @@ jobs: - name: Update sof-app01 deployment image run: | sudo snap install yq - apt-get install git -y + sudo apt-get install git -y /usr/bin/yq eval ".spec.template.spec.containers[0].image = \"dimitardd/dimitar-app02:${IMAGE_NEWTAG}\"" -i deployment/sof-app01.yaml git config --local user.email "dhd.dimitrov@gmail.com" git config --local user.name "Dimitar Dimitrov" From 17b4e5e9d899980917e9b31af566ae63cdddfa9d Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 10:34:29 +0000 Subject: [PATCH 198/308] Update image to 16f8863edb5d936e95be1ca6ffff6373b29bb222 --- deployment/sof-app01.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 1b4f6aef9..50ebc56cc 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -17,9 +17,9 @@ spec: spec: containers: - name: sof-app01 - image: dimitardd/dimitar-app02:4d8f5c0aba5f446b4822a1b79c561c3e18850cba -# image: dimitardd/dimitar-app02:4d8f5c0aba5f446b4822a1b79c561c3e18850cba #Green -# image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 #Blue + image: 'dimitardd/dimitar-app02:' + # image: dimitardd/dimitar-app02:4d8f5c0aba5f446b4822a1b79c561c3e18850cba #Green + # image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 #Blue ports: - containerPort: 3000 resources: From 7dd2931c50841186428927a9bd224571d90ef9b9 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 12:36:22 +0200 Subject: [PATCH 199/308] enable full action plan --- .github/workflows/github-actions-demo.yml | 126 +++++++++++----------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 674e493a0..019b18a26 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -60,55 +60,55 @@ jobs: run: | cd app python -m unittest app_test.py -# CheckforSecrets: -# needs: UnitTest -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v4 -# with: -# fetch-depth: 0 -# - name: Gitleaks scan -# uses: gitleaks/gitleaks-action@v2 -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# TrivySecurity: -# runs-on: ubuntu-latest -# needs: UnitTest -# steps: -# - uses: actions/checkout@v4 -# - name: Trivy Vulnerability Scan -# uses: aquasecurity/trivy-action@master -# with: -# scan-type: 'fs' -# ignore-unfixed: true -# format: 'sarif' -# output: 'trivy-output.sarif' -# severity: 'CRITICAL' -# - name: Trivy Scan Output -# uses: github/codeql-action/upload-sarif@v3 -# with: -# sarif_file: 'trivy-output.sarif' -# SonarcloudSecurity: -# runs-on: ubuntu-latest -# needs: UnitTest -# steps: -# - uses: actions/checkout@v4 -# with: -# fetch-depth: 0 -# - name: SonarCloud Scan -# uses: sonarsource/sonarcloud-github-action@master -# env: -# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} -# with: -# projectBaseDir: app -# args: > -# -Dsonar.projectKey=dimitardd_devops-programme -# -Dsonar.organization=dimitardd + CheckforSecrets: + needs: UnitTest + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Gitleaks scan + uses: gitleaks/gitleaks-action@v2 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + TrivySecurity: + runs-on: ubuntu-latest + needs: UnitTest + steps: + - uses: actions/checkout@v4 + - name: Trivy Vulnerability Scan + uses: aquasecurity/trivy-action@master + with: + scan-type: 'fs' + ignore-unfixed: true + format: 'sarif' + output: 'trivy-output.sarif' + severity: 'CRITICAL' + - name: Trivy Scan Output + uses: github/codeql-action/upload-sarif@v3 + with: + sarif_file: 'trivy-output.sarif' + SonarcloudSecurity: + runs-on: ubuntu-latest + needs: UnitTest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: SonarCloud Scan + uses: sonarsource/sonarcloud-github-action@master + env: + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + with: + projectBaseDir: app + args: > + -Dsonar.projectKey=dimitardd_devops-programme + -Dsonar.organization=dimitardd Build-Test: name: Build Image and Test runs-on: ubuntu-latest if: ${{ !cancelled() && !failure() }} - needs: UnitTest #[ SonarcloudSecurity, TrivySecurity, CheckforSecrets ] + needs: [ SonarcloudSecurity, TrivySecurity, CheckforSecrets ] steps: - name: Checkout code uses: actions/checkout@v4 @@ -125,28 +125,28 @@ jobs: uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results-container.sarif' -# UploadtoDockerHub: -# name: Push container to docker hub -# runs-on: ubuntu-latest -# if: ${{ !cancelled() && !failure() }} -# needs: [ Build-Test ] -# steps: -# - name: Login to Docker Hub -# uses: docker/login-action@v3 -# with: -# username: ${{ secrets.DOCKERHUB_USERNAME }} -# password: ${{ secrets.DOCKERHUB_TOKEN }} -# - name: Push -# uses: docker/build-push-action@v6 -# with: -# push: true -# tags: '${{ env.IMAGE_TAG }}:${{ github.sha }}' -# if: success() # Only push if get login is ok + UploadtoDockerHub: + name: Push container to docker hub + runs-on: ubuntu-latest + if: ${{ !cancelled() && !failure() }} + needs: [ Build-Test ] + steps: + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Push + uses: docker/build-push-action@v6 + with: + push: true + tags: '${{ env.IMAGE_TAG }}:${{ github.sha }}' + if: success() # Only push if get login is ok PushforArgoCD: name: Update deplayment for ArgoCD runs-on: ubuntu-latest if: ${{ !cancelled() && !failure() }} - needs: Build-Test #[ UploadtoDockerHub ] + needs: [ UploadtoDockerHub ] steps: - name: Checkout code uses: actions/checkout@v2 From a49c490ed14ef9dc357059be24606c97feae375d Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 12:49:23 +0200 Subject: [PATCH 200/308] addig image new tag in deplayment --- .github/workflows/github-actions-demo.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 019b18a26..b002e9861 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -5,10 +5,10 @@ on: paths-ignore: - 'deployment/*' - 'terraform/*' + - 'rollout/*' branches: - main - dimitardd-281024 - env: IMAGE_TAG: dimitardd/dimitar-app02 jobs: @@ -154,6 +154,7 @@ jobs: run: | sudo snap install yq sudo apt-get install git -y + IMAGE_NEWTAG=$(echo ${{ github.sha }}) /usr/bin/yq eval ".spec.template.spec.containers[0].image = \"dimitardd/dimitar-app02:${IMAGE_NEWTAG}\"" -i deployment/sof-app01.yaml git config --local user.email "dhd.dimitrov@gmail.com" git config --local user.name "Dimitar Dimitrov" From 89c68d1b74accf6703c5f8ec76f4c25cc3b8cccc Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 10:52:49 +0000 Subject: [PATCH 201/308] Update image to a49c490ed14ef9dc357059be24606c97feae375d --- deployment/sof-app01.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 50ebc56cc..d15f74f24 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: sof-app01 - image: 'dimitardd/dimitar-app02:' + image: 'dimitardd/dimitar-app02:a49c490ed14ef9dc357059be24606c97feae375d' # image: dimitardd/dimitar-app02:4d8f5c0aba5f446b4822a1b79c561c3e18850cba #Green # image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 #Blue ports: From caf49815455a57883f06850a22703b9bd44ef66a Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 12:56:43 +0200 Subject: [PATCH 202/308] enable green imag in sof-app01 --- deployment/sof-app01.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index d15f74f24..8804bee3e 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -17,9 +17,9 @@ spec: spec: containers: - name: sof-app01 - image: 'dimitardd/dimitar-app02:a49c490ed14ef9dc357059be24606c97feae375d' - # image: dimitardd/dimitar-app02:4d8f5c0aba5f446b4822a1b79c561c3e18850cba #Green - # image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 #Blue +# image: 'dimitardd/dimitar-app02:a49c490ed14ef9dc357059be24606c97feae375d' + image: dimitardd/dimitar-app02:4d8f5c0aba5f446b4822a1b79c561c3e18850cba #Green +# image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 #Blue ports: - containerPort: 3000 resources: From 077cd1c0cafbc864fc999b40a8ebace3e4b3ef7a Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 14:39:55 +0200 Subject: [PATCH 203/308] PrometheusMetrics implementation --- Dockerfile | 3 ++- app/app.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d4295163e..addd517da 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,9 +6,10 @@ LABEL version="4.19" RUN apt-get update -y && \ apt-get install -y --no-install-recommends \ python3 \ + prometheus_flask_exporter \ python3-pip && \ apt-get clean && \ - groupadd -r appgroup && \ + groupadd -r appgroup && \ useradd -r -g appgroup appuser WORKDIR /app diff --git a/app/app.py b/app/app.py index 67e0180c0..c5760d962 100644 --- a/app/app.py +++ b/app/app.py @@ -1,9 +1,10 @@ import os from flask import Flask +from prometheus_flask_exporter import PrometheusMetrics app = Flask(__name__) - +metrics = PrometheusMetrics(app) @app.route("/") def hello_world(): From e275101eaa3e8beb5a291940ab985aac47750902 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 14:44:11 +0200 Subject: [PATCH 204/308] Installing prometheus for application --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index addd517da..3c1596f86 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,11 @@ FROM ubuntu:22.04 LABEL maintainer="dhd.dimitrov@gmail.com" -LABEL version="4.19" +LABEL version="5.0" RUN apt-get update -y && \ apt-get install -y --no-install-recommends \ python3 \ - prometheus_flask_exporter \ python3-pip && \ apt-get clean && \ groupadd -r appgroup && \ @@ -16,7 +15,8 @@ WORKDIR /app COPY --chown=appuser:appgroup --chmod=755 ./app . -RUN pip3 install flask==3.0.0 +RUN pip3 install flask==3.0.0 && \ + pip install prometheus_flask_exporter USER appuser From 1c2d64a2e96f0da4b8359eb5b12bed1b9ba06509 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 14:47:28 +0200 Subject: [PATCH 205/308] installing prometheus --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3c1596f86..4bff47270 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ WORKDIR /app COPY --chown=appuser:appgroup --chmod=755 ./app . RUN pip3 install flask==3.0.0 && \ - pip install prometheus_flask_exporter + pip3 install prometheus_flask_exporter USER appuser From b22bb0678cf81d22a2706c0ca444558b6ecaf07a Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 14:59:04 +0200 Subject: [PATCH 206/308] trying to install prometheus_flask_exporter --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4bff47270..1286d0abe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,8 +15,7 @@ WORKDIR /app COPY --chown=appuser:appgroup --chmod=755 ./app . -RUN pip3 install flask==3.0.0 && \ - pip3 install prometheus_flask_exporter +RUN pip3 install flask==3.0.0 prometheus_flask_exporter USER appuser From 5c96d23643edffbdc8484709fcc0e8f0128be229 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 15:00:50 +0200 Subject: [PATCH 207/308] installing prometheus_flask_exporter --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index b002e9861..d501db68e 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -29,7 +29,7 @@ jobs: python-version: '3.10' cache: 'pip' - run: | - pip install pylint black flake8 flask + pip install pylint black flake8 flask prometheus_flask_exporter npm install -g markdownlint-cli editorconfig-checker - name: Check Editorconfig run: editorconfig-checker From 75b29cc938e5a7197eb281c9f87c5f5838048228 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 15:13:19 +0200 Subject: [PATCH 208/308] unittest fix for prometheus_flask_exporter --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index d501db68e..cbfdb345f 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -55,7 +55,7 @@ jobs: python-version: '3.10' cache: 'pip' - run: | - pip install flask + pip install flask prometheus_flask_exporter - name: Run app test run: | cd app From e9b147615168603c274eb582939dce4df3031894 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 13:16:38 +0000 Subject: [PATCH 209/308] Update image to 75b29cc938e5a7197eb281c9f87c5f5838048228 --- deployment/sof-app01.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 8804bee3e..7f0e39df9 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -17,9 +17,9 @@ spec: spec: containers: - name: sof-app01 -# image: 'dimitardd/dimitar-app02:a49c490ed14ef9dc357059be24606c97feae375d' - image: dimitardd/dimitar-app02:4d8f5c0aba5f446b4822a1b79c561c3e18850cba #Green -# image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 #Blue + # image: 'dimitardd/dimitar-app02:a49c490ed14ef9dc357059be24606c97feae375d' + image: dimitardd/dimitar-app02:75b29cc938e5a7197eb281c9f87c5f5838048228 #Green + # image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 #Blue ports: - containerPort: 3000 resources: From 56b6807bbb67769d7bfa9c27f7708e85a3089b8d Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 15:58:43 +0200 Subject: [PATCH 210/308] build new Green image with prometheus --- app/app.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/app.py b/app/app.py index c5760d962..c2973f236 100644 --- a/app/app.py +++ b/app/app.py @@ -1,15 +1,14 @@ import os -from flask import Flask -from prometheus_flask_exporter import PrometheusMetrics +from flask import Flask # type: ignore +from prometheus_flask_exporter import PrometheusMetrics # type: ignore app = Flask(__name__) metrics = PrometheusMetrics(app) @app.route("/") def hello_world(): - return "Hello, World!" - + return "Hello, Green World!" if __name__ == "__main__": app.run(port=os.environ.get("PORT", 3000), host="0.0.0.0") From b07c7bf5c0df29652dd1c86ec06463770388fb98 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 16:00:27 +0200 Subject: [PATCH 211/308] fix app test Green image with prometheus --- app/app_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/app_test.py b/app/app_test.py index a1b1bacb2..e7a6b3888 100644 --- a/app/app_test.py +++ b/app/app_test.py @@ -10,7 +10,7 @@ def setUp(self): def test_hello_world(self): response = self.client.get("/") self.assertEqual(response.status_code, 200) - self.assertEqual(response.data, b"Hello, World!") + self.assertEqual(response.data, b"Hello, Green World!") if __name__ == "__main__": From 9bea76c0f117cac81b6798f1a243a211ca5ca555 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 14:04:12 +0000 Subject: [PATCH 212/308] Update image to b07c7bf5c0df29652dd1c86ec06463770388fb98 --- deployment/sof-app01.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 7f0e39df9..b52fa55b9 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -18,7 +18,7 @@ spec: containers: - name: sof-app01 # image: 'dimitardd/dimitar-app02:a49c490ed14ef9dc357059be24606c97feae375d' - image: dimitardd/dimitar-app02:75b29cc938e5a7197eb281c9f87c5f5838048228 #Green + image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green # image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 #Blue ports: - containerPort: 3000 From 57bb7e9bcd3546159be0917df7e87526d8170140 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 16:07:32 +0200 Subject: [PATCH 213/308] Build new Blue image with prometheus --- app/app.py | 2 +- app/app_test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/app.py b/app/app.py index c2973f236..f7effa32b 100644 --- a/app/app.py +++ b/app/app.py @@ -8,7 +8,7 @@ @app.route("/") def hello_world(): - return "Hello, Green World!" + return "Hello, Blue World!" if __name__ == "__main__": app.run(port=os.environ.get("PORT", 3000), host="0.0.0.0") diff --git a/app/app_test.py b/app/app_test.py index e7a6b3888..d67c26993 100644 --- a/app/app_test.py +++ b/app/app_test.py @@ -10,7 +10,7 @@ def setUp(self): def test_hello_world(self): response = self.client.get("/") self.assertEqual(response.status_code, 200) - self.assertEqual(response.data, b"Hello, Green World!") + self.assertEqual(response.data, b"Hello, Blue World!") if __name__ == "__main__": From 9fa8e26cc494fd1cc6a81d55bca2717b2959d84f Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 14:11:01 +0000 Subject: [PATCH 214/308] Update image to 57bb7e9bcd3546159be0917df7e87526d8170140 --- deployment/sof-app01.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index b52fa55b9..607ed4a8f 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -18,7 +18,7 @@ spec: containers: - name: sof-app01 # image: 'dimitardd/dimitar-app02:a49c490ed14ef9dc357059be24606c97feae375d' - image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green + image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Green # image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 #Blue ports: - containerPort: 3000 From 06a2612d8d82b6bf02c7bf358bec0a3277dee41b Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 16:16:15 +0200 Subject: [PATCH 215/308] manualy deploy sof-app01 Blue image --- deployment/sof-app01.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 607ed4a8f..76356a6c2 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -17,9 +17,9 @@ spec: spec: containers: - name: sof-app01 - # image: 'dimitardd/dimitar-app02:a49c490ed14ef9dc357059be24606c97feae375d' - image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Green - # image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 #Blue +# image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Auto deplayed from build +# image: 'dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green + image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue ports: - containerPort: 3000 resources: From b0444630c0e33d1b070656fa5327a2e6ad2f6582 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 16:21:05 +0200 Subject: [PATCH 216/308] deplay Green image in sof-app01 --- deployment/sof-app01.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 76356a6c2..aef2cc911 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -18,8 +18,8 @@ spec: containers: - name: sof-app01 # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Auto deplayed from build -# image: 'dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green - image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue + image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green +# image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue ports: - containerPort: 3000 resources: From 59f79b1022a24613d71a62548ac6d8b99796b881 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 16:24:34 +0200 Subject: [PATCH 217/308] update sof-app01 up to 15 replicas --- deployment/sof-app01.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index aef2cc911..412589cb2 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -6,7 +6,7 @@ metadata: labels: app: sof-app01 spec: - replicas: 3 + replicas: 15 selector: matchLabels: app: sof-app01 From 8eddf7a766b1f2b72f28cb05ec142094733c2734 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 16:30:18 +0200 Subject: [PATCH 218/308] switch to Blue image in sof-app01 --- deployment/sof-app01.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 412589cb2..d79b17f04 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -18,8 +18,8 @@ spec: containers: - name: sof-app01 # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Auto deplayed from build - image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green -# image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue +# image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green + image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue ports: - containerPort: 3000 resources: From 7274b3a981a8d9d3d411248a8fcb8cc4fcc1a61d Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 16:42:54 +0200 Subject: [PATCH 219/308] update image in rollouts for blue and green --- rollout/sof-app02.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rollout/sof-app02.yaml b/rollout/sof-app02.yaml index 8700c8f83..86743b7e9 100644 --- a/rollout/sof-app02.yaml +++ b/rollout/sof-app02.yaml @@ -26,8 +26,8 @@ spec: spec: containers: - name: sof-app02 - image: dimitardd/dimitar-app02:4d8f5c0aba5f446b4822a1b79c561c3e18850cba #Green -# image: dimitardd/dimitar-app02:4fb3e4a57b0eb02324905c3cd293a83754a32057 #Blue + image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green +# image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue ports: - name: http containerPort: 3000 From 16503b5be8783100547557c645e270fd5efa90ef Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 16 Jan 2025 16:45:48 +0200 Subject: [PATCH 220/308] sof-app02 with Blue image and prometheus --- rollout/sof-app02.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rollout/sof-app02.yaml b/rollout/sof-app02.yaml index 86743b7e9..740ac20f9 100644 --- a/rollout/sof-app02.yaml +++ b/rollout/sof-app02.yaml @@ -26,8 +26,8 @@ spec: spec: containers: - name: sof-app02 - image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green -# image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue +# image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green + image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue ports: - name: http containerPort: 3000 From ec15dad28624746795980408bdd8a4bb7b2c04c3 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 08:25:41 +0200 Subject: [PATCH 221/308] sof-app01 latest image --- deployment/sof-app01.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index d79b17f04..ba1218197 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -17,9 +17,9 @@ spec: spec: containers: - name: sof-app01 -# image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Auto deplayed from build + image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Auto deplayed from build # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green - image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue +# image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue ports: - containerPort: 3000 resources: From 774321bade5a14152f59d1fe5f81bb98e89bd6f5 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 08:34:12 +0200 Subject: [PATCH 222/308] scale down sof-app01 to 9 --- deployment/sof-app01.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index ba1218197..86b8b55fe 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -6,7 +6,7 @@ metadata: labels: app: sof-app01 spec: - replicas: 15 + replicas: 9 selector: matchLabels: app: sof-app01 From e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 09:40:29 +0200 Subject: [PATCH 223/308] build Yellow image --- app/app.py | 2 +- app/app_test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/app.py b/app/app.py index f7effa32b..422d5a341 100644 --- a/app/app.py +++ b/app/app.py @@ -8,7 +8,7 @@ @app.route("/") def hello_world(): - return "Hello, Blue World!" + return "Hello, Yellow World!" if __name__ == "__main__": app.run(port=os.environ.get("PORT", 3000), host="0.0.0.0") diff --git a/app/app_test.py b/app/app_test.py index d67c26993..f1e94a5ee 100644 --- a/app/app_test.py +++ b/app/app_test.py @@ -10,7 +10,7 @@ def setUp(self): def test_hello_world(self): response = self.client.get("/") self.assertEqual(response.status_code, 200) - self.assertEqual(response.data, b"Hello, Blue World!") + self.assertEqual(response.data, b"Hello, Yellow World!") if __name__ == "__main__": From 3dcd8ffd7bb7d500093a94414e82173667ee152c Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 07:43:50 +0000 Subject: [PATCH 224/308] Update image to e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 --- deployment/sof-app01.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 86b8b55fe..32b407c19 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -17,9 +17,9 @@ spec: spec: containers: - name: sof-app01 - image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Auto deplayed from build -# image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green -# image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue + image: dimitardd/dimitar-app02:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Auto deplayed from build + # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green + # image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue ports: - containerPort: 3000 resources: From 8fd27256783b3cde8709a8b1a281695321f8c5ea Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 10:08:42 +0200 Subject: [PATCH 225/308] added Yellow image --- deployment/sof-app01.yaml | 3 ++- rollout/sof-app02.yaml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 32b407c19..dd3cc271a 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -19,7 +19,8 @@ spec: - name: sof-app01 image: dimitardd/dimitar-app02:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Auto deplayed from build # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green - # image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue + # image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue + # image: dimitardd/dimitar-app01:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Yellow ports: - containerPort: 3000 resources: diff --git a/rollout/sof-app02.yaml b/rollout/sof-app02.yaml index 740ac20f9..2db008f89 100644 --- a/rollout/sof-app02.yaml +++ b/rollout/sof-app02.yaml @@ -28,6 +28,7 @@ spec: - name: sof-app02 # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue +# image: dimitardd/dimitar-app01:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Yellow ports: - name: http containerPort: 3000 From edae683661620a0afce491d90ecd7105f22c952a Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 14:35:19 +0200 Subject: [PATCH 226/308] sof-app01 Bllue image deplayment --- deployment/sof-app01.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index dd3cc271a..aa4a50a55 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -17,9 +17,9 @@ spec: spec: containers: - name: sof-app01 - image: dimitardd/dimitar-app02:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Auto deplayed from build +# image: dimitardd/dimitar-app02:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Auto deplayed from build # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green - # image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue + image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue # image: dimitardd/dimitar-app01:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Yellow ports: - containerPort: 3000 From 8c23f1ff5049cfa2f6ae84458e336b54513443c6 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 14:39:51 +0200 Subject: [PATCH 227/308] deplay Green image to sof-app01 --- deployment/sof-app01.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index aa4a50a55..3247cf256 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -18,8 +18,8 @@ spec: containers: - name: sof-app01 # image: dimitardd/dimitar-app02:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Auto deplayed from build - # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green - image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue + image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green + # image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue # image: dimitardd/dimitar-app01:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Yellow ports: - containerPort: 3000 From e24d2e166d97a1629642e192e999c1b9604c532e Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 15:06:18 +0200 Subject: [PATCH 228/308] add readme.md files --- README.md | 107 +++++++------------------------------------- terraform/README.md | 21 ++++----- 2 files changed, 26 insertions(+), 102 deletions(-) diff --git a/README.md b/README.md index be3d51d63..d815edc2c 100644 --- a/README.md +++ b/README.md @@ -1,97 +1,24 @@ -# devops-programme # GitHub Actions Demo -This repository demonstrates a CI/CD pipeline using GitHub Actions. The actions defined in this workflow cover code quality checks, testing, security scanning, and deploying a Docker container to Docker Hub. +This repository demonstrates a CI/CD pipeline using GitHub Actions. The workflow includes code quality checks, unit testing, security scans, and deployment processes to Docker Hub and ArgoCD. -## Workflow Overview +## Overview -The pipeline consists of several jobs that are executed in sequence based on dependencies. The jobs include: +The GitHub Actions workflow is triggered on pushes to the `main` and `dimitardd-281024` branches, excluding changes in the `deployment/`, `terraform/`, and `rollout/` directories. It performs the following tasks: -1. **Pylint**: Checks the code quality using Pylint, MarkdownLint, and EditorConfig. -2. **UnitTest**: Runs unit tests using Python's `unittest` framework. -3. **CheckforSecrets**: Scans the repository for potential sensitive information using Gitleaks. -4. **TrivySecurity**: Performs a vulnerability scan on the repository using Trivy. -5. **SonarcloudSecurity**: Conducts a code quality and security analysis through SonarCloud. -6. **Build-Test**: Builds a Docker image and runs a vulnerability scan on it. -7. **Deploy**: Pushes the Docker image to Docker Hub. +1. **Code Analysis**: Checks code quality using tools like Pylint, Black, Flake8, and Markdownlint. +2. **Unit Testing**: Runs unit tests for the application. +3. **Secret Scanning**: Scans the codebase for sensitive information. +4. **Security Scanning**: Uses Trivy to scan for vulnerabilities in the application and Docker images. +5. **Deployment**: Builds Docker images, pushes them to Docker Hub, and updates the ArgoCD deployment. -## Workflow Trigger +## Prerequisites -This workflow is triggered on every `push` event to the repository. - -## Environment Variables - -- `IMAGE_TAG`: The Docker image tag to be used for building the application. - -## Job Details - -### Pylint - -- **Runs on**: `ubuntu-latest` -- **Steps**: - - Check out the repository. - - Set up Node.js and Python environments. - - Install necessary dependencies (Pylint, Black, Flake8, Flask, MarkdownLint). - - Check for EditorConfig compliance. - - Analyze Python code with Pylint. - - Configure and run MarkdownLint. - -### UnitTest - -- **Needs**: `Pylint` -- **Runs on**: `ubuntu-latest` -- **Steps**: - - Check out the repository. - - Set up the Python environment. - - Install Flask. - - Run unit tests located in the `app` directory. - -### CheckforSecrets - -- **Needs**: `UnitTest` -- **Runs on**: `ubuntu-latest` -- **Steps**: - - Check out the repository. - - Perform a Gitleaks scan to identify potential secrets in the codebase. - -### TrivySecurity - -- **Needs**: `UnitTest` -- **Runs on**: `ubuntu-latest` -- **Steps**: - - Check out the repository. - - Run a Trivy vulnerability scan and output results in SARIF format. - - Upload the Trivy scan results to the GitHub Security tab. - -### SonarcloudSecurity - -- **Needs**: `UnitTest` -- **Runs on**: `ubuntu-latest` -- **Steps**: - - Check out the repository. - - Run a SonarCloud analysis with the specified project key and organization. - -### Build-Test - -- **Needs**: `[ SonarcloudSecurity, TrivySecurity, CheckforSecrets ]` -- **Runs on**: `ubuntu-latest` -- **Steps**: - - Check out the code. - - Build a Docker image from the Dockerfile. - - Run a Trivy vulnerability scan on the built Docker image. - - Upload the Trivy scan results to the GitHub Security tab. - -### Deploy - -- **Needs**: `[ Build-Test ]` -- **Runs on**: `ubuntu-latest` -- **Steps**: - - Log in to Docker Hub using credentials stored in GitHub Secrets. - - Push the Docker image to Docker Hub. - -## Requirements - -- Ensure that you set up the necessary GitHub Secrets: - - `DOCKERHUB_USERNAME`: Your Docker Hub username. - - `DOCKERHUB_TOKEN`: Your Docker Hub access token. - - `SONAR_TOKEN`: Your SonarCloud token. +- A GitHub repository where you can add this workflow. +- Docker Hub account for pushing container images. +- Secrets set up in GitHub repository settings: + - `GITHUB_TOKEN` + - `SONAR_TOKEN` + - `DOCKERHUB_USERNAME` + - `DOCKERHUB_TOKEN` + - `GIT_TOKEN` diff --git a/terraform/README.md b/terraform/README.md index bc925ea62..b10508e28 100644 --- a/terraform/README.md +++ b/terraform/README.md @@ -14,10 +14,10 @@ This repository contains Terraform code for deploying ArgoCD and Argo Rollouts u 1. **Clone the Repository**: Clone this repository to your local machine. - ```bash - git clone - cd - ``` + + git clone https://github.com/dimitardd/devops-programme.git + cd devops-programme + 2. **Configure Kubernetes Context**: Ensure your Kubernetes configuration is set up correctly. The configuration file is expected to be located at `~/.kube/sof-lab03`. @@ -33,23 +33,21 @@ This repository contains Terraform code for deploying ArgoCD and Argo Rollouts u 5. **Initialize Terraform**: Run the following command to initialize Terraform, which will download the necessary providers: - ```bash terraform init - ``` 6. **Plan the Deployment**: Generate an execution plan to review the resources that will be created: - ```bash + terraform plan - ``` + 7. **Apply the Configuration**: Apply the Terraform configuration to deploy the Helm charts: - ```bash + terraform apply - ``` + Confirm the action when prompted. @@ -86,9 +84,8 @@ This repository contains Terraform code for deploying ArgoCD and Argo Rollouts u To remove the deployed resources, you can run: -```bash + terraform destroy -``` ## License From 9309e81cf5921ff34dd4ef7626186bcf10b25a24 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 15:24:48 +0200 Subject: [PATCH 229/308] sof-app01 blue image --- deployment/sof-app01.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 3247cf256..80ac6c788 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -18,8 +18,8 @@ spec: containers: - name: sof-app01 # image: dimitardd/dimitar-app02:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Auto deplayed from build - image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green - # image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue +# image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green + image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue # image: dimitardd/dimitar-app01:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Yellow ports: - containerPort: 3000 From faf4337bf67486635cb2668803362eb0653850aa Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 15:26:25 +0200 Subject: [PATCH 230/308] build fresh image --- app/app.py | 2 +- app/app_test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/app.py b/app/app.py index 422d5a341..01e8950b9 100644 --- a/app/app.py +++ b/app/app.py @@ -8,7 +8,7 @@ @app.route("/") def hello_world(): - return "Hello, Yellow World!" + return "Hello, Fresh World!" if __name__ == "__main__": app.run(port=os.environ.get("PORT", 3000), host="0.0.0.0") diff --git a/app/app_test.py b/app/app_test.py index f1e94a5ee..b04f84959 100644 --- a/app/app_test.py +++ b/app/app_test.py @@ -10,7 +10,7 @@ def setUp(self): def test_hello_world(self): response = self.client.get("/") self.assertEqual(response.status_code, 200) - self.assertEqual(response.data, b"Hello, Yellow World!") + self.assertEqual(response.data, b"Hello, Fresh World!") if __name__ == "__main__": From 00cf48aeac0bda1ae384912df175205bcfc69b36 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 16:02:15 +0200 Subject: [PATCH 231/308] sof-app01 tls update --- deployment/sof-app01-secret.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/deployment/sof-app01-secret.yaml b/deployment/sof-app01-secret.yaml index c1176663a..4e0cb7452 100644 --- a/deployment/sof-app01-secret.yaml +++ b/deployment/sof-app01-secret.yaml @@ -5,5 +5,6 @@ metadata: namespace: sof-app01 type: kubernetes.io/tls data: - tls.crt: QmFnIEF0dHJpYnV0ZXMKICAgIGxvY2FsS2V5SUQ6IDAxIDAwIDAwIDAwIAogICAgZnJpZW5kbHlOYW1lOiBzb2YtYXBwMDEKc3ViamVjdD1DTiA9IHNvZi1hcHAwMS5wdC5wbGF5dGVjaC5jb3JwLCBDTiA9IHNvZi1hcHAwMQppc3N1ZXI9REMgPSBjb3JwLCBEQyA9IHBsYXl0ZWNoLCBEQyA9IHB0LCBDTiA9IFBUIEdsb2JhbCBDQQotLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KTUlJR3B6Q0NCWStnQXdJQkFnSVRNZ0JPMVZpTzMvSjc5bmQxL3dBQ0FFN1ZXREFOQmdrcWhraUc5dzBCQVFzRgpBREJiTVJRd0VnWUtDWkltaVpQeUxHUUJHUllFWTI5eWNERVlNQllHQ2dtU0pvbVQ4aXhrQVJrV0NIQnNZWGwwClpXTm9NUkl3RUFZS0NaSW1pWlB5TEdRQkdSWUNjSFF4RlRBVEJnTlZCQU1UREZCVUlFZHNiMkpoYkNCRFFUQWUKRncweU5UQXhNVFV3T0RFd01qTmFGdzB5TnpBeE1UVXdPREV3TWpOYU1Ea3hJekFoQmdOVkJBTVRHbk52WmkxaApjSEF3TVM1d2RDNXdiR0Y1ZEdWamFDNWpiM0p3TVJJd0VBWURWUVFERXdsemIyWXRZWEJ3TURFd2dnRWlNQTBHCkNTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFDdERWaThTNGhHMmlldmZSNVVQU3UwOUphT1FBUmoKSGhraXBFQ2wxdnNSTGptMlg0UVdGcDNXajBmOVhuejR0L3NUaDMzUEpVUWhpNkFJNUxSaHA5WWZhaVAwWVBHbgpLOURpVkJCc09EQ2pULzRFYklab0hobGp2Ym4wQWo2QkRHQW1ETFkzUGNBRVZkTmxKb1lLSnRwd2FkRFJwNjJyCklQOTNGbHhNMnVZYzM1YTFXWkoxWG5MUDV1NXRvOUppZVdxTWt6bGM5QnJYSm5YcGEzaVQ3bCtudTlWNUU5cWQKRkw4ZjZQc0dKWi9kZ2RQTDE3eHNyNFlERWhNMm42Qi8zRmVNaFpvVDB1dlp4STEzRk1GbnRJZFhuWHh2aEFQRwplTHBZWmZlQjNKWWthSSsvZHQrOW5vNndrNFNXL3JHZjZWc1Rjbkp3TklpS2MyMFY4dWRtVDBFWkFnTUJBQUdqCmdnT0VNSUlEZ0RBOUJna3JCZ0VFQVlJM0ZRY0VNREF1QmlZckJnRUVBWUkzRlFpRThKUUxoK1MwZllYMWpUajMKcEUyQng1UnlnUnFHNDYwRmhiL0ZUZ0lCWkFJQklEQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBVEFMQmdOVgpIUThFQkFNQ0JMQXdHd1lKS3dZQkJBR0NOeFVLQkE0d0REQUtCZ2dyQmdFRkJRY0RBVEFkQmdOVkhRNEVGZ1FVClZiWWFLOVQwMk5YTzcvMXlwc3ZmYTZxazZROHdNQVlEVlIwUkJDa3dKNElhYzI5bUxXRndjREF4TG5CMExuQnMKWVhsMFpXTm9MbU52Y25DQ0NYTnZaaTFoY0hBd01UQWZCZ05WSFNNRUdEQVdnQlJRQnJXaU1yWloyb2tUSzg0RwpkVUZRMGtMRlVEQ0NBVnNHQTFVZEh3U0NBVkl3Z2dGT01JSUJTcUNDQVVhZ2dnRkNob0c3YkdSaGNEb3ZMeTlEClRqMVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxFTk9QWFJ5ZEMxcGJqQXdPU3hEVGoxRFJGQXNRMDQ5VUhWaWJHbGoKSlRJd1MyVjVKVEl3VTJWeWRtbGpaWE1zUTA0OVUyVnlkbWxqWlhNc1EwNDlRMjl1Wm1sbmRYSmhkR2x2Yml4RQpRejF3YkdGNWRHVmphQ3hFUXoxamIzSndQMk5sY25ScFptbGpZWFJsVW1WMmIyTmhkR2x2Ymt4cGMzUS9ZbUZ6ClpUOXZZbXBsWTNSRGJHRnpjejFqVWt4RWFYTjBjbWxpZFhScGIyNVFiMmx1ZElaQmFIUjBjRG92TDNSeWRDMXAKYmpBd09TNXdkQzV3YkdGNWRHVmphQzVqYjNKd0wwTmxjblJGYm5KdmJHd3ZVRlFsTWpCSGJHOWlZV3dsTWpCRApRUzVqY215R1AyaDBkSEE2THk5d2RHZHNiMkpoYkdOaExuQnNZWGwwWldOb0xtTnZjbkF2UTJWeWRFVnVjbTlzCmJDOVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxtTnliRENDQVMwR0NDc0dBUVVGQndFQkJJSUJIekNDQVJzd2diRUcKQ0NzR0FRVUZCekFDaG9Ha2JHUmhjRG92THk5RFRqMVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxFTk9QVUZKUVN4RApUajFRZFdKc2FXTWxNakJMWlhrbE1qQlRaWEoyYVdObGN5eERUajFUWlhKMmFXTmxjeXhEVGoxRGIyNW1hV2QxCmNtRjBhVzl1TEVSRFBYQnNZWGwwWldOb0xFUkRQV052Y25BL1kwRkRaWEowYVdacFkyRjBaVDlpWVhObFAyOWkKYW1WamRFTnNZWE56UFdObGNuUnBabWxqWVhScGIyNUJkWFJvYjNKcGRIa3daUVlJS3dZQkJRVUhNQUtHV1doMApkSEE2THk5amNtd3RhVzUwTG5Cc1lYbDBaV05vTG1OdmJTOURaWEowUlc1eWIyeHNMM1J5ZEMxcGJqQXdPUzV3CmRDNXdiR0Y1ZEdWamFDNWpiM0p3WDFCVUpUSXdSMnh2WW1Gc0pUSXdRMEVvTWlrdVkzSjBNQTBHQ1NxR1NJYjMKRFFFQkN3VUFBNElCQVFCYXlVWkF2Y1lBNld4S2tOakdNOGNRam42U3daZmdicFQ0YkViZWhQN1liUWlrRVZSTApCbFpxeGZBUUVBWGtycUFpNnNDekJFN0hjS3I5VzBXbWJlZkdubVl3RkN5MzB1a0NhaXFVdTNRM05Uelh5RVJMCjVON29BakRLeWVQSStXUWVqcEhIWnE2am5RNHJhVUhhb1ZPQklRN1JzS0pqbnZOYW1RSlU0S0dBNEVQeTh4cnUKcGMxdkJ5V0Y4UG85enpFV25mbUlDdmxwQzhyYjBNSlNqTGJZK0RseXQwYm5vUnhHMUNPSlMrVkJENlpvdWNEeQpLT0gzYVNrVTdON1FTZk5naFk1b2lVMzNUNkdYY3k0RElXcE1RUEc3ZGJkSGo3UW1jZExnS2VPWEc3eHZtc1ZoCjRxUHdDZjNhSmZnc1JDM1o1MzdsTWJvc0tCeFlNSWFnQVpocwotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== - tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2Z0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktnd2dnU2tBZ0VBQW9JQkFRQ3REVmk4UzRoRzJpZXYKZlI1VVBTdTA5SmFPUUFSakhoa2lwRUNsMXZzUkxqbTJYNFFXRnAzV2owZjlYbno0dC9zVGgzM1BKVVFoaTZBSQo1TFJocDlZZmFpUDBZUEduSzlEaVZCQnNPRENqVC80RWJJWm9IaGxqdmJuMEFqNkJER0FtRExZM1BjQUVWZE5sCkpvWUtKdHB3YWREUnA2MnJJUDkzRmx4TTJ1WWMzNWExV1pKMVhuTFA1dTV0bzlKaWVXcU1remxjOUJyWEpuWHAKYTNpVDdsK251OVY1RTlxZEZMOGY2UHNHSlovZGdkUEwxN3hzcjRZREVoTTJuNkIvM0ZlTWhab1QwdXZaeEkxMwpGTUZudElkWG5YeHZoQVBHZUxwWVpmZUIzSllrYUkrL2R0KzlubzZ3azRTVy9yR2Y2VnNUY25Kd05JaUtjMjBWCjh1ZG1UMEVaQWdNQkFBRUNnZ0VBT2pjMk5jbjNJMWE2YVFmZlR4bHcvYVFXamU0dFM2YlJiOXp2dnBxT3haM1cKWG1yTmhaekFKbkQzRjk1VWpsdGVSSmlkRXpXSE1QM0dyWmM2czJ1QjFmbWY5Tk0wR0RmZVFuVmpQUFMrTUFKMgpBc2o3Z2tVMTUxN3BFcFE2c0xFWUcxVEZhOW9ESWJJNXRscDZWeW53N0VZOHNIc0hLbjJrVTB5YmFtTnRiQ0toCjdHbTF2WFBiSE03a29HdndERmJwQ0dRZlNEUWdyc3BqTFdDRHBzN2lkV2xLS2NLSWdpdFFuTmREVlJlYVNjR1YKMU1jWkhCTlh2T1FkbDljM1NaUjdtUTRZY3dFb3ZZSkI3UGJLWTRra1p3WWRObVZ1cE1ON0cvaFpZWWtLd1pVVApTL0ppUTdUaW1FYjJ0UTRQM3pESDdBeEFHcnNLT1ZDMzNtN044VElEVFFLQmdRRE9LU29zRHdzUUxucDB4dXRpClRSbkphenB1aloyR3piRVNJV2FTeFA4N1ZOMS82YmViaGRjZ0FYc2p5aU9NUWk5M2k4WWtkaDdTejhVVGxnZmEKSklnYUVKaTA2R01DdngrY1dZTUZ5MU5pWW1YN3JuS1Q4by9rZm0wOUJQemRjNjUyWVErd2s2THFwRjZCeG1uNQo0MEpLTlRoM2ZtZHEwZ3pPVkRMbG1zUW8zd0tCZ1FEVzR5ajBMTWlWOVNHaU4rZWlJei8xMnpZVDFNcDJnbndvCjRPM3o4bzFiblZBbjJEL21Sd1k1c0txZEYxbm02T0IwclVERnpiWGszRDB3aVNQR0hZTUZaTjVPSXhIY0kwaUkKTTlmeG44Q1VtZC9TUXVta3dEL3NhMGp2NFFxNkxsVEVOWmVYSWdFTVhURHlkeW02ektoSXB1Z3l3dkpwdHIyMwpYeUFRcUdzOUJ3S0JnR1ljODV1QkUveSsyTDZ3ckhRek5qdVMxZzFlTFpGUW5vMFphQ0g0VzJjNjRMOXp0eExjClZ6S3VLUjBRQ1UxMmx1WkNvREQ5Sk1WTVRoUW1jdHMwendrQ0FYRlJ6WURWdzhXQWZLcEpESk1sbzlmbWp6QUMKckEwRUpmMWNWQmNvTGxqS09LaEFhQ2lLbzVqcCt5SGYwN3pINGFFbVJma2Q4MlBiUnA1OWF2M0hBb0dCQU1oeQplNGhSb2dabjlDakt0MUtDU1M2QWZsQS9aV0RvMVFLWTFyNkJHaVZFZURuQ3VkQ0huaUlBVHhaY2F1cy9mZWk0Cm1Ed3JhS29FV3p2RUlVK3p4YjBwVzBsTjQySVNzNTBCcDBUbnZRK2cvYXkzNkJSYmxRVm5DbEZnL2Myd1hEZnUKdWVvcnVRaWNnWVViYlJ5bnZhNlBxdmQyN0FONmlEdmVDeDRlekhIUEFvR0JBTVowdWhUWVdGMHJ3alZDc0t5cAp3OWJpd3A1dTBjR3VxOE9jS1BsSnEyL1g3d0hpR0ZpSVJxV2RndWk1Um8ydmUyTkNkS0oyVE5VYWd1a0NPSjduCnBVeE9LNXFhZmZPWVhWWG1tbnRZejAzQWFSSElUWWx0TXpMUUVHbDBwdHU4Zm9zb0FQR0hXRWdHd1RsTFNRU1gKWVNDWVIyL3JxRGRpaVlZWlFWR3pjeVJDCi0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K + tls.crt: ${{ secrets.SOF_APP01_TLS_CERT }} + tls.key: ${{ secrets.SOF_APP01_TLS_KEY }} + \ No newline at end of file From e43cebfb855b63d130a3572aa89c43b9b1edce77 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 16:30:05 +0200 Subject: [PATCH 232/308] sof-app-cert --- deployment/sof-app01-secret.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/deployment/sof-app01-secret.yaml b/deployment/sof-app01-secret.yaml index 4e0cb7452..c1176663a 100644 --- a/deployment/sof-app01-secret.yaml +++ b/deployment/sof-app01-secret.yaml @@ -5,6 +5,5 @@ metadata: namespace: sof-app01 type: kubernetes.io/tls data: - tls.crt: ${{ secrets.SOF_APP01_TLS_CERT }} - tls.key: ${{ secrets.SOF_APP01_TLS_KEY }} - \ No newline at end of file + tls.crt: QmFnIEF0dHJpYnV0ZXMKICAgIGxvY2FsS2V5SUQ6IDAxIDAwIDAwIDAwIAogICAgZnJpZW5kbHlOYW1lOiBzb2YtYXBwMDEKc3ViamVjdD1DTiA9IHNvZi1hcHAwMS5wdC5wbGF5dGVjaC5jb3JwLCBDTiA9IHNvZi1hcHAwMQppc3N1ZXI9REMgPSBjb3JwLCBEQyA9IHBsYXl0ZWNoLCBEQyA9IHB0LCBDTiA9IFBUIEdsb2JhbCBDQQotLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KTUlJR3B6Q0NCWStnQXdJQkFnSVRNZ0JPMVZpTzMvSjc5bmQxL3dBQ0FFN1ZXREFOQmdrcWhraUc5dzBCQVFzRgpBREJiTVJRd0VnWUtDWkltaVpQeUxHUUJHUllFWTI5eWNERVlNQllHQ2dtU0pvbVQ4aXhrQVJrV0NIQnNZWGwwClpXTm9NUkl3RUFZS0NaSW1pWlB5TEdRQkdSWUNjSFF4RlRBVEJnTlZCQU1UREZCVUlFZHNiMkpoYkNCRFFUQWUKRncweU5UQXhNVFV3T0RFd01qTmFGdzB5TnpBeE1UVXdPREV3TWpOYU1Ea3hJekFoQmdOVkJBTVRHbk52WmkxaApjSEF3TVM1d2RDNXdiR0Y1ZEdWamFDNWpiM0p3TVJJd0VBWURWUVFERXdsemIyWXRZWEJ3TURFd2dnRWlNQTBHCkNTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFDdERWaThTNGhHMmlldmZSNVVQU3UwOUphT1FBUmoKSGhraXBFQ2wxdnNSTGptMlg0UVdGcDNXajBmOVhuejR0L3NUaDMzUEpVUWhpNkFJNUxSaHA5WWZhaVAwWVBHbgpLOURpVkJCc09EQ2pULzRFYklab0hobGp2Ym4wQWo2QkRHQW1ETFkzUGNBRVZkTmxKb1lLSnRwd2FkRFJwNjJyCklQOTNGbHhNMnVZYzM1YTFXWkoxWG5MUDV1NXRvOUppZVdxTWt6bGM5QnJYSm5YcGEzaVQ3bCtudTlWNUU5cWQKRkw4ZjZQc0dKWi9kZ2RQTDE3eHNyNFlERWhNMm42Qi8zRmVNaFpvVDB1dlp4STEzRk1GbnRJZFhuWHh2aEFQRwplTHBZWmZlQjNKWWthSSsvZHQrOW5vNndrNFNXL3JHZjZWc1Rjbkp3TklpS2MyMFY4dWRtVDBFWkFnTUJBQUdqCmdnT0VNSUlEZ0RBOUJna3JCZ0VFQVlJM0ZRY0VNREF1QmlZckJnRUVBWUkzRlFpRThKUUxoK1MwZllYMWpUajMKcEUyQng1UnlnUnFHNDYwRmhiL0ZUZ0lCWkFJQklEQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBVEFMQmdOVgpIUThFQkFNQ0JMQXdHd1lKS3dZQkJBR0NOeFVLQkE0d0REQUtCZ2dyQmdFRkJRY0RBVEFkQmdOVkhRNEVGZ1FVClZiWWFLOVQwMk5YTzcvMXlwc3ZmYTZxazZROHdNQVlEVlIwUkJDa3dKNElhYzI5bUxXRndjREF4TG5CMExuQnMKWVhsMFpXTm9MbU52Y25DQ0NYTnZaaTFoY0hBd01UQWZCZ05WSFNNRUdEQVdnQlJRQnJXaU1yWloyb2tUSzg0RwpkVUZRMGtMRlVEQ0NBVnNHQTFVZEh3U0NBVkl3Z2dGT01JSUJTcUNDQVVhZ2dnRkNob0c3YkdSaGNEb3ZMeTlEClRqMVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxFTk9QWFJ5ZEMxcGJqQXdPU3hEVGoxRFJGQXNRMDQ5VUhWaWJHbGoKSlRJd1MyVjVKVEl3VTJWeWRtbGpaWE1zUTA0OVUyVnlkbWxqWlhNc1EwNDlRMjl1Wm1sbmRYSmhkR2x2Yml4RQpRejF3YkdGNWRHVmphQ3hFUXoxamIzSndQMk5sY25ScFptbGpZWFJsVW1WMmIyTmhkR2x2Ymt4cGMzUS9ZbUZ6ClpUOXZZbXBsWTNSRGJHRnpjejFqVWt4RWFYTjBjbWxpZFhScGIyNVFiMmx1ZElaQmFIUjBjRG92TDNSeWRDMXAKYmpBd09TNXdkQzV3YkdGNWRHVmphQzVqYjNKd0wwTmxjblJGYm5KdmJHd3ZVRlFsTWpCSGJHOWlZV3dsTWpCRApRUzVqY215R1AyaDBkSEE2THk5d2RHZHNiMkpoYkdOaExuQnNZWGwwWldOb0xtTnZjbkF2UTJWeWRFVnVjbTlzCmJDOVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxtTnliRENDQVMwR0NDc0dBUVVGQndFQkJJSUJIekNDQVJzd2diRUcKQ0NzR0FRVUZCekFDaG9Ha2JHUmhjRG92THk5RFRqMVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxFTk9QVUZKUVN4RApUajFRZFdKc2FXTWxNakJMWlhrbE1qQlRaWEoyYVdObGN5eERUajFUWlhKMmFXTmxjeXhEVGoxRGIyNW1hV2QxCmNtRjBhVzl1TEVSRFBYQnNZWGwwWldOb0xFUkRQV052Y25BL1kwRkRaWEowYVdacFkyRjBaVDlpWVhObFAyOWkKYW1WamRFTnNZWE56UFdObGNuUnBabWxqWVhScGIyNUJkWFJvYjNKcGRIa3daUVlJS3dZQkJRVUhNQUtHV1doMApkSEE2THk5amNtd3RhVzUwTG5Cc1lYbDBaV05vTG1OdmJTOURaWEowUlc1eWIyeHNMM1J5ZEMxcGJqQXdPUzV3CmRDNXdiR0Y1ZEdWamFDNWpiM0p3WDFCVUpUSXdSMnh2WW1Gc0pUSXdRMEVvTWlrdVkzSjBNQTBHQ1NxR1NJYjMKRFFFQkN3VUFBNElCQVFCYXlVWkF2Y1lBNld4S2tOakdNOGNRam42U3daZmdicFQ0YkViZWhQN1liUWlrRVZSTApCbFpxeGZBUUVBWGtycUFpNnNDekJFN0hjS3I5VzBXbWJlZkdubVl3RkN5MzB1a0NhaXFVdTNRM05Uelh5RVJMCjVON29BakRLeWVQSStXUWVqcEhIWnE2am5RNHJhVUhhb1ZPQklRN1JzS0pqbnZOYW1RSlU0S0dBNEVQeTh4cnUKcGMxdkJ5V0Y4UG85enpFV25mbUlDdmxwQzhyYjBNSlNqTGJZK0RseXQwYm5vUnhHMUNPSlMrVkJENlpvdWNEeQpLT0gzYVNrVTdON1FTZk5naFk1b2lVMzNUNkdYY3k0RElXcE1RUEc3ZGJkSGo3UW1jZExnS2VPWEc3eHZtc1ZoCjRxUHdDZjNhSmZnc1JDM1o1MzdsTWJvc0tCeFlNSWFnQVpocwotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== + tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2Z0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktnd2dnU2tBZ0VBQW9JQkFRQ3REVmk4UzRoRzJpZXYKZlI1VVBTdTA5SmFPUUFSakhoa2lwRUNsMXZzUkxqbTJYNFFXRnAzV2owZjlYbno0dC9zVGgzM1BKVVFoaTZBSQo1TFJocDlZZmFpUDBZUEduSzlEaVZCQnNPRENqVC80RWJJWm9IaGxqdmJuMEFqNkJER0FtRExZM1BjQUVWZE5sCkpvWUtKdHB3YWREUnA2MnJJUDkzRmx4TTJ1WWMzNWExV1pKMVhuTFA1dTV0bzlKaWVXcU1remxjOUJyWEpuWHAKYTNpVDdsK251OVY1RTlxZEZMOGY2UHNHSlovZGdkUEwxN3hzcjRZREVoTTJuNkIvM0ZlTWhab1QwdXZaeEkxMwpGTUZudElkWG5YeHZoQVBHZUxwWVpmZUIzSllrYUkrL2R0KzlubzZ3azRTVy9yR2Y2VnNUY25Kd05JaUtjMjBWCjh1ZG1UMEVaQWdNQkFBRUNnZ0VBT2pjMk5jbjNJMWE2YVFmZlR4bHcvYVFXamU0dFM2YlJiOXp2dnBxT3haM1cKWG1yTmhaekFKbkQzRjk1VWpsdGVSSmlkRXpXSE1QM0dyWmM2czJ1QjFmbWY5Tk0wR0RmZVFuVmpQUFMrTUFKMgpBc2o3Z2tVMTUxN3BFcFE2c0xFWUcxVEZhOW9ESWJJNXRscDZWeW53N0VZOHNIc0hLbjJrVTB5YmFtTnRiQ0toCjdHbTF2WFBiSE03a29HdndERmJwQ0dRZlNEUWdyc3BqTFdDRHBzN2lkV2xLS2NLSWdpdFFuTmREVlJlYVNjR1YKMU1jWkhCTlh2T1FkbDljM1NaUjdtUTRZY3dFb3ZZSkI3UGJLWTRra1p3WWRObVZ1cE1ON0cvaFpZWWtLd1pVVApTL0ppUTdUaW1FYjJ0UTRQM3pESDdBeEFHcnNLT1ZDMzNtN044VElEVFFLQmdRRE9LU29zRHdzUUxucDB4dXRpClRSbkphenB1aloyR3piRVNJV2FTeFA4N1ZOMS82YmViaGRjZ0FYc2p5aU9NUWk5M2k4WWtkaDdTejhVVGxnZmEKSklnYUVKaTA2R01DdngrY1dZTUZ5MU5pWW1YN3JuS1Q4by9rZm0wOUJQemRjNjUyWVErd2s2THFwRjZCeG1uNQo0MEpLTlRoM2ZtZHEwZ3pPVkRMbG1zUW8zd0tCZ1FEVzR5ajBMTWlWOVNHaU4rZWlJei8xMnpZVDFNcDJnbndvCjRPM3o4bzFiblZBbjJEL21Sd1k1c0txZEYxbm02T0IwclVERnpiWGszRDB3aVNQR0hZTUZaTjVPSXhIY0kwaUkKTTlmeG44Q1VtZC9TUXVta3dEL3NhMGp2NFFxNkxsVEVOWmVYSWdFTVhURHlkeW02ektoSXB1Z3l3dkpwdHIyMwpYeUFRcUdzOUJ3S0JnR1ljODV1QkUveSsyTDZ3ckhRek5qdVMxZzFlTFpGUW5vMFphQ0g0VzJjNjRMOXp0eExjClZ6S3VLUjBRQ1UxMmx1WkNvREQ5Sk1WTVRoUW1jdHMwendrQ0FYRlJ6WURWdzhXQWZLcEpESk1sbzlmbWp6QUMKckEwRUpmMWNWQmNvTGxqS09LaEFhQ2lLbzVqcCt5SGYwN3pINGFFbVJma2Q4MlBiUnA1OWF2M0hBb0dCQU1oeQplNGhSb2dabjlDakt0MUtDU1M2QWZsQS9aV0RvMVFLWTFyNkJHaVZFZURuQ3VkQ0huaUlBVHhaY2F1cy9mZWk0Cm1Ed3JhS29FV3p2RUlVK3p4YjBwVzBsTjQySVNzNTBCcDBUbnZRK2cvYXkzNkJSYmxRVm5DbEZnL2Myd1hEZnUKdWVvcnVRaWNnWVViYlJ5bnZhNlBxdmQyN0FONmlEdmVDeDRlekhIUEFvR0JBTVowdWhUWVdGMHJ3alZDc0t5cAp3OWJpd3A1dTBjR3VxOE9jS1BsSnEyL1g3d0hpR0ZpSVJxV2RndWk1Um8ydmUyTkNkS0oyVE5VYWd1a0NPSjduCnBVeE9LNXFhZmZPWVhWWG1tbnRZejAzQWFSSElUWWx0TXpMUUVHbDBwdHU4Zm9zb0FQR0hXRWdHd1RsTFNRU1gKWVNDWVIyL3JxRGRpaVlZWlFWR3pjeVJDCi0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K From 0d9ae0a5d5dae11bbf53ae8dfec05b30d34aafd7 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 16:36:35 +0200 Subject: [PATCH 233/308] markdownlint ignor for md --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index cbfdb345f..2f5aa0498 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -43,7 +43,7 @@ jobs: "line-lenght": false }' > .markdownlint.json - name: Markdown lint check - run: markdownlint **/*.md --ignore node_modules + run: markdownlint -i '{**/*.md}' -i '{terraform/*.md}' -i '{*.md}' -i node_modules UnitTest: needs: Pylint runs-on: ubuntu-latest From 1b111ef6a415a9fa676a891032b01367b6a56af6 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 14:40:24 +0000 Subject: [PATCH 234/308] Update image to 0d9ae0a5d5dae11bbf53ae8dfec05b30d34aafd7 --- deployment/sof-app01.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 80ac6c788..00337f306 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -17,9 +17,9 @@ spec: spec: containers: - name: sof-app01 -# image: dimitardd/dimitar-app02:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Auto deplayed from build -# image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green - image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue + # image: dimitardd/dimitar-app02:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Auto deplayed from build + # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green + image: dimitardd/dimitar-app02:0d9ae0a5d5dae11bbf53ae8dfec05b30d34aafd7 #Blue # image: dimitardd/dimitar-app01:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Yellow ports: - containerPort: 3000 From 0468b23703d1557081e3f3c7b2b841c02b880484 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 16:48:47 +0200 Subject: [PATCH 235/308] pre-commit hooks --- .pre-commit-config.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 000000000..756ae44e1 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,13 @@ +repos: +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v2.3.0 + hooks: + - id: check-yaml + - id: trailing-whitespace + - id: check-added-large-files + - id: check-json + - id: check-merge-conflict +- repo: https://github.com/gitleaks/gitleaks + rev: v8.18.0 # Specify the desired version of Gitleaks + hooks: + - id: gitleaks From f2c570e6e69bfd1b3a299780724e326e4381fefc Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 14:52:26 +0000 Subject: [PATCH 236/308] Update image to 0468b23703d1557081e3f3c7b2b841c02b880484 --- deployment/sof-app01.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 00337f306..d60e3ef47 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -19,7 +19,7 @@ spec: - name: sof-app01 # image: dimitardd/dimitar-app02:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Auto deplayed from build # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green - image: dimitardd/dimitar-app02:0d9ae0a5d5dae11bbf53ae8dfec05b30d34aafd7 #Blue + image: dimitardd/dimitar-app02:0468b23703d1557081e3f3c7b2b841c02b880484 #Blue # image: dimitardd/dimitar-app01:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Yellow ports: - containerPort: 3000 From 56e460596f70a74313417d3b7a6c605784e6b083 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 16:56:42 +0200 Subject: [PATCH 237/308] - id: terraform-fmt in pre-commit hook --- .pre-commit-config.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 756ae44e1..728aedbb7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,11 +1,10 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v2.3.0 + rev: v3.4.0 hooks: - id: check-yaml - id: trailing-whitespace - id: check-added-large-files - - id: check-json - id: check-merge-conflict - repo: https://github.com/gitleaks/gitleaks rev: v8.18.0 # Specify the desired version of Gitleaks From 31a2db0dcd985edd965ad9e041d40c125a12b485 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 15:03:17 +0000 Subject: [PATCH 238/308] Update image to 56e460596f70a74313417d3b7a6c605784e6b083 --- deployment/sof-app01.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index d60e3ef47..527451608 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -19,7 +19,7 @@ spec: - name: sof-app01 # image: dimitardd/dimitar-app02:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Auto deplayed from build # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green - image: dimitardd/dimitar-app02:0468b23703d1557081e3f3c7b2b841c02b880484 #Blue + image: dimitardd/dimitar-app02:56e460596f70a74313417d3b7a6c605784e6b083 #Blue # image: dimitardd/dimitar-app01:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Yellow ports: - containerPort: 3000 From 3f8cbc0d09f014a1b7513ca29ea32497444f1bfa Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 17:04:04 +0200 Subject: [PATCH 239/308] terraform_fmt --- .pre-commit-config.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 728aedbb7..d3e96bb28 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,3 +10,7 @@ repos: rev: v8.18.0 # Specify the desired version of Gitleaks hooks: - id: gitleaks +- repo: https://github.com/antonbabenko/pre-commit-terraform + rev: v1.97.0 + hooks: + - id: terraform_fmt From 850aa86a99eb3f1637914ad6a3b36cb058b75b65 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 15:08:24 +0000 Subject: [PATCH 240/308] Update image to 3f8cbc0d09f014a1b7513ca29ea32497444f1bfa --- deployment/sof-app01.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 527451608..b30299919 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -19,7 +19,7 @@ spec: - name: sof-app01 # image: dimitardd/dimitar-app02:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Auto deplayed from build # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green - image: dimitardd/dimitar-app02:56e460596f70a74313417d3b7a6c605784e6b083 #Blue + image: dimitardd/dimitar-app02:3f8cbc0d09f014a1b7513ca29ea32497444f1bfa #Blue # image: dimitardd/dimitar-app01:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Yellow ports: - containerPort: 3000 From 29120b7605e4f216cd172e5b0131b7ef9a02e580 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 17:07:16 +0200 Subject: [PATCH 241/308] etect-secrets --- .pre-commit-config.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d3e96bb28..1240a9924 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,3 +14,7 @@ repos: rev: v1.97.0 hooks: - id: terraform_fmt +- repo: https://github.com/Yelp/detect-secrets + rev: v1.5.0 + hooks: + - id: detect-secrets From ed326295b296241bf8bf7721c5eda7c63010072b Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 15:12:17 +0000 Subject: [PATCH 242/308] Update image to 29120b7605e4f216cd172e5b0131b7ef9a02e580 --- deployment/sof-app01.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index b30299919..a9e6d45c4 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -19,7 +19,7 @@ spec: - name: sof-app01 # image: dimitardd/dimitar-app02:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Auto deplayed from build # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green - image: dimitardd/dimitar-app02:3f8cbc0d09f014a1b7513ca29ea32497444f1bfa #Blue + image: dimitardd/dimitar-app02:29120b7605e4f216cd172e5b0131b7ef9a02e580 #Blue # image: dimitardd/dimitar-app01:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Yellow ports: - containerPort: 3000 From 207e179a46ce047db5ac0d73ec2a1b0fb9352514 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 17:12:26 +0200 Subject: [PATCH 243/308] terraform_fmt --- .pre-commit-config.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1240a9924..3321fd17d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,6 +14,8 @@ repos: rev: v1.97.0 hooks: - id: terraform_fmt + args: + - --args=--recursive - repo: https://github.com/Yelp/detect-secrets rev: v1.5.0 hooks: From 77fe57cd603ea36ce480a941424dc840a248e161 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 15:15:57 +0000 Subject: [PATCH 244/308] Update image to 207e179a46ce047db5ac0d73ec2a1b0fb9352514 --- deployment/sof-app01.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index a9e6d45c4..b29e6f149 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -19,7 +19,7 @@ spec: - name: sof-app01 # image: dimitardd/dimitar-app02:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Auto deplayed from build # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green - image: dimitardd/dimitar-app02:29120b7605e4f216cd172e5b0131b7ef9a02e580 #Blue + image: dimitardd/dimitar-app02:207e179a46ce047db5ac0d73ec2a1b0fb9352514 #Blue # image: dimitardd/dimitar-app01:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Yellow ports: - containerPort: 3000 From 515d33c17d27512ab74efe2babec6ad6a2798df8 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 17:21:51 +0200 Subject: [PATCH 245/308] add files to path to ignore github action --- .github/workflows/github-actions-demo.yml | 7 ++++++- _homework/m1-3-1-docker.yml | 14 +++++++------- rollout/sof-app02.yaml | 2 +- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 2f5aa0498..456ee9397 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -6,6 +6,11 @@ on: - 'deployment/*' - 'terraform/*' - 'rollout/*' + - '.pre-commit-config.yaml' + - '.gitignore' + - '.editorconfig' + - '*.md' + - 'LICENSE' branches: - main - dimitardd-281024 @@ -66,7 +71,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - fetch-depth: 0 + fetch-depth: 0 - name: Gitleaks scan uses: gitleaks/gitleaks-action@v2 env: diff --git a/_homework/m1-3-1-docker.yml b/_homework/m1-3-1-docker.yml index 3aebdfcb0..790d6e20c 100644 --- a/_homework/m1-3-1-docker.yml +++ b/_homework/m1-3-1-docker.yml @@ -1,7 +1,7 @@ - name: Build, push and run Docker image M1-3-1 Ansible hosts: localhost gather_facts: no - + vars: image_name: "dimitar-app02" image_tag: "v4.19" @@ -10,11 +10,11 @@ dockerpath: "/opt/telerik/build" dockerhubuser: "dimitardd" gitbanch: "dimitardd-281024" - + vars_files: - - /opt/telerik/secrets/secret.yaml - - + - /opt/telerik/secrets/secret.yaml + + tasks: - name: Get Dockerfile lates version! git: @@ -38,8 +38,8 @@ - name: Tag image with lates! when: git_status.changed == true command: docker image tag "{{ image_name }}:{{ image_tag }}" "{{ image_name }}:latest" "dimitardd/{{ image_name }}" - command: docker image tag "{{ image_name }}:{{ image_tag }}" "dimitardd/{{ image_name }}" - +# command: docker image tag "{{ image_name }}:{{ image_tag }}" "dimitardd/{{ image_name }}" + - name: Log into DockerHub community.docker.docker_login: username: "{{ dockerhubuser }}" diff --git a/rollout/sof-app02.yaml b/rollout/sof-app02.yaml index 2db008f89..a88794c81 100644 --- a/rollout/sof-app02.yaml +++ b/rollout/sof-app02.yaml @@ -27,7 +27,7 @@ spec: containers: - name: sof-app02 # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green - image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue + image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue # image: dimitardd/dimitar-app01:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Yellow ports: - name: http From a435a1604be2ea68f215bce573c9a470435e341d Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 17:23:14 +0200 Subject: [PATCH 246/308] path ignor for github action --- .github/workflows/github-actions-demo.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 456ee9397..9597a475b 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -3,6 +3,7 @@ run-name: ${{ github.actor }} is testing out GitHub Actions πŸš€ on: push: paths-ignore: + - '_homework/*' - 'deployment/*' - 'terraform/*' - 'rollout/*' From 6409c8ed6ed359bbe0cd04e759a297f4cd83342b Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Fri, 17 Jan 2025 17:25:43 +0200 Subject: [PATCH 247/308] cleaning pre-commit hook --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3321fd17d..1b599c588 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,7 +7,7 @@ repos: - id: check-added-large-files - id: check-merge-conflict - repo: https://github.com/gitleaks/gitleaks - rev: v8.18.0 # Specify the desired version of Gitleaks + rev: v8.18.0 hooks: - id: gitleaks - repo: https://github.com/antonbabenko/pre-commit-terraform From 64f1140300009db5bdc1b89b4022774eb8368534 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 19 Jan 2025 09:56:24 +0200 Subject: [PATCH 248/308] vault test integration for sof-app01 --- deployment/sof-app01.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index b29e6f149..5b79ef887 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -21,6 +21,15 @@ spec: # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green image: dimitardd/dimitar-app02:207e179a46ce047db5ac0d73ec2a1b0fb9352514 #Blue # image: dimitardd/dimitar-app01:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Yellow + env: + - name: VAULT_ADDR + value: https://sof-v01.pt.playtech.corp/ + - name: VAULT_ROLE + value: sof-app01 + - name: VAULT_TOKEN + valueFrom: + fieldRef: + fieldPath: metadata.annotations['vault.hashicorp.com/k8s-role'] ports: - containerPort: 3000 resources: From ccda7a06bf711de47bee81e736c9a06c09eee59a Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 19 Jan 2025 09:58:47 +0200 Subject: [PATCH 249/308] configute vault for sof-app01 --- deployment/sof-app01.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 5b79ef887..d29dbecf7 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -15,6 +15,7 @@ spec: labels: app: sof-app01 spec: + serviceAccountName: sof-app01-sa containers: - name: sof-app01 # image: dimitardd/dimitar-app02:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Auto deplayed from build From a51f18fd14b975172034c877c81940ab7825d3bc Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 19 Jan 2025 14:19:48 +0200 Subject: [PATCH 250/308] remove test aprt for vault in sof-app01 --- deployment/sof-app01.yaml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index d29dbecf7..9113d3d21 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -22,15 +22,6 @@ spec: # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green image: dimitardd/dimitar-app02:207e179a46ce047db5ac0d73ec2a1b0fb9352514 #Blue # image: dimitardd/dimitar-app01:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Yellow - env: - - name: VAULT_ADDR - value: https://sof-v01.pt.playtech.corp/ - - name: VAULT_ROLE - value: sof-app01 - - name: VAULT_TOKEN - valueFrom: - fieldRef: - fieldPath: metadata.annotations['vault.hashicorp.com/k8s-role'] ports: - containerPort: 3000 resources: From e8d195623b8afd52620144899f420071ce0bf2b5 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 21 Jan 2025 09:43:26 +0200 Subject: [PATCH 251/308] sof-app01 autoscaling --- deployment/autoscaling.yaml | 37 +++++++++++++++++++++++++++++++ deployment/sof-app01-ingress.yaml | 5 +++-- deployment/sof-app01.yaml | 2 +- 3 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 deployment/autoscaling.yaml diff --git a/deployment/autoscaling.yaml b/deployment/autoscaling.yaml new file mode 100644 index 000000000..6efe9ec5a --- /dev/null +++ b/deployment/autoscaling.yaml @@ -0,0 +1,37 @@ +apiVersion: autoscaling/v2 +kind: HorizontalPodAutoscaler +metadata: + name: sof-app01 + namespace: sof-app01 +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: sof-app01 + minReplicas: 3 + maxReplicas: 10 + metrics: + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: 50 + - type: Resource + resource: + name: memory + target: + type: Utilization + averageUtilization: 50 + behavior: + scaleDown: + stabilizationWindowSeconds: 60 + policies: + - type: Pods + value: 2 + periodSeconds: 60 +# - type: Percent +# value: 50 +# periodSeconds: 60 + selectPolicy: Max + diff --git a/deployment/sof-app01-ingress.yaml b/deployment/sof-app01-ingress.yaml index ca58c1a6e..5f42387bc 100644 --- a/deployment/sof-app01-ingress.yaml +++ b/deployment/sof-app01-ingress.yaml @@ -4,7 +4,7 @@ metadata: name: sof-app01-ingress namespace: sof-app01 annotations: - kubernetes.io/ingress.class: "nginx" + kubernetes.io/spec.ingressClassName: "nginx" spec: rules: - host: sof-app01.pt.playtech.corp @@ -20,4 +20,5 @@ spec: tls: - hosts: - sof-app01.pt.playtech.corp - secretName: sof-app01-tls + secretName: sof-app01-tls # pragma: allowlist secret + diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 9113d3d21..d93e6c84f 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -6,7 +6,7 @@ metadata: labels: app: sof-app01 spec: - replicas: 9 + # replicas: 9 selector: matchLabels: app: sof-app01 From 7b18a952cf6e18cac3a6d8a304803f6361d2f76c Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 21 Jan 2025 09:48:52 +0200 Subject: [PATCH 252/308] sof-autoscaling ram to 5% --- deployment/autoscaling.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/autoscaling.yaml b/deployment/autoscaling.yaml index 6efe9ec5a..d2851e885 100644 --- a/deployment/autoscaling.yaml +++ b/deployment/autoscaling.yaml @@ -22,7 +22,7 @@ spec: name: memory target: type: Utilization - averageUtilization: 50 + averageUtilization: 5 behavior: scaleDown: stabilizationWindowSeconds: 60 From fa4fdec44c93295f6b10b98d1174d57ed57223ea Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 21 Jan 2025 09:51:17 +0200 Subject: [PATCH 253/308] sof-app01 autoscaling ram set to 50% --- deployment/autoscaling.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/autoscaling.yaml b/deployment/autoscaling.yaml index d2851e885..6efe9ec5a 100644 --- a/deployment/autoscaling.yaml +++ b/deployment/autoscaling.yaml @@ -22,7 +22,7 @@ spec: name: memory target: type: Utilization - averageUtilization: 5 + averageUtilization: 50 behavior: scaleDown: stabilizationWindowSeconds: 60 From ca4d1fbd1baade108bf3b0fd92fca04d2e8d0288 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 21 Jan 2025 09:52:31 +0200 Subject: [PATCH 254/308] rename sof-app01 hpa --- deployment/autoscaling.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/autoscaling.yaml b/deployment/autoscaling.yaml index 6efe9ec5a..2e3ec9dc3 100644 --- a/deployment/autoscaling.yaml +++ b/deployment/autoscaling.yaml @@ -1,7 +1,7 @@ apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: - name: sof-app01 + name: sof-app01-hpa namespace: sof-app01 spec: scaleTargetRef: From 3afbfa4dacc19d06f28252443fa4a1cfeb7f5f11 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 21 Jan 2025 09:58:58 +0200 Subject: [PATCH 255/308] reorganize files in deplayment for sof-app01 --- deployment/{autoscaling.yaml => sof-app01-hpa.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename deployment/{autoscaling.yaml => sof-app01-hpa.yaml} (100%) diff --git a/deployment/autoscaling.yaml b/deployment/sof-app01-hpa.yaml similarity index 100% rename from deployment/autoscaling.yaml rename to deployment/sof-app01-hpa.yaml From 150913e189d10cd26743b600a67c143a5226a97e Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Wed, 22 Jan 2025 13:11:09 +0200 Subject: [PATCH 256/308] checking analysis template for sof-app02 --- deployment/sof-app01.yaml | 4 ++-- rollout/sof-app02-analysis.yaml | 13 +++++++++++++ rollout/sof-app02-analysis02.yaml | 13 +++++++++++++ rollout/sof-app02.yaml | 9 +++++++-- 4 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 rollout/sof-app02-analysis.yaml create mode 100644 rollout/sof-app02-analysis02.yaml diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index d93e6c84f..98c4e9d2f 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -18,9 +18,9 @@ spec: serviceAccountName: sof-app01-sa containers: - name: sof-app01 - # image: dimitardd/dimitar-app02:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Auto deplayed from build + image: dimitardd/dimitar-app02:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Auto deplayed from build # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green - image: dimitardd/dimitar-app02:207e179a46ce047db5ac0d73ec2a1b0fb9352514 #Blue + # image: dimitardd/dimitar-app02:207e179a46ce047db5ac0d73ec2a1b0fb9352514 #Blue # image: dimitardd/dimitar-app01:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Yellow ports: - containerPort: 3000 diff --git a/rollout/sof-app02-analysis.yaml b/rollout/sof-app02-analysis.yaml new file mode 100644 index 000000000..6d7b6eca5 --- /dev/null +++ b/rollout/sof-app02-analysis.yaml @@ -0,0 +1,13 @@ +apiVersion: argoproj.io/v1alpha1 +kind: AnalysisTemplate +metadata: + name: sof-app02-analysis +spec: + metrics: + - name: status-check + successCondition: result >= 0.5 + provider: + prometheus: + address: http://sof-p01.pt.playtech.corp + query: sum(rate(flask_http_request_total{ob="sof-app02", method="GET", status="200"}[1m])) by (status) + diff --git a/rollout/sof-app02-analysis02.yaml b/rollout/sof-app02-analysis02.yaml new file mode 100644 index 000000000..6d7b6eca5 --- /dev/null +++ b/rollout/sof-app02-analysis02.yaml @@ -0,0 +1,13 @@ +apiVersion: argoproj.io/v1alpha1 +kind: AnalysisTemplate +metadata: + name: sof-app02-analysis +spec: + metrics: + - name: status-check + successCondition: result >= 0.5 + provider: + prometheus: + address: http://sof-p01.pt.playtech.corp + query: sum(rate(flask_http_request_total{ob="sof-app02", method="GET", status="200"}[1m])) by (status) + diff --git a/rollout/sof-app02.yaml b/rollout/sof-app02.yaml index a88794c81..97c4fcf31 100644 --- a/rollout/sof-app02.yaml +++ b/rollout/sof-app02.yaml @@ -9,6 +9,9 @@ spec: steps: - setWeight: 20 - pause: {} + # - analysis: + # templateName: sof-app02-analysis + # arguments: {} - setWeight: 40 - pause: {duration: 10} - setWeight: 60 @@ -23,12 +26,13 @@ spec: metadata: labels: app: sof-app02 + # rollouts-pod-template-hash: e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 spec: containers: - name: sof-app02 # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green - image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue -# image: dimitardd/dimitar-app01:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Yellow +# image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue + image: dimitardd/dimitar-app01:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Fresh ports: - name: http containerPort: 3000 @@ -37,3 +41,4 @@ spec: requests: memory: 32Mi cpu: 5m + From 9d882f255ed270ceda4fa61a0e335657d13b239a Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Wed, 22 Jan 2025 14:48:11 +0200 Subject: [PATCH 257/308] remove tmp file --- rollout/sof-app02-analysis02.yaml | 13 ------------- rollout/sof-app02.yaml | 4 ++-- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 rollout/sof-app02-analysis02.yaml diff --git a/rollout/sof-app02-analysis02.yaml b/rollout/sof-app02-analysis02.yaml deleted file mode 100644 index 6d7b6eca5..000000000 --- a/rollout/sof-app02-analysis02.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: AnalysisTemplate -metadata: - name: sof-app02-analysis -spec: - metrics: - - name: status-check - successCondition: result >= 0.5 - provider: - prometheus: - address: http://sof-p01.pt.playtech.corp - query: sum(rate(flask_http_request_total{ob="sof-app02", method="GET", status="200"}[1m])) by (status) - diff --git a/rollout/sof-app02.yaml b/rollout/sof-app02.yaml index 97c4fcf31..f869fd48d 100644 --- a/rollout/sof-app02.yaml +++ b/rollout/sof-app02.yaml @@ -26,13 +26,13 @@ spec: metadata: labels: app: sof-app02 - # rollouts-pod-template-hash: e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 + rollouts-pod-template-hash: e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #pragma: allowlist secret spec: containers: - name: sof-app02 # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green # image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue - image: dimitardd/dimitar-app01:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Fresh + image: dimitardd/dimitar-app02:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Fresh ports: - name: http containerPort: 3000 From ee39df43b568cde20b37db76bd2f5c24d4f3064d Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Wed, 22 Jan 2025 18:28:34 +0200 Subject: [PATCH 258/308] change namespace for sof-app02 --- rollout/sof-app02-analysis.yaml | 4 +++- rollout/sof-app02-ingress.yaml | 1 + rollout/sof-app02-service.yaml | 1 + rollout/sof-app02.yaml | 11 ++++++++--- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/rollout/sof-app02-analysis.yaml b/rollout/sof-app02-analysis.yaml index 6d7b6eca5..4192073b1 100644 --- a/rollout/sof-app02-analysis.yaml +++ b/rollout/sof-app02-analysis.yaml @@ -2,6 +2,7 @@ apiVersion: argoproj.io/v1alpha1 kind: AnalysisTemplate metadata: name: sof-app02-analysis + namespace: sof-app02 spec: metrics: - name: status-check @@ -9,5 +10,6 @@ spec: provider: prometheus: address: http://sof-p01.pt.playtech.corp - query: sum(rate(flask_http_request_total{ob="sof-app02", method="GET", status="200"}[1m])) by (status) + query: | + sum(rate(flask_http_request_total{status="200"}[5m])) > 0 diff --git a/rollout/sof-app02-ingress.yaml b/rollout/sof-app02-ingress.yaml index a360cae72..a0f914786 100644 --- a/rollout/sof-app02-ingress.yaml +++ b/rollout/sof-app02-ingress.yaml @@ -2,6 +2,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: sof-app02 + namespace: sof-app02 annotations: kubernetes.io/ingress.class: "nginx" spec: diff --git a/rollout/sof-app02-service.yaml b/rollout/sof-app02-service.yaml index 701531c21..494d56f91 100644 --- a/rollout/sof-app02-service.yaml +++ b/rollout/sof-app02-service.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: name: sof-app02 + namespace: sof-app02 spec: ports: - port: 3000 diff --git a/rollout/sof-app02.yaml b/rollout/sof-app02.yaml index f869fd48d..8136a6ba8 100644 --- a/rollout/sof-app02.yaml +++ b/rollout/sof-app02.yaml @@ -2,6 +2,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Rollout metadata: name: sof-app02 + namespace: sof-app02 spec: replicas: 5 strategy: @@ -10,8 +11,8 @@ spec: - setWeight: 20 - pause: {} # - analysis: - # templateName: sof-app02-analysis - # arguments: {} + # template: sof-app02-analysis + # arguments: {} - setWeight: 40 - pause: {duration: 10} - setWeight: 60 @@ -26,7 +27,11 @@ spec: metadata: labels: app: sof-app02 - rollouts-pod-template-hash: e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #pragma: allowlist secret + metadata: + annotations: + prometheus.io/scrape: "true" + prometheus.io/path: /metrics + prometheus.io/port: "3000" spec: containers: - name: sof-app02 From f06c238537dfbc6d381a22a7b893823eed98e652 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Wed, 22 Jan 2025 20:10:12 +0200 Subject: [PATCH 259/308] add to terraform sof-app02 --- rollout/sof-app02-analysis.yaml | 5 ++-- terraform/sof-app01/argo-app01.tf | 2 +- terraform/sof-app02/argo-app02.tf | 40 +++++++++++++++++++++++++++++++ terraform/sof-app02/provider.tf | 34 ++++++++++++++++++++++++++ terraform/sof-app02/variables.tf | 4 ++++ 5 files changed, 81 insertions(+), 4 deletions(-) create mode 100644 terraform/sof-app02/argo-app02.tf create mode 100644 terraform/sof-app02/provider.tf create mode 100644 terraform/sof-app02/variables.tf diff --git a/rollout/sof-app02-analysis.yaml b/rollout/sof-app02-analysis.yaml index 4192073b1..a65295eab 100644 --- a/rollout/sof-app02-analysis.yaml +++ b/rollout/sof-app02-analysis.yaml @@ -6,10 +6,9 @@ metadata: spec: metrics: - name: status-check - successCondition: result >= 0.5 + successCondition: result = 200 provider: prometheus: address: http://sof-p01.pt.playtech.corp query: | - sum(rate(flask_http_request_total{status="200"}[5m])) > 0 - + flask_http_request_total{status="200"}[5m])) > 0 diff --git a/terraform/sof-app01/argo-app01.tf b/terraform/sof-app01/argo-app01.tf index 2f205dbde..428789a6a 100644 --- a/terraform/sof-app01/argo-app01.tf +++ b/terraform/sof-app01/argo-app01.tf @@ -32,7 +32,7 @@ resource "argocd_application" "sof-app01" { source { repo_url = "https://github.com/dimitardd/devops-programme" path = "deployment" - target_revision = "dimitardd-281024" + target_revision = "main" # Uncomment and add if required: # repo = "https://github.com/dimitardd/devops-programme" } diff --git a/terraform/sof-app02/argo-app02.tf b/terraform/sof-app02/argo-app02.tf new file mode 100644 index 000000000..27d928604 --- /dev/null +++ b/terraform/sof-app02/argo-app02.tf @@ -0,0 +1,40 @@ +resource "argocd_application" "sof-app02" { + metadata { + name = "sof-app02" + } + + spec { + project = "default" + + sync_policy { + sync_options = ["Validate=true"] + + retry { + limit = "2" + + backoff { + duration = "5s" + factor = "2" + max_duration = "3m0s" + } + } + automated { + allow_empty = false + prune = false + self_heal = false + } + } + destination { + server = "https://kubernetes.default.svc" + namespace = "sof-app02" + } + + source { + repo_url = "https://github.com/dimitardd/devops-programme" + path = "rollout" + target_revision = "main" + # Uncomment and add if required: + # repo = "https://github.com/dimitardd/devops-programme" + } + } +} diff --git a/terraform/sof-app02/provider.tf b/terraform/sof-app02/provider.tf new file mode 100644 index 000000000..cbe5f04c4 --- /dev/null +++ b/terraform/sof-app02/provider.tf @@ -0,0 +1,34 @@ +terraform { + required_version = ">= 1.10" + required_providers { + argocd = { + source = "argoproj-labs/argocd" + version = "7.3.0" + } + } +} + +provider "helm" { + kubernetes { + config_path = "~/.kube/sof-lab03" + } +} + +provider "kubernetes" { + config_path = "~/.kube/sof-lab03" + config_context = "sof-lab03" +} + +provider "argocd" { + server_addr = "localhost:8080" + plain_text = true + insecure = true + username = "admin" + password = var.password +} + +terraform { + backend "local" { + path = "/Users/dimitar.dimitrov/devops/telerik/terraform-argocd-sof-app02.tfstate" + } +} diff --git a/terraform/sof-app02/variables.tf b/terraform/sof-app02/variables.tf new file mode 100644 index 000000000..fd17de099 --- /dev/null +++ b/terraform/sof-app02/variables.tf @@ -0,0 +1,4 @@ +variable "password" { + description = "The password for ArgoCD" + type = string +} From d6e892070f697a0ad91985818bc3409c45d2bfa2 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Wed, 22 Jan 2025 18:14:01 +0000 Subject: [PATCH 260/308] Update image to f06c238537dfbc6d381a22a7b893823eed98e652 --- deployment/sof-app01.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 98c4e9d2f..e6e8bed91 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -18,7 +18,7 @@ spec: serviceAccountName: sof-app01-sa containers: - name: sof-app01 - image: dimitardd/dimitar-app02:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Auto deplayed from build + image: dimitardd/dimitar-app02:f06c238537dfbc6d381a22a7b893823eed98e652 #Auto deplayed from build # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green # image: dimitardd/dimitar-app02:207e179a46ce047db5ac0d73ec2a1b0fb9352514 #Blue # image: dimitardd/dimitar-app01:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Yellow From 1a3efc78697d8e512e8cbf8dd3b34e49b5186b9e Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Thu, 23 Jan 2025 00:09:15 +0200 Subject: [PATCH 261/308] cofigure vault to keep cert and key --- deployment/sof-app01-secret.yaml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/deployment/sof-app01-secret.yaml b/deployment/sof-app01-secret.yaml index c1176663a..9bc6066a6 100644 --- a/deployment/sof-app01-secret.yaml +++ b/deployment/sof-app01-secret.yaml @@ -3,7 +3,21 @@ kind: Secret metadata: name: sof-app01-tls namespace: sof-app01 + annotations: + vault.hashicorp.com/agent-inject: "true" + vault.hashicorp.com/role: "sof-app01" + vault.hashicorp.com/agent-inject-secret-tls.crt: "kv/sof-app01" + vault.hashicorp.com/agent-inject-secret-tls.key: "kv/sof-app01" + vault.hashicorp.com/agent-inject-template-tls.crt: | + {{- with secret "kv/sof-app01" -}} + {{ .Data.data.cert}} + {{- end -}} + vault.hashicorp.com/agent-inject-template-tls.key: | + {{- with secret "kv/sof-app01" -}} + {{ .Data.data.key}} + {{- end -}} type: kubernetes.io/tls data: - tls.crt: QmFnIEF0dHJpYnV0ZXMKICAgIGxvY2FsS2V5SUQ6IDAxIDAwIDAwIDAwIAogICAgZnJpZW5kbHlOYW1lOiBzb2YtYXBwMDEKc3ViamVjdD1DTiA9IHNvZi1hcHAwMS5wdC5wbGF5dGVjaC5jb3JwLCBDTiA9IHNvZi1hcHAwMQppc3N1ZXI9REMgPSBjb3JwLCBEQyA9IHBsYXl0ZWNoLCBEQyA9IHB0LCBDTiA9IFBUIEdsb2JhbCBDQQotLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KTUlJR3B6Q0NCWStnQXdJQkFnSVRNZ0JPMVZpTzMvSjc5bmQxL3dBQ0FFN1ZXREFOQmdrcWhraUc5dzBCQVFzRgpBREJiTVJRd0VnWUtDWkltaVpQeUxHUUJHUllFWTI5eWNERVlNQllHQ2dtU0pvbVQ4aXhrQVJrV0NIQnNZWGwwClpXTm9NUkl3RUFZS0NaSW1pWlB5TEdRQkdSWUNjSFF4RlRBVEJnTlZCQU1UREZCVUlFZHNiMkpoYkNCRFFUQWUKRncweU5UQXhNVFV3T0RFd01qTmFGdzB5TnpBeE1UVXdPREV3TWpOYU1Ea3hJekFoQmdOVkJBTVRHbk52WmkxaApjSEF3TVM1d2RDNXdiR0Y1ZEdWamFDNWpiM0p3TVJJd0VBWURWUVFERXdsemIyWXRZWEJ3TURFd2dnRWlNQTBHCkNTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFDdERWaThTNGhHMmlldmZSNVVQU3UwOUphT1FBUmoKSGhraXBFQ2wxdnNSTGptMlg0UVdGcDNXajBmOVhuejR0L3NUaDMzUEpVUWhpNkFJNUxSaHA5WWZhaVAwWVBHbgpLOURpVkJCc09EQ2pULzRFYklab0hobGp2Ym4wQWo2QkRHQW1ETFkzUGNBRVZkTmxKb1lLSnRwd2FkRFJwNjJyCklQOTNGbHhNMnVZYzM1YTFXWkoxWG5MUDV1NXRvOUppZVdxTWt6bGM5QnJYSm5YcGEzaVQ3bCtudTlWNUU5cWQKRkw4ZjZQc0dKWi9kZ2RQTDE3eHNyNFlERWhNMm42Qi8zRmVNaFpvVDB1dlp4STEzRk1GbnRJZFhuWHh2aEFQRwplTHBZWmZlQjNKWWthSSsvZHQrOW5vNndrNFNXL3JHZjZWc1Rjbkp3TklpS2MyMFY4dWRtVDBFWkFnTUJBQUdqCmdnT0VNSUlEZ0RBOUJna3JCZ0VFQVlJM0ZRY0VNREF1QmlZckJnRUVBWUkzRlFpRThKUUxoK1MwZllYMWpUajMKcEUyQng1UnlnUnFHNDYwRmhiL0ZUZ0lCWkFJQklEQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBVEFMQmdOVgpIUThFQkFNQ0JMQXdHd1lKS3dZQkJBR0NOeFVLQkE0d0REQUtCZ2dyQmdFRkJRY0RBVEFkQmdOVkhRNEVGZ1FVClZiWWFLOVQwMk5YTzcvMXlwc3ZmYTZxazZROHdNQVlEVlIwUkJDa3dKNElhYzI5bUxXRndjREF4TG5CMExuQnMKWVhsMFpXTm9MbU52Y25DQ0NYTnZaaTFoY0hBd01UQWZCZ05WSFNNRUdEQVdnQlJRQnJXaU1yWloyb2tUSzg0RwpkVUZRMGtMRlVEQ0NBVnNHQTFVZEh3U0NBVkl3Z2dGT01JSUJTcUNDQVVhZ2dnRkNob0c3YkdSaGNEb3ZMeTlEClRqMVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxFTk9QWFJ5ZEMxcGJqQXdPU3hEVGoxRFJGQXNRMDQ5VUhWaWJHbGoKSlRJd1MyVjVKVEl3VTJWeWRtbGpaWE1zUTA0OVUyVnlkbWxqWlhNc1EwNDlRMjl1Wm1sbmRYSmhkR2x2Yml4RQpRejF3YkdGNWRHVmphQ3hFUXoxamIzSndQMk5sY25ScFptbGpZWFJsVW1WMmIyTmhkR2x2Ymt4cGMzUS9ZbUZ6ClpUOXZZbXBsWTNSRGJHRnpjejFqVWt4RWFYTjBjbWxpZFhScGIyNVFiMmx1ZElaQmFIUjBjRG92TDNSeWRDMXAKYmpBd09TNXdkQzV3YkdGNWRHVmphQzVqYjNKd0wwTmxjblJGYm5KdmJHd3ZVRlFsTWpCSGJHOWlZV3dsTWpCRApRUzVqY215R1AyaDBkSEE2THk5d2RHZHNiMkpoYkdOaExuQnNZWGwwWldOb0xtTnZjbkF2UTJWeWRFVnVjbTlzCmJDOVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxtTnliRENDQVMwR0NDc0dBUVVGQndFQkJJSUJIekNDQVJzd2diRUcKQ0NzR0FRVUZCekFDaG9Ha2JHUmhjRG92THk5RFRqMVFWQ1V5TUVkc2IySmhiQ1V5TUVOQkxFTk9QVUZKUVN4RApUajFRZFdKc2FXTWxNakJMWlhrbE1qQlRaWEoyYVdObGN5eERUajFUWlhKMmFXTmxjeXhEVGoxRGIyNW1hV2QxCmNtRjBhVzl1TEVSRFBYQnNZWGwwWldOb0xFUkRQV052Y25BL1kwRkRaWEowYVdacFkyRjBaVDlpWVhObFAyOWkKYW1WamRFTnNZWE56UFdObGNuUnBabWxqWVhScGIyNUJkWFJvYjNKcGRIa3daUVlJS3dZQkJRVUhNQUtHV1doMApkSEE2THk5amNtd3RhVzUwTG5Cc1lYbDBaV05vTG1OdmJTOURaWEowUlc1eWIyeHNMM1J5ZEMxcGJqQXdPUzV3CmRDNXdiR0Y1ZEdWamFDNWpiM0p3WDFCVUpUSXdSMnh2WW1Gc0pUSXdRMEVvTWlrdVkzSjBNQTBHQ1NxR1NJYjMKRFFFQkN3VUFBNElCQVFCYXlVWkF2Y1lBNld4S2tOakdNOGNRam42U3daZmdicFQ0YkViZWhQN1liUWlrRVZSTApCbFpxeGZBUUVBWGtycUFpNnNDekJFN0hjS3I5VzBXbWJlZkdubVl3RkN5MzB1a0NhaXFVdTNRM05Uelh5RVJMCjVON29BakRLeWVQSStXUWVqcEhIWnE2am5RNHJhVUhhb1ZPQklRN1JzS0pqbnZOYW1RSlU0S0dBNEVQeTh4cnUKcGMxdkJ5V0Y4UG85enpFV25mbUlDdmxwQzhyYjBNSlNqTGJZK0RseXQwYm5vUnhHMUNPSlMrVkJENlpvdWNEeQpLT0gzYVNrVTdON1FTZk5naFk1b2lVMzNUNkdYY3k0RElXcE1RUEc3ZGJkSGo3UW1jZExnS2VPWEc3eHZtc1ZoCjRxUHdDZjNhSmZnc1JDM1o1MzdsTWJvc0tCeFlNSWFnQVpocwotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== - tls.key: LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2Z0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktnd2dnU2tBZ0VBQW9JQkFRQ3REVmk4UzRoRzJpZXYKZlI1VVBTdTA5SmFPUUFSakhoa2lwRUNsMXZzUkxqbTJYNFFXRnAzV2owZjlYbno0dC9zVGgzM1BKVVFoaTZBSQo1TFJocDlZZmFpUDBZUEduSzlEaVZCQnNPRENqVC80RWJJWm9IaGxqdmJuMEFqNkJER0FtRExZM1BjQUVWZE5sCkpvWUtKdHB3YWREUnA2MnJJUDkzRmx4TTJ1WWMzNWExV1pKMVhuTFA1dTV0bzlKaWVXcU1remxjOUJyWEpuWHAKYTNpVDdsK251OVY1RTlxZEZMOGY2UHNHSlovZGdkUEwxN3hzcjRZREVoTTJuNkIvM0ZlTWhab1QwdXZaeEkxMwpGTUZudElkWG5YeHZoQVBHZUxwWVpmZUIzSllrYUkrL2R0KzlubzZ3azRTVy9yR2Y2VnNUY25Kd05JaUtjMjBWCjh1ZG1UMEVaQWdNQkFBRUNnZ0VBT2pjMk5jbjNJMWE2YVFmZlR4bHcvYVFXamU0dFM2YlJiOXp2dnBxT3haM1cKWG1yTmhaekFKbkQzRjk1VWpsdGVSSmlkRXpXSE1QM0dyWmM2czJ1QjFmbWY5Tk0wR0RmZVFuVmpQUFMrTUFKMgpBc2o3Z2tVMTUxN3BFcFE2c0xFWUcxVEZhOW9ESWJJNXRscDZWeW53N0VZOHNIc0hLbjJrVTB5YmFtTnRiQ0toCjdHbTF2WFBiSE03a29HdndERmJwQ0dRZlNEUWdyc3BqTFdDRHBzN2lkV2xLS2NLSWdpdFFuTmREVlJlYVNjR1YKMU1jWkhCTlh2T1FkbDljM1NaUjdtUTRZY3dFb3ZZSkI3UGJLWTRra1p3WWRObVZ1cE1ON0cvaFpZWWtLd1pVVApTL0ppUTdUaW1FYjJ0UTRQM3pESDdBeEFHcnNLT1ZDMzNtN044VElEVFFLQmdRRE9LU29zRHdzUUxucDB4dXRpClRSbkphenB1aloyR3piRVNJV2FTeFA4N1ZOMS82YmViaGRjZ0FYc2p5aU9NUWk5M2k4WWtkaDdTejhVVGxnZmEKSklnYUVKaTA2R01DdngrY1dZTUZ5MU5pWW1YN3JuS1Q4by9rZm0wOUJQemRjNjUyWVErd2s2THFwRjZCeG1uNQo0MEpLTlRoM2ZtZHEwZ3pPVkRMbG1zUW8zd0tCZ1FEVzR5ajBMTWlWOVNHaU4rZWlJei8xMnpZVDFNcDJnbndvCjRPM3o4bzFiblZBbjJEL21Sd1k1c0txZEYxbm02T0IwclVERnpiWGszRDB3aVNQR0hZTUZaTjVPSXhIY0kwaUkKTTlmeG44Q1VtZC9TUXVta3dEL3NhMGp2NFFxNkxsVEVOWmVYSWdFTVhURHlkeW02ektoSXB1Z3l3dkpwdHIyMwpYeUFRcUdzOUJ3S0JnR1ljODV1QkUveSsyTDZ3ckhRek5qdVMxZzFlTFpGUW5vMFphQ0g0VzJjNjRMOXp0eExjClZ6S3VLUjBRQ1UxMmx1WkNvREQ5Sk1WTVRoUW1jdHMwendrQ0FYRlJ6WURWdzhXQWZLcEpESk1sbzlmbWp6QUMKckEwRUpmMWNWQmNvTGxqS09LaEFhQ2lLbzVqcCt5SGYwN3pINGFFbVJma2Q4MlBiUnA1OWF2M0hBb0dCQU1oeQplNGhSb2dabjlDakt0MUtDU1M2QWZsQS9aV0RvMVFLWTFyNkJHaVZFZURuQ3VkQ0huaUlBVHhaY2F1cy9mZWk0Cm1Ed3JhS29FV3p2RUlVK3p4YjBwVzBsTjQySVNzNTBCcDBUbnZRK2cvYXkzNkJSYmxRVm5DbEZnL2Myd1hEZnUKdWVvcnVRaWNnWVViYlJ5bnZhNlBxdmQyN0FONmlEdmVDeDRlekhIUEFvR0JBTVowdWhUWVdGMHJ3alZDc0t5cAp3OWJpd3A1dTBjR3VxOE9jS1BsSnEyL1g3d0hpR0ZpSVJxV2RndWk1Um8ydmUyTkNkS0oyVE5VYWd1a0NPSjduCnBVeE9LNXFhZmZPWVhWWG1tbnRZejAzQWFSSElUWWx0TXpMUUVHbDBwdHU4Zm9zb0FQR0hXRWdHd1RsTFNRU1gKWVNDWVIyL3JxRGRpaVlZWlFWR3pjeVJDCi0tLS0tRU5EIFBSSVZBVEUgS0VZLS0tLS0K + tls.crt: "" + tls.key: "" + From 336da99178145fad0915c2ea2c83f62574f0bc8f Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sat, 25 Jan 2025 23:49:29 +0200 Subject: [PATCH 262/308] change sof-app01 to be point to mian --- terraform/sof-app01/argo-app01.tf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/terraform/sof-app01/argo-app01.tf b/terraform/sof-app01/argo-app01.tf index 428789a6a..e0e2c1116 100644 --- a/terraform/sof-app01/argo-app01.tf +++ b/terraform/sof-app01/argo-app01.tf @@ -33,8 +33,7 @@ resource "argocd_application" "sof-app01" { repo_url = "https://github.com/dimitardd/devops-programme" path = "deployment" target_revision = "main" - # Uncomment and add if required: - # repo = "https://github.com/dimitardd/devops-programme" } } } + From 5c2b5eaa0e66977724b5e882b7f0e9f772c9cb6f Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sat, 25 Jan 2025 21:53:17 +0000 Subject: [PATCH 263/308] Update image to 336da99178145fad0915c2ea2c83f62574f0bc8f --- deployment/sof-app01.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index e6e8bed91..b15c74c7f 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -18,7 +18,7 @@ spec: serviceAccountName: sof-app01-sa containers: - name: sof-app01 - image: dimitardd/dimitar-app02:f06c238537dfbc6d381a22a7b893823eed98e652 #Auto deplayed from build + image: dimitardd/dimitar-app02:336da99178145fad0915c2ea2c83f62574f0bc8f #Auto deplayed from build # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green # image: dimitardd/dimitar-app02:207e179a46ce047db5ac0d73ec2a1b0fb9352514 #Blue # image: dimitardd/dimitar-app01:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Yellow From 75044e5595c7cab3feedf2c2d8a3f22eefa0fde0 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 00:09:20 +0200 Subject: [PATCH 264/308] Update deplayment for ArgoCD --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 9597a475b..77b6bc3d1 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -166,7 +166,7 @@ jobs: git config --local user.name "Dimitar Dimitrov" git add $GITHUB_WORKSPACE/deployment/sof-app01.yaml git commit -m "Update image to ${{ github.sha }}" - git push origin dimitardd-281024 + git push origin main env: github_token: ${{ secrets.GIT_TOKEN }} GITHUB_SHA: ${{ github.sha }} From 95b77639a6441855f72b7d551259992145a1a3b6 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 00:17:09 +0200 Subject: [PATCH 265/308] Update deplayment for ArgoCD --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 9597a475b..77b6bc3d1 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -166,7 +166,7 @@ jobs: git config --local user.name "Dimitar Dimitrov" git add $GITHUB_WORKSPACE/deployment/sof-app01.yaml git commit -m "Update image to ${{ github.sha }}" - git push origin dimitardd-281024 + git push origin main env: github_token: ${{ secrets.GIT_TOKEN }} GITHUB_SHA: ${{ github.sha }} From b5a51658d26a8d4c18351854a78e83ef4e9dbd1f Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sat, 25 Jan 2025 22:20:29 +0000 Subject: [PATCH 266/308] Update image to 95b77639a6441855f72b7d551259992145a1a3b6 --- deployment/sof-app01.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index e6e8bed91..6b858a043 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -18,7 +18,7 @@ spec: serviceAccountName: sof-app01-sa containers: - name: sof-app01 - image: dimitardd/dimitar-app02:f06c238537dfbc6d381a22a7b893823eed98e652 #Auto deplayed from build + image: dimitardd/dimitar-app02:95b77639a6441855f72b7d551259992145a1a3b6 #Auto deplayed from build # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green # image: dimitardd/dimitar-app02:207e179a46ce047db5ac0d73ec2a1b0fb9352514 #Blue # image: dimitardd/dimitar-app01:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Yellow From a98548edff1b60d95049d1bdc71b9601bf4d9944 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 00:38:17 +0200 Subject: [PATCH 267/308] terrafrorm ction plan --- .github/workflows/github-action-terraform.yml | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/github-action-terraform.yml diff --git a/.github/workflows/github-action-terraform.yml b/.github/workflows/github-action-terraform.yml new file mode 100644 index 000000000..eedad3eda --- /dev/null +++ b/.github/workflows/github-action-terraform.yml @@ -0,0 +1,25 @@ +name: GitHub Actions Demo +run-name: ${{ github.actor }} is testing out GitHub Actions πŸš€ +on: + push: + paths: + - 'terraform/**' + - 'github/workflows/github-action-terraform.yml' + branches: + - main +jobs: + Terraform-init-plan: + runs-on: self-hosted + steps: + - name: Check out repo + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Set up Terraform + uses: hashicorp/setup-terraform@v1 + with: + terraform_version: 1.10.5 + - name: Terraform Init + run: terraform init + - name: Terraform Plan + run: terraform plan From abeeee8e8cdd44999e38895d7fd86bd9c772e6fc Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 00:40:49 +0200 Subject: [PATCH 268/308] ignor githuba action for terraform --- .github/workflows/github-actions-demo.yml | 1 + terraform/sof-app01/argo-app01.tf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 77b6bc3d1..edc7a7bf0 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -12,6 +12,7 @@ on: - '.editorconfig' - '*.md' - 'LICENSE' + - 'github/workflows/github-action-terraform.yml' branches: - main - dimitardd-281024 diff --git a/terraform/sof-app01/argo-app01.tf b/terraform/sof-app01/argo-app01.tf index e0e2c1116..8f768b0c5 100644 --- a/terraform/sof-app01/argo-app01.tf +++ b/terraform/sof-app01/argo-app01.tf @@ -10,7 +10,7 @@ resource "argocd_application" "sof-app01" { sync_options = ["Validate=true"] retry { - limit = "5" + limit = "2" backoff { duration = "5s" From 90cc192c67fd5ee34f6fae3463805365577b647f Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 00:51:32 +0200 Subject: [PATCH 269/308] change terraform action plan to include dimitardd as branche --- .github/workflows/github-action-terraform.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/github-action-terraform.yml b/.github/workflows/github-action-terraform.yml index eedad3eda..2e9d150cd 100644 --- a/.github/workflows/github-action-terraform.yml +++ b/.github/workflows/github-action-terraform.yml @@ -7,6 +7,7 @@ on: - 'github/workflows/github-action-terraform.yml' branches: - main + - dimitardd-* jobs: Terraform-init-plan: runs-on: self-hosted From ccf2d35771e53c057e9f6cf0c5bda0c862050492 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 00:38:17 +0200 Subject: [PATCH 270/308] terrafrorm ction plan --- .github/workflows/github-action-terraform.yml | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/github-action-terraform.yml diff --git a/.github/workflows/github-action-terraform.yml b/.github/workflows/github-action-terraform.yml new file mode 100644 index 000000000..eedad3eda --- /dev/null +++ b/.github/workflows/github-action-terraform.yml @@ -0,0 +1,25 @@ +name: GitHub Actions Demo +run-name: ${{ github.actor }} is testing out GitHub Actions πŸš€ +on: + push: + paths: + - 'terraform/**' + - 'github/workflows/github-action-terraform.yml' + branches: + - main +jobs: + Terraform-init-plan: + runs-on: self-hosted + steps: + - name: Check out repo + uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Set up Terraform + uses: hashicorp/setup-terraform@v1 + with: + terraform_version: 1.10.5 + - name: Terraform Init + run: terraform init + - name: Terraform Plan + run: terraform plan From 614d0413e28feb7f4de801b1ff0975c597293b63 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 00:40:49 +0200 Subject: [PATCH 271/308] ignor githuba action for terraform --- .github/workflows/github-actions-demo.yml | 1 + terraform/sof-app01/argo-app01.tf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 77b6bc3d1..edc7a7bf0 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -12,6 +12,7 @@ on: - '.editorconfig' - '*.md' - 'LICENSE' + - 'github/workflows/github-action-terraform.yml' branches: - main - dimitardd-281024 diff --git a/terraform/sof-app01/argo-app01.tf b/terraform/sof-app01/argo-app01.tf index e0e2c1116..8f768b0c5 100644 --- a/terraform/sof-app01/argo-app01.tf +++ b/terraform/sof-app01/argo-app01.tf @@ -10,7 +10,7 @@ resource "argocd_application" "sof-app01" { sync_options = ["Validate=true"] retry { - limit = "5" + limit = "2" backoff { duration = "5s" From b28a35f3f6b415f1b1fa34c52c117a8ed4db62ef Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 00:51:32 +0200 Subject: [PATCH 272/308] change terraform action plan to include dimitardd as branche --- .github/workflows/github-action-terraform.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/github-action-terraform.yml b/.github/workflows/github-action-terraform.yml index eedad3eda..2e9d150cd 100644 --- a/.github/workflows/github-action-terraform.yml +++ b/.github/workflows/github-action-terraform.yml @@ -7,6 +7,7 @@ on: - 'github/workflows/github-action-terraform.yml' branches: - main + - dimitardd-* jobs: Terraform-init-plan: runs-on: self-hosted From 1a66e7e147324c1e03b064c70f29e43d56b24724 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sat, 25 Jan 2025 21:53:17 +0000 Subject: [PATCH 273/308] Update image to 336da99178145fad0915c2ea2c83f62574f0bc8f --- .github/workflows/github-action-terraform.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github-action-terraform.yml b/.github/workflows/github-action-terraform.yml index 2e9d150cd..9c110871d 100644 --- a/.github/workflows/github-action-terraform.yml +++ b/.github/workflows/github-action-terraform.yml @@ -21,6 +21,9 @@ jobs: with: terraform_version: 1.10.5 - name: Terraform Init - run: terraform init + run: | + ls -la + pwd + terraform init - name: Terraform Plan run: terraform plan From 9818d9d07de67d343056fa1ab46f4b90f5a02af2 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 01:09:23 +0200 Subject: [PATCH 274/308] github action location for terraform --- .github/workflows/github-action-terraform.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github-action-terraform.yml b/.github/workflows/github-action-terraform.yml index 9c110871d..0577d523b 100644 --- a/.github/workflows/github-action-terraform.yml +++ b/.github/workflows/github-action-terraform.yml @@ -20,10 +20,11 @@ jobs: uses: hashicorp/setup-terraform@v1 with: terraform_version: 1.10.5 - - name: Terraform Init + - name: Terraform Init sof-app01 run: | ls -la pwd + cd terraform/sof-app01 terraform init - name: Terraform Plan run: terraform plan From 4656e6812bdb45e29d142994238250de5f979774 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 01:11:52 +0200 Subject: [PATCH 275/308] terraform location files --- .github/workflows/github-action-terraform.yml | 4 +++- .github/workflows/github-actions-demo.yml | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-action-terraform.yml b/.github/workflows/github-action-terraform.yml index 0577d523b..3712f1ead 100644 --- a/.github/workflows/github-action-terraform.yml +++ b/.github/workflows/github-action-terraform.yml @@ -27,4 +27,6 @@ jobs: cd terraform/sof-app01 terraform init - name: Terraform Plan - run: terraform plan + run: | + cd terraform/sof-app01 + terraform plan diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index edc7a7bf0..6ba15f9a4 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -15,7 +15,6 @@ on: - 'github/workflows/github-action-terraform.yml' branches: - main - - dimitardd-281024 env: IMAGE_TAG: dimitardd/dimitar-app02 jobs: From 1a77e592c50e7a3aff119d9602e70a8f38c308fc Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 01:13:29 +0200 Subject: [PATCH 276/308] sof-app01 terraform test --- terraform/sof-app01/argo-app01.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/sof-app01/argo-app01.tf b/terraform/sof-app01/argo-app01.tf index 8f768b0c5..8b89cad7c 100644 --- a/terraform/sof-app01/argo-app01.tf +++ b/terraform/sof-app01/argo-app01.tf @@ -10,7 +10,7 @@ resource "argocd_application" "sof-app01" { sync_options = ["Validate=true"] retry { - limit = "2" + limit = "3" backoff { duration = "5s" From 80264a5b4139e9a3f424bf40f003f2215ad4f64e Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 01:17:15 +0200 Subject: [PATCH 277/308] disable backend location --- terraform/sof-app01/provider.tf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/terraform/sof-app01/provider.tf b/terraform/sof-app01/provider.tf index 1b3e3aec0..35c76eae8 100644 --- a/terraform/sof-app01/provider.tf +++ b/terraform/sof-app01/provider.tf @@ -27,8 +27,8 @@ provider "argocd" { password = var.password } -terraform { - backend "local" { - path = "/Users/dimitar.dimitrov/devops/telerik/terraform-argocd-sof-app01.tfstate" - } -} +#terraform { +# backend "local" { +# path = "/Users/dimitar.dimitrov/devops/telerik/terraform-argocd-sof-app01.tfstate" +# } +#} From 95c5e19f02be036e822b96ffc862e95023109629 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 01:29:32 +0200 Subject: [PATCH 278/308] new terraform pat for sof-app01 in self-worker --- terraform/sof-app01/provider.tf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/terraform/sof-app01/provider.tf b/terraform/sof-app01/provider.tf index 35c76eae8..8fcb394c6 100644 --- a/terraform/sof-app01/provider.tf +++ b/terraform/sof-app01/provider.tf @@ -27,8 +27,8 @@ provider "argocd" { password = var.password } -#terraform { -# backend "local" { -# path = "/Users/dimitar.dimitrov/devops/telerik/terraform-argocd-sof-app01.tfstate" -# } -#} +terraform { + backend "local" { + path = "/opt/actions-runner/terraform-argocd-sof-app01.tfstate" + } +} From 4e11395b1db10dbca1e45cdb43c91d6f88adc543 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 01:41:58 +0200 Subject: [PATCH 279/308] test github action terraform --- .github/workflows/github-action-terraform.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/github-action-terraform.yml b/.github/workflows/github-action-terraform.yml index 3712f1ead..c02184455 100644 --- a/.github/workflows/github-action-terraform.yml +++ b/.github/workflows/github-action-terraform.yml @@ -28,5 +28,8 @@ jobs: terraform init - name: Terraform Plan run: | + export KUBECONFIG=~/.kube/sof-lab03 + kubectl config set-context sof-lab03 + kubectl port-forward svc/argo-cd-7-1734333419-argocd-server -n argocd 8080:443 cd terraform/sof-app01 terraform plan From 3cc484fe2240c7474cdc5997f77c88e6691da402 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 01:47:46 +0200 Subject: [PATCH 280/308] separate jibs for run kube settings and terraform plan --- .github/workflows/github-action-terraform.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github-action-terraform.yml b/.github/workflows/github-action-terraform.yml index c02184455..c4bb0f81f 100644 --- a/.github/workflows/github-action-terraform.yml +++ b/.github/workflows/github-action-terraform.yml @@ -26,10 +26,12 @@ jobs: pwd cd terraform/sof-app01 terraform init - - name: Terraform Plan + - name: Kubernetes access preparation run: | export KUBECONFIG=~/.kube/sof-lab03 kubectl config set-context sof-lab03 kubectl port-forward svc/argo-cd-7-1734333419-argocd-server -n argocd 8080:443 + - name: Terraform Plan sof-app01 + run: | cd terraform/sof-app01 terraform plan From 065ccc9838c0aafb530ae463df92d5a98a84b848 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 01:49:37 +0200 Subject: [PATCH 281/308] sof-app01 limit 1 --- terraform/sof-app01/argo-app01.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/sof-app01/argo-app01.tf b/terraform/sof-app01/argo-app01.tf index 8b89cad7c..92f4fce40 100644 --- a/terraform/sof-app01/argo-app01.tf +++ b/terraform/sof-app01/argo-app01.tf @@ -10,7 +10,7 @@ resource "argocd_application" "sof-app01" { sync_options = ["Validate=true"] retry { - limit = "3" + limit = "1" backoff { duration = "5s" From 385d58aa6933a6ea406d751d2714715ef457b311 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 01:53:30 +0200 Subject: [PATCH 282/308] test githuv action --- .github/workflows/github-action-terraform.yml | 2 +- terraform/sof-app01/argo-app01.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-action-terraform.yml b/.github/workflows/github-action-terraform.yml index c4bb0f81f..7d2e03e99 100644 --- a/.github/workflows/github-action-terraform.yml +++ b/.github/workflows/github-action-terraform.yml @@ -30,7 +30,7 @@ jobs: run: | export KUBECONFIG=~/.kube/sof-lab03 kubectl config set-context sof-lab03 - kubectl port-forward svc/argo-cd-7-1734333419-argocd-server -n argocd 8080:443 + kubectl port-forward svc/argo-cd-7-1734333419-argocd-server -n argocd 8080:443 & - name: Terraform Plan sof-app01 run: | cd terraform/sof-app01 diff --git a/terraform/sof-app01/argo-app01.tf b/terraform/sof-app01/argo-app01.tf index 92f4fce40..8b89cad7c 100644 --- a/terraform/sof-app01/argo-app01.tf +++ b/terraform/sof-app01/argo-app01.tf @@ -10,7 +10,7 @@ resource "argocd_application" "sof-app01" { sync_options = ["Validate=true"] retry { - limit = "1" + limit = "3" backoff { duration = "5s" From 8f2a8d3968f19cf736b746cc68b0e99ca274f05a Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 02:07:57 +0200 Subject: [PATCH 283/308] terraform applay in github action --- .github/workflows/github-action-terraform.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-action-terraform.yml b/.github/workflows/github-action-terraform.yml index 7d2e03e99..d6cf4b6bb 100644 --- a/.github/workflows/github-action-terraform.yml +++ b/.github/workflows/github-action-terraform.yml @@ -1,5 +1,5 @@ -name: GitHub Actions Demo -run-name: ${{ github.actor }} is testing out GitHub Actions πŸš€ +name: GitHub Actions Terraform +run-name: ${{ github.actor }} GitHub Actions πŸš€ on: push: paths: @@ -35,3 +35,7 @@ jobs: run: | cd terraform/sof-app01 terraform plan + - name: Terraform apply sof-app01 + run: | + cd terraform/sof-app01 + terraform apply -auto-approve From 034a4adf6285a3ba4254661231af13f23bc652b7 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 02:09:10 +0200 Subject: [PATCH 284/308] terraform action sof-app01 --- .github/workflows/github-action-terraform.yml | 2 +- terraform/sof-app01/argo-app01.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-action-terraform.yml b/.github/workflows/github-action-terraform.yml index d6cf4b6bb..6b4b106cc 100644 --- a/.github/workflows/github-action-terraform.yml +++ b/.github/workflows/github-action-terraform.yml @@ -1,5 +1,5 @@ name: GitHub Actions Terraform -run-name: ${{ github.actor }} GitHub Actions πŸš€ +run-name: ${{ github.actor }} Terraform GitHub Actions πŸš€ on: push: paths: diff --git a/terraform/sof-app01/argo-app01.tf b/terraform/sof-app01/argo-app01.tf index 8b89cad7c..92f4fce40 100644 --- a/terraform/sof-app01/argo-app01.tf +++ b/terraform/sof-app01/argo-app01.tf @@ -10,7 +10,7 @@ resource "argocd_application" "sof-app01" { sync_options = ["Validate=true"] retry { - limit = "3" + limit = "1" backoff { duration = "5s" From c47066147b04929d6164fc5ae400a5aa5fb7d6b7 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 02:13:35 +0200 Subject: [PATCH 285/308] ignor github action to start if chnage yml for action plan --- .github/workflows/github-actions-demo.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 6ba15f9a4..c26c622e4 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -1,5 +1,5 @@ name: GitHub Actions Demo -run-name: ${{ github.actor }} is testing out GitHub Actions πŸš€ +run-name: ${{ github.actor }} is deploying with GitHub ActionsπŸš€ on: push: paths-ignore: @@ -13,6 +13,7 @@ on: - '*.md' - 'LICENSE' - 'github/workflows/github-action-terraform.yml' + - 'github/workflows/github-actions-demo.yml' branches: - main env: From b74d4903fd4768366b8a6bfd7a8d96b6cb985392 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 02:28:50 +0200 Subject: [PATCH 286/308] add variabled chnaged dir in teeraform --- .github/workflows/github-action-terraform.yml | 53 ++++++++++++++----- terraform/sof-app01/argo-app01.tf | 3 +- terraform/sof-app02/argo-app02.tf | 2 +- 3 files changed, 43 insertions(+), 15 deletions(-) diff --git a/.github/workflows/github-action-terraform.yml b/.github/workflows/github-action-terraform.yml index 6b4b106cc..2c79e2400 100644 --- a/.github/workflows/github-action-terraform.yml +++ b/.github/workflows/github-action-terraform.yml @@ -9,7 +9,7 @@ on: - main - dimitardd-* jobs: - Terraform-init-plan: + Terraform-action: runs-on: self-hosted steps: - name: Check out repo @@ -20,22 +20,51 @@ jobs: uses: hashicorp/setup-terraform@v1 with: terraform_version: 1.10.5 - - name: Terraform Init sof-app01 + - name: Determine changed directories + id: changed_dirs run: | - ls -la - pwd - cd terraform/sof-app01 - terraform init + echo "Finding changed directories..." + dirs=$(git diff --name-only ${{ github.event.before }} ${{ github.sha }} -- terraform/ | grep -o 'terraform/[^/]*' | sort -u) + echo "Changed directories: $dirs" + echo "changed_dirs=$dirs" >> $GITHUB_ENV + - name: Check for changes in Terraform directories + id: check_changes + run: | + if [ -z "${{ steps.changed_dirs.outputs.changed_dirs }}" ]; then + echo "No changes in Terraform directories." + echo "should_run=false" >> $GITHUB_ENV + else + echo "Changes detected in: ${{ steps.changed_dirs.outputs.changed_dirs }}" + echo "should_run=true" >> $GITHUB_ENV + fi + + - name: Terraform Init + if: github.env.should_run == 'true' + run: | + for dir in ${{ steps.changed_dirs.outputs.changed_dirs }}; do + echo "Initializing Terraform in directory: $dir" + cd $dir + terraform init + done - name: Kubernetes access preparation + if: github.env.should_run == 'true' run: | export KUBECONFIG=~/.kube/sof-lab03 kubectl config set-context sof-lab03 kubectl port-forward svc/argo-cd-7-1734333419-argocd-server -n argocd 8080:443 & - - name: Terraform Plan sof-app01 + - name: Terraform Plan + if: github.env.should_run == 'true' run: | - cd terraform/sof-app01 - terraform plan - - name: Terraform apply sof-app01 + for dir in ${{ steps.changed_dirs.outputs.changed_dirs }}; do + echo "Running Terraform plan in directory: $dir" + cd $dir + terraform plan + done + - name: Terraform Apply + if: github.env.should_run == 'true' run: | - cd terraform/sof-app01 - terraform apply -auto-approve + for dir in ${{ steps.changed_dirs.outputs.changed_dirs }}; do + echo "Applying Terraform changes in directory: $dir" + cd $dir + terraform apply -auto-approve + done diff --git a/terraform/sof-app01/argo-app01.tf b/terraform/sof-app01/argo-app01.tf index 92f4fce40..f2554d626 100644 --- a/terraform/sof-app01/argo-app01.tf +++ b/terraform/sof-app01/argo-app01.tf @@ -10,7 +10,7 @@ resource "argocd_application" "sof-app01" { sync_options = ["Validate=true"] retry { - limit = "1" + limit = "2" backoff { duration = "5s" @@ -36,4 +36,3 @@ resource "argocd_application" "sof-app01" { } } } - diff --git a/terraform/sof-app02/argo-app02.tf b/terraform/sof-app02/argo-app02.tf index 27d928604..072e91f9e 100644 --- a/terraform/sof-app02/argo-app02.tf +++ b/terraform/sof-app02/argo-app02.tf @@ -10,7 +10,7 @@ resource "argocd_application" "sof-app02" { sync_options = ["Validate=true"] retry { - limit = "2" + limit = "3" backoff { duration = "5s" From 65d54b50894aae8e88c140657ce2b787e934741a Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 02:35:27 +0200 Subject: [PATCH 287/308] sof-app02 state tf file location --- terraform/sof-app02/provider.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/sof-app02/provider.tf b/terraform/sof-app02/provider.tf index cbe5f04c4..f8bf15454 100644 --- a/terraform/sof-app02/provider.tf +++ b/terraform/sof-app02/provider.tf @@ -29,6 +29,6 @@ provider "argocd" { terraform { backend "local" { - path = "/Users/dimitar.dimitrov/devops/telerik/terraform-argocd-sof-app02.tfstate" + path = "/opt/actions-runner/terraform-argocd-sof-app02.tfstate" } } From 79ff96c4d19853b152e76a0416c9f722a702a0cf Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 02:36:42 +0200 Subject: [PATCH 288/308] sof-app02 parameter change --- terraform/sof-app02/argo-app02.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/sof-app02/argo-app02.tf b/terraform/sof-app02/argo-app02.tf index 072e91f9e..ce533bb82 100644 --- a/terraform/sof-app02/argo-app02.tf +++ b/terraform/sof-app02/argo-app02.tf @@ -10,7 +10,7 @@ resource "argocd_application" "sof-app02" { sync_options = ["Validate=true"] retry { - limit = "3" + limit = "5" backoff { duration = "5s" From 5165b202531d87d2fb0224baf6e7d8c8c04dd2e8 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 02:45:20 +0200 Subject: [PATCH 289/308] test dinamic folder selectin in terraform action plan --- .github/workflows/github-action-terraform.yml | 10 +++++----- terraform/sof-app01/argo-app01.tf | 2 +- terraform/sof-app02/argo-app02.tf | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/github-action-terraform.yml b/.github/workflows/github-action-terraform.yml index 2c79e2400..00d15e6e5 100644 --- a/.github/workflows/github-action-terraform.yml +++ b/.github/workflows/github-action-terraform.yml @@ -30,18 +30,18 @@ jobs: - name: Check for changes in Terraform directories id: check_changes run: | - if [ -z "${{ steps.changed_dirs.outputs.changed_dirs }}" ]; then + if [ -z "$changed_dirs" ]; then echo "No changes in Terraform directories." echo "should_run=false" >> $GITHUB_ENV else - echo "Changes detected in: ${{ steps.changed_dirs.outputs.changed_dirs }}" + echo "Changes detected in: $changed_dirs" echo "should_run=true" >> $GITHUB_ENV fi - name: Terraform Init if: github.env.should_run == 'true' run: | - for dir in ${{ steps.changed_dirs.outputs.changed_dirs }}; do + for dir in $changed_dirs; do echo "Initializing Terraform in directory: $dir" cd $dir terraform init @@ -55,7 +55,7 @@ jobs: - name: Terraform Plan if: github.env.should_run == 'true' run: | - for dir in ${{ steps.changed_dirs.outputs.changed_dirs }}; do + for dir in $changed_dirs; do echo "Running Terraform plan in directory: $dir" cd $dir terraform plan @@ -63,7 +63,7 @@ jobs: - name: Terraform Apply if: github.env.should_run == 'true' run: | - for dir in ${{ steps.changed_dirs.outputs.changed_dirs }}; do + for dir in $changed_dirs; do echo "Applying Terraform changes in directory: $dir" cd $dir terraform apply -auto-approve diff --git a/terraform/sof-app01/argo-app01.tf b/terraform/sof-app01/argo-app01.tf index f2554d626..3b23554a7 100644 --- a/terraform/sof-app01/argo-app01.tf +++ b/terraform/sof-app01/argo-app01.tf @@ -10,7 +10,7 @@ resource "argocd_application" "sof-app01" { sync_options = ["Validate=true"] retry { - limit = "2" + limit = "3" backoff { duration = "5s" diff --git a/terraform/sof-app02/argo-app02.tf b/terraform/sof-app02/argo-app02.tf index ce533bb82..89ecc250a 100644 --- a/terraform/sof-app02/argo-app02.tf +++ b/terraform/sof-app02/argo-app02.tf @@ -10,7 +10,7 @@ resource "argocd_application" "sof-app02" { sync_options = ["Validate=true"] retry { - limit = "5" + limit = "1" backoff { duration = "5s" From 03f280df61f2faf5bf5541c4a6d806c79ccd6d39 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 02:49:38 +0200 Subject: [PATCH 290/308] test auto selection terraform fir --- .github/workflows/github-action-terraform.yml | 3 ++- terraform/sof-app01/argo-app01.tf | 2 +- terraform/sof-app02/argo-app02.tf | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/github-action-terraform.yml b/.github/workflows/github-action-terraform.yml index 00d15e6e5..eddf890cc 100644 --- a/.github/workflows/github-action-terraform.yml +++ b/.github/workflows/github-action-terraform.yml @@ -25,8 +25,9 @@ jobs: run: | echo "Finding changed directories..." dirs=$(git diff --name-only ${{ github.event.before }} ${{ github.sha }} -- terraform/ | grep -o 'terraform/[^/]*' | sort -u) + changed_dirs=$(echo "$dirs" | tr '\n' ',' | sed 's/,$//') echo "Changed directories: $dirs" - echo "changed_dirs=$dirs" >> $GITHUB_ENV + echo "changed_dirs=$changed_dirs" >> $GITHUB_ENV - name: Check for changes in Terraform directories id: check_changes run: | diff --git a/terraform/sof-app01/argo-app01.tf b/terraform/sof-app01/argo-app01.tf index 3b23554a7..27840f6e1 100644 --- a/terraform/sof-app01/argo-app01.tf +++ b/terraform/sof-app01/argo-app01.tf @@ -10,7 +10,7 @@ resource "argocd_application" "sof-app01" { sync_options = ["Validate=true"] retry { - limit = "3" + limit = "4" backoff { duration = "5s" diff --git a/terraform/sof-app02/argo-app02.tf b/terraform/sof-app02/argo-app02.tf index 89ecc250a..43d9593a5 100644 --- a/terraform/sof-app02/argo-app02.tf +++ b/terraform/sof-app02/argo-app02.tf @@ -10,7 +10,7 @@ resource "argocd_application" "sof-app02" { sync_options = ["Validate=true"] retry { - limit = "1" + limit = "4" backoff { duration = "5s" From 3c25ba4cae55e926b6a827484f28c47f60433a2e Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 02:59:04 +0200 Subject: [PATCH 291/308] AUTO SELECT DIR IN TERRAFORM --- .github/workflows/github-action-terraform.yml | 24 +++++++++---------- terraform/sof-app01/argo-app01.tf | 2 +- terraform/sof-app02/argo-app02.tf | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/github-action-terraform.yml b/.github/workflows/github-action-terraform.yml index eddf890cc..eb0239e19 100644 --- a/.github/workflows/github-action-terraform.yml +++ b/.github/workflows/github-action-terraform.yml @@ -38,14 +38,14 @@ jobs: echo "Changes detected in: $changed_dirs" echo "should_run=true" >> $GITHUB_ENV fi - + echo $should_run - name: Terraform Init if: github.env.should_run == 'true' run: | - for dir in $changed_dirs; do - echo "Initializing Terraform in directory: $dir" - cd $dir - terraform init + for dir in ${changed_dirs//,/ }; do + echo "Initializing Terraform in directory: $dir" + cd $dir + terraform init done - name: Kubernetes access preparation if: github.env.should_run == 'true' @@ -56,16 +56,16 @@ jobs: - name: Terraform Plan if: github.env.should_run == 'true' run: | - for dir in $changed_dirs; do - echo "Running Terraform plan in directory: $dir" - cd $dir - terraform plan + for dir in ${changed_dirs//,/ }; do + echo "Running Terraform plan in directory: $dir" + cd $dir + terraform plan done - name: Terraform Apply if: github.env.should_run == 'true' run: | for dir in $changed_dirs; do - echo "Applying Terraform changes in directory: $dir" - cd $dir - terraform apply -auto-approve + echo "Applying Terraform changes in directory: $dir" + cd $dir + terraform apply -auto-approve done diff --git a/terraform/sof-app01/argo-app01.tf b/terraform/sof-app01/argo-app01.tf index 27840f6e1..c12805ae1 100644 --- a/terraform/sof-app01/argo-app01.tf +++ b/terraform/sof-app01/argo-app01.tf @@ -10,7 +10,7 @@ resource "argocd_application" "sof-app01" { sync_options = ["Validate=true"] retry { - limit = "4" + limit = "5" backoff { duration = "5s" diff --git a/terraform/sof-app02/argo-app02.tf b/terraform/sof-app02/argo-app02.tf index 43d9593a5..ce533bb82 100644 --- a/terraform/sof-app02/argo-app02.tf +++ b/terraform/sof-app02/argo-app02.tf @@ -10,7 +10,7 @@ resource "argocd_application" "sof-app02" { sync_options = ["Validate=true"] retry { - limit = "4" + limit = "5" backoff { duration = "5s" From b0285188554b22f6ff552e62121206444bc7a3d6 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 03:02:07 +0200 Subject: [PATCH 292/308] auto select folder --- .github/workflows/github-action-terraform.yml | 2 +- terraform/sof-app01/argo-app01.tf | 2 +- terraform/sof-app02/argo-app02.tf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/github-action-terraform.yml b/.github/workflows/github-action-terraform.yml index eb0239e19..60acfebf6 100644 --- a/.github/workflows/github-action-terraform.yml +++ b/.github/workflows/github-action-terraform.yml @@ -40,7 +40,7 @@ jobs: fi echo $should_run - name: Terraform Init - if: github.env.should_run == 'true' + if: env.should_run == 'true' run: | for dir in ${changed_dirs//,/ }; do echo "Initializing Terraform in directory: $dir" diff --git a/terraform/sof-app01/argo-app01.tf b/terraform/sof-app01/argo-app01.tf index c12805ae1..f60b80cd8 100644 --- a/terraform/sof-app01/argo-app01.tf +++ b/terraform/sof-app01/argo-app01.tf @@ -10,7 +10,7 @@ resource "argocd_application" "sof-app01" { sync_options = ["Validate=true"] retry { - limit = "5" + limit = "6" backoff { duration = "5s" diff --git a/terraform/sof-app02/argo-app02.tf b/terraform/sof-app02/argo-app02.tf index ce533bb82..940e4cc63 100644 --- a/terraform/sof-app02/argo-app02.tf +++ b/terraform/sof-app02/argo-app02.tf @@ -10,7 +10,7 @@ resource "argocd_application" "sof-app02" { sync_options = ["Validate=true"] retry { - limit = "5" + limit = "6" backoff { duration = "5s" From 0d35d47e32cef2c35b93b9da450998d072e615ed Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 03:08:30 +0200 Subject: [PATCH 293/308] terraform auto select --- .github/workflows/github-action-terraform.yml | 14 +++++++------- terraform/sof-app01/argo-app01.tf | 2 +- terraform/sof-app02/argo-app02.tf | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/github-action-terraform.yml b/.github/workflows/github-action-terraform.yml index 60acfebf6..61620d6c4 100644 --- a/.github/workflows/github-action-terraform.yml +++ b/.github/workflows/github-action-terraform.yml @@ -44,28 +44,28 @@ jobs: run: | for dir in ${changed_dirs//,/ }; do echo "Initializing Terraform in directory: $dir" - cd $dir + cd /opt/actions-runner/_work/devops-programme/devops-programme/$dir terraform init done - name: Kubernetes access preparation - if: github.env.should_run == 'true' + if: env.should_run == 'true' run: | export KUBECONFIG=~/.kube/sof-lab03 kubectl config set-context sof-lab03 kubectl port-forward svc/argo-cd-7-1734333419-argocd-server -n argocd 8080:443 & - name: Terraform Plan - if: github.env.should_run == 'true' + if: env.should_run == 'true' run: | for dir in ${changed_dirs//,/ }; do echo "Running Terraform plan in directory: $dir" - cd $dir + cd /opt/actions-runner/_work/devops-programme/devops-programme/$dir terraform plan done - name: Terraform Apply - if: github.env.should_run == 'true' + if: env.should_run == 'true' run: | - for dir in $changed_dirs; do + for dir in ${changed_dirs//,/ }; do echo "Applying Terraform changes in directory: $dir" - cd $dir + cd /opt/actions-runner/_work/devops-programme/devops-programme/$dir terraform apply -auto-approve done diff --git a/terraform/sof-app01/argo-app01.tf b/terraform/sof-app01/argo-app01.tf index f60b80cd8..c234d5c32 100644 --- a/terraform/sof-app01/argo-app01.tf +++ b/terraform/sof-app01/argo-app01.tf @@ -10,7 +10,7 @@ resource "argocd_application" "sof-app01" { sync_options = ["Validate=true"] retry { - limit = "6" + limit = "1" backoff { duration = "5s" diff --git a/terraform/sof-app02/argo-app02.tf b/terraform/sof-app02/argo-app02.tf index 940e4cc63..89ecc250a 100644 --- a/terraform/sof-app02/argo-app02.tf +++ b/terraform/sof-app02/argo-app02.tf @@ -10,7 +10,7 @@ resource "argocd_application" "sof-app02" { sync_options = ["Validate=true"] retry { - limit = "6" + limit = "1" backoff { duration = "5s" From 613ecb29c1950180e54e75d8eb9148932a608ba5 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 03:15:17 +0200 Subject: [PATCH 294/308] add schedule on terraform --- .github/workflows/github-action-terraform.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/github-action-terraform.yml b/.github/workflows/github-action-terraform.yml index 61620d6c4..f6b75169a 100644 --- a/.github/workflows/github-action-terraform.yml +++ b/.github/workflows/github-action-terraform.yml @@ -1,6 +1,9 @@ name: GitHub Actions Terraform run-name: ${{ github.actor }} Terraform GitHub Actions πŸš€ on: + schedule: + # Runs every Hour from 8AM to 5PM on weekdays + - cron: '0 8-17 * * 1-5' push: paths: - 'terraform/**' From 597859068b2fda464c4bdcd1fea12d5cc366ca8f Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 03:17:14 +0200 Subject: [PATCH 295/308] set brancher for github action triger --- .github/workflows/github-action-terraform.yml | 2 +- .github/workflows/github-actions-demo.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github-action-terraform.yml b/.github/workflows/github-action-terraform.yml index f6b75169a..57bb00fae 100644 --- a/.github/workflows/github-action-terraform.yml +++ b/.github/workflows/github-action-terraform.yml @@ -10,7 +10,7 @@ on: - 'github/workflows/github-action-terraform.yml' branches: - main - - dimitardd-* + - infra-* jobs: Terraform-action: runs-on: self-hosted diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index c26c622e4..ba869edc8 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -16,6 +16,7 @@ on: - 'github/workflows/github-actions-demo.yml' branches: - main + - feature-* env: IMAGE_TAG: dimitardd/dimitar-app02 jobs: From 7819cdb9796a795c942b6e9f90e8e8551d6f0c09 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 21:17:31 +0200 Subject: [PATCH 296/308] commit From 2fa14cf645c2e32e4c74251978fabeebc6b8e360 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 21:32:12 +0200 Subject: [PATCH 297/308] mage fix --- .github/workflows/github-action-terraform.yml | 19 ------------------- .github/workflows/github-actions-demo.yml | 3 --- terraform/sof-app01/argo-app01.tf | 4 ---- 3 files changed, 26 deletions(-) diff --git a/.github/workflows/github-action-terraform.yml b/.github/workflows/github-action-terraform.yml index a25e26e1d..57bb00fae 100644 --- a/.github/workflows/github-action-terraform.yml +++ b/.github/workflows/github-action-terraform.yml @@ -1,30 +1,18 @@ -<<<<<<< HEAD -name: GitHub Actions Demo -run-name: ${{ github.actor }} is testing out GitHub Actions πŸš€ -on: -======= name: GitHub Actions Terraform run-name: ${{ github.actor }} Terraform GitHub Actions πŸš€ on: schedule: # Runs every Hour from 8AM to 5PM on weekdays - cron: '0 8-17 * * 1-5' ->>>>>>> dimitardd-281024 push: paths: - 'terraform/**' - 'github/workflows/github-action-terraform.yml' branches: - main -<<<<<<< HEAD - - dimitardd-* -jobs: - Terraform-init-plan: -======= - infra-* jobs: Terraform-action: ->>>>>>> dimitardd-281024 runs-on: self-hosted steps: - name: Check out repo @@ -35,12 +23,6 @@ jobs: uses: hashicorp/setup-terraform@v1 with: terraform_version: 1.10.5 -<<<<<<< HEAD - - name: Terraform Init - run: terraform init - - name: Terraform Plan - run: terraform plan -======= - name: Determine changed directories id: changed_dirs run: | @@ -90,4 +72,3 @@ jobs: cd /opt/actions-runner/_work/devops-programme/devops-programme/$dir terraform apply -auto-approve done ->>>>>>> dimitardd-281024 diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index b6a0d977d..ba869edc8 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -13,10 +13,7 @@ on: - '*.md' - 'LICENSE' - 'github/workflows/github-action-terraform.yml' -<<<<<<< HEAD -======= - 'github/workflows/github-actions-demo.yml' ->>>>>>> dimitardd-281024 branches: - main - feature-* diff --git a/terraform/sof-app01/argo-app01.tf b/terraform/sof-app01/argo-app01.tf index 49948760f..f2554d626 100644 --- a/terraform/sof-app01/argo-app01.tf +++ b/terraform/sof-app01/argo-app01.tf @@ -10,11 +10,7 @@ resource "argocd_application" "sof-app01" { sync_options = ["Validate=true"] retry { -<<<<<<< HEAD limit = "2" -======= - limit = "1" ->>>>>>> dimitardd-281024 backoff { duration = "5s" From 2b80cf31bff5f03d0e97357ffca9a5c1c08bdfb2 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 21:37:34 +0200 Subject: [PATCH 298/308] fix sof-app02 --- terraform/sof-app02/argo-app02.tf | 2 -- 1 file changed, 2 deletions(-) diff --git a/terraform/sof-app02/argo-app02.tf b/terraform/sof-app02/argo-app02.tf index 89ecc250a..c9d5a19f7 100644 --- a/terraform/sof-app02/argo-app02.tf +++ b/terraform/sof-app02/argo-app02.tf @@ -33,8 +33,6 @@ resource "argocd_application" "sof-app02" { repo_url = "https://github.com/dimitardd/devops-programme" path = "rollout" target_revision = "main" - # Uncomment and add if required: - # repo = "https://github.com/dimitardd/devops-programme" } } } From 8875bd06d8d7e5312935ebf18463fc7dd4ec0499 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 21:39:22 +0200 Subject: [PATCH 299/308] fix sof-app01 --- deployment/sof-app01.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index ad921560f..6b858a043 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -18,11 +18,7 @@ spec: serviceAccountName: sof-app01-sa containers: - name: sof-app01 -<<<<<<< HEAD image: dimitardd/dimitar-app02:95b77639a6441855f72b7d551259992145a1a3b6 #Auto deplayed from build -======= - image: dimitardd/dimitar-app02:336da99178145fad0915c2ea2c83f62574f0bc8f #Auto deplayed from build ->>>>>>> dimitardd-281024 # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green # image: dimitardd/dimitar-app02:207e179a46ce047db5ac0d73ec2a1b0fb9352514 #Blue # image: dimitardd/dimitar-app01:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Yellow From 038a2454f84431d24b4f420005598618b07e7ff8 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 22:10:34 +0200 Subject: [PATCH 300/308] rmeove sof-app02 argo analisys --- rollout/sof-app02-analysis.yaml | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 rollout/sof-app02-analysis.yaml diff --git a/rollout/sof-app02-analysis.yaml b/rollout/sof-app02-analysis.yaml deleted file mode 100644 index a65295eab..000000000 --- a/rollout/sof-app02-analysis.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: AnalysisTemplate -metadata: - name: sof-app02-analysis - namespace: sof-app02 -spec: - metrics: - - name: status-check - successCondition: result = 200 - provider: - prometheus: - address: http://sof-p01.pt.playtech.corp - query: | - flask_http_request_total{status="200"}[5m])) > 0 From 0c4efffe652dd09c38a8c66161f031f12fe9e533 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 22:18:11 +0200 Subject: [PATCH 301/308] new imagge in sof-app01 --- deployment/sof-app01.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 6b858a043..cba007f09 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -18,7 +18,7 @@ spec: serviceAccountName: sof-app01-sa containers: - name: sof-app01 - image: dimitardd/dimitar-app02:95b77639a6441855f72b7d551259992145a1a3b6 #Auto deplayed from build + image: dimitardd/dimitar-app02:2b80cf31bff5f03d0e97357ffca9a5c1c08bdfb2 #Auto deplayed from build # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green # image: dimitardd/dimitar-app02:207e179a46ce047db5ac0d73ec2a1b0fb9352514 #Blue # image: dimitardd/dimitar-app01:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Yellow From 1e56fe554b59efcff692a41867a1c194a4957bce Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 22:26:23 +0200 Subject: [PATCH 302/308] change betta apiversion on sof-app02 --- rollout/sof-app02.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rollout/sof-app02.yaml b/rollout/sof-app02.yaml index 8136a6ba8..c94e6648f 100644 --- a/rollout/sof-app02.yaml +++ b/rollout/sof-app02.yaml @@ -1,4 +1,4 @@ -apiVersion: argoproj.io/v1alpha1 +apiVersion: argoproj.io/v1beta1 kind: Rollout metadata: name: sof-app02 From 63d0c5aac0ccadb99855a0c25085f5fae0e6a2b6 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 22:29:30 +0200 Subject: [PATCH 303/308] alpha1 avi version for sof-app02 --- rollout/sof-app02.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rollout/sof-app02.yaml b/rollout/sof-app02.yaml index c94e6648f..8136a6ba8 100644 --- a/rollout/sof-app02.yaml +++ b/rollout/sof-app02.yaml @@ -1,4 +1,4 @@ -apiVersion: argoproj.io/v1beta1 +apiVersion: argoproj.io/v1alpha1 kind: Rollout metadata: name: sof-app02 From f9d8cadb0337ee5794a01a2be80dd6ac1c99d065 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 22:33:47 +0200 Subject: [PATCH 304/308] Build new immage --- app/app.py | 2 +- app/app_test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/app.py b/app/app.py index 01e8950b9..af668ea1d 100644 --- a/app/app.py +++ b/app/app.py @@ -8,7 +8,7 @@ @app.route("/") def hello_world(): - return "Hello, Fresh World!" + return "Hello, DevOps World!" if __name__ == "__main__": app.run(port=os.environ.get("PORT", 3000), host="0.0.0.0") diff --git a/app/app_test.py b/app/app_test.py index b04f84959..382bc27f4 100644 --- a/app/app_test.py +++ b/app/app_test.py @@ -10,7 +10,7 @@ def setUp(self): def test_hello_world(self): response = self.client.get("/") self.assertEqual(response.status_code, 200) - self.assertEqual(response.data, b"Hello, Fresh World!") + self.assertEqual(response.data, b"Hello, DevOps World!") if __name__ == "__main__": From d751d63bf13d132f83a053ea4d7c3c08fbca457e Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Sun, 26 Jan 2025 20:37:27 +0000 Subject: [PATCH 305/308] Update image to f9d8cadb0337ee5794a01a2be80dd6ac1c99d065 --- deployment/sof-app01.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index cba007f09..132037284 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -18,7 +18,7 @@ spec: serviceAccountName: sof-app01-sa containers: - name: sof-app01 - image: dimitardd/dimitar-app02:2b80cf31bff5f03d0e97357ffca9a5c1c08bdfb2 #Auto deplayed from build + image: dimitardd/dimitar-app02:f9d8cadb0337ee5794a01a2be80dd6ac1c99d065 #Auto deplayed from build # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green # image: dimitardd/dimitar-app02:207e179a46ce047db5ac0d73ec2a1b0fb9352514 #Blue # image: dimitardd/dimitar-app01:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Yellow From 90fa7b01af66956932621c276e18e738f99a96a0 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Mon, 27 Jan 2025 18:07:32 +0200 Subject: [PATCH 306/308] change image for sof-app02 --- rollout/sof-app02.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rollout/sof-app02.yaml b/rollout/sof-app02.yaml index 8136a6ba8..4f66cb681 100644 --- a/rollout/sof-app02.yaml +++ b/rollout/sof-app02.yaml @@ -35,9 +35,9 @@ spec: spec: containers: - name: sof-app02 -# image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green + image: dimitardd/dimitar-app02:2b80cf31bff5f03d0e97357ffca9a5c1c08bdfb2 #DevOps # image: dimitardd/dimitar-app02:57bb7e9bcd3546159be0917df7e87526d8170140 #Blue - image: dimitardd/dimitar-app02:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Fresh +# image: dimitardd/dimitar-app02:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Fresh ports: - name: http containerPort: 3000 From 459a77b624815c64d21a78a8eb4b014fba74ceac Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 28 Jan 2025 09:53:11 +0200 Subject: [PATCH 307/308] disable cron for terraform run --- .github/workflows/github-action-terraform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-action-terraform.yml b/.github/workflows/github-action-terraform.yml index 57bb00fae..ea5ce01c9 100644 --- a/.github/workflows/github-action-terraform.yml +++ b/.github/workflows/github-action-terraform.yml @@ -3,7 +3,7 @@ run-name: ${{ github.actor }} Terraform GitHub Actions πŸš€ on: schedule: # Runs every Hour from 8AM to 5PM on weekdays - - cron: '0 8-17 * * 1-5' + #- cron: '0 8-17 * * 1-5' push: paths: - 'terraform/**' From 4c8c26f52f45d91bf8a3d338e61e0e321147c4a6 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Tue, 28 Jan 2025 07:56:36 +0000 Subject: [PATCH 308/308] Update image to 459a77b624815c64d21a78a8eb4b014fba74ceac --- deployment/sof-app01.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/sof-app01.yaml b/deployment/sof-app01.yaml index 132037284..817fdb57f 100644 --- a/deployment/sof-app01.yaml +++ b/deployment/sof-app01.yaml @@ -18,7 +18,7 @@ spec: serviceAccountName: sof-app01-sa containers: - name: sof-app01 - image: dimitardd/dimitar-app02:f9d8cadb0337ee5794a01a2be80dd6ac1c99d065 #Auto deplayed from build + image: dimitardd/dimitar-app02:459a77b624815c64d21a78a8eb4b014fba74ceac #Auto deplayed from build # image: dimitardd/dimitar-app02:b07c7bf5c0df29652dd1c86ec06463770388fb98 #Green # image: dimitardd/dimitar-app02:207e179a46ce047db5ac0d73ec2a1b0fb9352514 #Blue # image: dimitardd/dimitar-app01:e0b1dc1bb0edf9e161d17d7ba1565844b64e8e37 #Yellow