From 5fe66a60ed7a423b6eb13ef925e5feaa8dc9a8c8 Mon Sep 17 00:00:00 2001 From: lbeltramino <46752714+lbeltramino@users.noreply.github.com> Date: Sun, 6 Dec 2020 22:19:27 -0300 Subject: [PATCH 01/12] Update pythonapp.yml --- .github/workflows/pythonapp.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index c3e5d3176..3c9e4c12d 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -23,6 +23,6 @@ jobs: - name: Build & Push Image run: | cd ./python - echo "${{ secrets.DOCKERPW }}" | docker login -u "[your dockerhub login here]" --password-stdin - docker image build -t [your dockerhub username here]/gitops:hellov1.0 . - docker push [your docker hub username here]/gitops:hellov1.0 + echo "${{ secrets.DOCKER_PASSWORD}}" | docker login -u "${{ secretos.DOCKER_USER }}" --password-stdin + docker image build -t ${{ secretos.DOCKER_USER }}/gitops:hellov1.0 . + docker push ${{ secretos.DOCKER_USER }}/gitops:hellov1.0 From 34fea72d8b2d95fe8e21ea59e2dbf67784f9555f Mon Sep 17 00:00:00 2001 From: lbeltramino <46752714+lbeltramino@users.noreply.github.com> Date: Sun, 6 Dec 2020 22:20:11 -0300 Subject: [PATCH 02/12] Update app.py --- python/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/app.py b/python/app.py index 358088e4c..cb6f041f6 100644 --- a/python/app.py +++ b/python/app.py @@ -3,7 +3,7 @@ @app.route("/") def hello(): - return "Hello World!" + return "Hello World! test push" if __name__ == "__main__": app.run(host='0.0.0.0', port=8000) From d3c4d4f85ea5b8202dafceaeebe0ae48e53c6554 Mon Sep 17 00:00:00 2001 From: lbeltramino <46752714+lbeltramino@users.noreply.github.com> Date: Sun, 6 Dec 2020 22:20:57 -0300 Subject: [PATCH 03/12] Update pythonapp.yml --- .github/workflows/pythonapp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 3c9e4c12d..32a21a902 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -23,6 +23,6 @@ jobs: - name: Build & Push Image run: | cd ./python - echo "${{ secrets.DOCKER_PASSWORD}}" | docker login -u "${{ secretos.DOCKER_USER }}" --password-stdin + echo "${{ secrets.DOCKER_PASSWORD}}" | docker login -u "${{ secrets.DOCKER_USER }}" --password-stdin docker image build -t ${{ secretos.DOCKER_USER }}/gitops:hellov1.0 . - docker push ${{ secretos.DOCKER_USER }}/gitops:hellov1.0 + docker push ${{ secrets.DOCKER_USER }}/gitops:hellov1.0 From 962e1f7cc49a88ab8a204bc8f0154d092de449d4 Mon Sep 17 00:00:00 2001 From: lbeltramino <46752714+lbeltramino@users.noreply.github.com> Date: Sun, 6 Dec 2020 22:21:38 -0300 Subject: [PATCH 04/12] Update app.py --- python/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/app.py b/python/app.py index cb6f041f6..a54664fc1 100644 --- a/python/app.py +++ b/python/app.py @@ -3,7 +3,7 @@ @app.route("/") def hello(): - return "Hello World! test push" + return "Hello World! test push " if __name__ == "__main__": app.run(host='0.0.0.0', port=8000) From 14562ccf0639525be8c0d610ef05c9bb71467442 Mon Sep 17 00:00:00 2001 From: lbeltramino <46752714+lbeltramino@users.noreply.github.com> Date: Sun, 6 Dec 2020 22:22:33 -0300 Subject: [PATCH 05/12] Update pythonapp.yml --- .github/workflows/pythonapp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 32a21a902..1c3f215f1 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -24,5 +24,5 @@ jobs: run: | cd ./python echo "${{ secrets.DOCKER_PASSWORD}}" | docker login -u "${{ secrets.DOCKER_USER }}" --password-stdin - docker image build -t ${{ secretos.DOCKER_USER }}/gitops:hellov1.0 . + docker image build -t ${{ secrets.DOCKER_USER }}/gitops:hellov1.0 . docker push ${{ secrets.DOCKER_USER }}/gitops:hellov1.0 From 74e60f8b3dcc8d83a435abca879d5c19d6b7ef4d Mon Sep 17 00:00:00 2001 From: lbeltramino <46752714+lbeltramino@users.noreply.github.com> Date: Sun, 6 Dec 2020 22:22:51 -0300 Subject: [PATCH 06/12] Update app.py --- python/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/app.py b/python/app.py index a54664fc1..b5a66a460 100644 --- a/python/app.py +++ b/python/app.py @@ -3,7 +3,7 @@ @app.route("/") def hello(): - return "Hello World! test push " + return "Hello World! test push " if __name__ == "__main__": app.run(host='0.0.0.0', port=8000) From c39c60dee122d4e2861e32443d183175024bf640 Mon Sep 17 00:00:00 2001 From: lbeltramino <46752714+lbeltramino@users.noreply.github.com> Date: Sun, 6 Dec 2020 22:25:05 -0300 Subject: [PATCH 07/12] Update pythonapp.yml --- .github/workflows/pythonapp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 1c3f215f1..a1d32b40d 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -1,7 +1,7 @@ name: Python application on: - push: + pull_request: paths: - 'python/*' From c5e9eec4c3cc03ab1a3839d60f21ad0bd6e94459 Mon Sep 17 00:00:00 2001 From: lbeltramino <46752714+lbeltramino@users.noreply.github.com> Date: Sun, 6 Dec 2020 22:25:35 -0300 Subject: [PATCH 08/12] Update app.py --- python/app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/app.py b/python/app.py index b5a66a460..705a50b34 100644 --- a/python/app.py +++ b/python/app.py @@ -3,7 +3,7 @@ @app.route("/") def hello(): - return "Hello World! test push " + return "Hello World! test pull request" if __name__ == "__main__": app.run(host='0.0.0.0', port=8000) From d56d30d3662d51c2e5fa384f64c54a18b544a6fb Mon Sep 17 00:00:00 2001 From: lbeltramino <46752714+lbeltramino@users.noreply.github.com> Date: Sun, 6 Dec 2020 22:35:46 -0300 Subject: [PATCH 09/12] Create hello.yml --- qa/hello.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 qa/hello.yml diff --git a/qa/hello.yml b/qa/hello.yml new file mode 100644 index 000000000..de9ff7035 --- /dev/null +++ b/qa/hello.yml @@ -0,0 +1,19 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: hello + namespace: lasample + labels: + app: hello +spec: + selector: + matchLabels: + app: hello + template: + metadata: + labels: + app: hello + spec: + containers: + - name: hello + image: linuxacademycontent/gitops:hellov1.1 From ff0bdc215d9d36b6e04383a0deb0d2c3f6772425 Mon Sep 17 00:00:00 2001 From: lbeltramino <46752714+lbeltramino@users.noreply.github.com> Date: Sun, 6 Dec 2020 22:36:43 -0300 Subject: [PATCH 10/12] Create hello.yml --- production/hello.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 production/hello.yml diff --git a/production/hello.yml b/production/hello.yml new file mode 100644 index 000000000..de9ff7035 --- /dev/null +++ b/production/hello.yml @@ -0,0 +1,19 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: hello + namespace: lasample + labels: + app: hello +spec: + selector: + matchLabels: + app: hello + template: + metadata: + labels: + app: hello + spec: + containers: + - name: hello + image: linuxacademycontent/gitops:hellov1.1 From a4d6fb91c6cf87596be8d5220f45b5d533d92670 Mon Sep 17 00:00:00 2001 From: lbeltramino <46752714+lbeltramino@users.noreply.github.com> Date: Sun, 6 Dec 2020 22:43:41 -0300 Subject: [PATCH 11/12] Update hello.yml --- qa/hello.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa/hello.yml b/qa/hello.yml index de9ff7035..337d5793c 100644 --- a/qa/hello.yml +++ b/qa/hello.yml @@ -16,4 +16,4 @@ spec: spec: containers: - name: hello - image: linuxacademycontent/gitops:hellov1.1 + image: linuxacademycontent/gitops:hellov1.2 From 607dccfefcbd396465221a51edc9781273421c37 Mon Sep 17 00:00:00 2001 From: lbeltramino <46752714+lbeltramino@users.noreply.github.com> Date: Sun, 6 Dec 2020 22:46:03 -0300 Subject: [PATCH 12/12] Update hello.yml --- production/hello.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/production/hello.yml b/production/hello.yml index de9ff7035..337d5793c 100644 --- a/production/hello.yml +++ b/production/hello.yml @@ -16,4 +16,4 @@ spec: spec: containers: - name: hello - image: linuxacademycontent/gitops:hellov1.1 + image: linuxacademycontent/gitops:hellov1.2