From 02d4d9eda354ff0637128485119585cbf0ecc002 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Thu, 9 Feb 2023 13:27:26 +0200 Subject: [PATCH 01/39] set port 9091 --- src/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.c b/src/main.c index 668d6ab..6b96e4a 100644 --- a/src/main.c +++ b/src/main.c @@ -117,13 +117,13 @@ int main(int argc, char *argv[]) initDB(); - uint16_t server_port = 8080; + uint16_t server_port = 9091; if (argc > 1) { if (sscanf(argv[1], "%hu", &server_port) == 0) { fprintf(stderr, "error: invalid command line argument, using default port " - "8080.\n"); - server_port = 8080; + "9091.\n"); + server_port = 9091; } } Server *server = serverNew(server_port); From 264d0a04addf3e9796c78b5b5fc20b22fd8c7f83 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Thu, 9 Feb 2023 18:11:32 +0200 Subject: [PATCH 02/39] add EL line --- templates/index.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/templates/index.html b/templates/index.html index e74effa..9247b4d 100644 --- a/templates/index.html +++ b/templates/index.html @@ -30,7 +30,10 @@

Prerequisites

Install SQLite development package:

- sudo apt-get install libsqlite3-dev + sudo apt-get install libsqlite3-dev
+ #EL
+ sudo dnf install sqlite-devel sqlite
+

Build and Run

From 89425311e748188b732f68a2e075521170041245 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Thu, 9 Feb 2023 18:13:04 +0200 Subject: [PATCH 03/39] containerize, add dockerfile --- Dockerfile | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..1ac3b17 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,13 @@ +FROM rockylinux:9.1 + +WORKDIR /opt/facebooc + +COPY . . +#yum group info "Development Tools" +RUN yum update -y && \ + yum install -yq gcc gcc-c++ glibc-devel make git sqlite-devel sqlite && \ + make all + +EXPOSE 9091 + +CMD bin/facebooc \ No newline at end of file From 7c80c60368aef335c6c186d26bd64f35c67159e3 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Thu, 9 Feb 2023 18:20:18 +0200 Subject: [PATCH 04/39] distros --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 74cca68..bcf9a00 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,16 @@ Proof-of-concept Facebook clone in C. The only dependency is SQLite3. # Prerequisites -Install SQLite development package: +Install SQLite development package:
+#Debian ```bash sudo apt-get install libsqlite3-dev ``` +#EL +```bash +sudo dnf install sqlite-devel sqlite +``` + # Build and Run ```bash From 291ea7950ce37fabdf89b0b2f890a7d6eb7efcc5 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Sun, 19 Feb 2023 16:25:04 +0200 Subject: [PATCH 05/39] using multi stage --- Dockerfile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1ac3b17..fbca3e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,17 @@ -FROM rockylinux:9.1 +FROM rockylinux:9.1 AS BUILD WORKDIR /opt/facebooc COPY . . -#yum group info "Development Tools" -RUN yum update -y && \ - yum install -yq gcc gcc-c++ glibc-devel make git sqlite-devel sqlite && \ + +RUN yum install -yq gcc gcc-c++ glibc-devel make sqlite-devel sqlite && \ make all +FROM ubuntu:latest AS RUN +WORKDIR /opt/facebooc +COPY --from=BUILD /opt/facebooc/bin ./bin/ +COPY --from=BUILD /opt/facebooc/static ./static/ +COPY --from=BUILD /opt/facebooc/templates ./templates/ +RUN apt-get update && apt-get install libsqlite3-0 && rm -rf /var/lib/apt/lists/* EXPOSE 9091 - CMD bin/facebooc \ No newline at end of file From d6cd17de00eec5670c98fc57c83c4728ee051712 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Sun, 19 Feb 2023 17:32:06 +0200 Subject: [PATCH 06/39] Change image to nhiuana/ubuntu-libsqlite3 --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index fbca3e1..f766981 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,11 +7,10 @@ COPY . . RUN yum install -yq gcc gcc-c++ glibc-devel make sqlite-devel sqlite && \ make all -FROM ubuntu:latest AS RUN +FROM nhiuana/ubuntu-libsqlite3:latest AS RUN WORKDIR /opt/facebooc COPY --from=BUILD /opt/facebooc/bin ./bin/ COPY --from=BUILD /opt/facebooc/static ./static/ COPY --from=BUILD /opt/facebooc/templates ./templates/ -RUN apt-get update && apt-get install libsqlite3-0 && rm -rf /var/lib/apt/lists/* EXPOSE 9091 CMD bin/facebooc \ No newline at end of file From 28de3ac10490aeaa99d0b79c527b85d2501c6ad3 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Sun, 9 Apr 2023 20:31:41 +0200 Subject: [PATCH 07/39] add k8s manifest --- k8s/fb-svc.yml | 19 +++++++++++++++++++ k8s/fb.yml | 24 ++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 k8s/fb-svc.yml create mode 100644 k8s/fb.yml diff --git a/k8s/fb-svc.yml b/k8s/fb-svc.yml new file mode 100644 index 0000000..f39ec8a --- /dev/null +++ b/k8s/fb-svc.yml @@ -0,0 +1,19 @@ +apiVersion: v1 +kind: Service +metadata: + creationTimestamp: null + labels: + app: fb + name: fb +spec: + ports: + - name: "9091" + nodePort: 30000 + port: 9091 + protocol: TCP + targetPort: 9091 + selector: + app: fb + type: NodePort +status: + loadBalancer: {} diff --git a/k8s/fb.yml b/k8s/fb.yml new file mode 100644 index 0000000..79d0424 --- /dev/null +++ b/k8s/fb.yml @@ -0,0 +1,24 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + creationTimestamp: null + labels: + app: fb + name: fb +spec: + replicas: 1 + selector: + matchLabels: + app: fb + strategy: {} + template: + metadata: + creationTimestamp: null + labels: + app: fb + spec: + containers: + - image: nhiuana/fb:v5 + name: fb + resources: {} +status: {} From a70fec5e90314e2ac1ef161a2a9247d8c8a0fca0 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Mon, 15 May 2023 13:39:36 +0200 Subject: [PATCH 08/39] init cicd with docker --- .gitlab-ci.yml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..2e73e9f --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,38 @@ +stages: +- build +- test +- deploy +- review +- dast +- staging +- canary +- production +- performance +- cleanup +#sast: +# stage: test +#include: +#- template: Auto-DevOps.gitlab-ci.yml + + +default: + before_script: + - docker login -u $HARBOR_USERNAME -p $HARBOR_PASSWORD $HARBOR_HOST + +build-image: + stage: build + script: + - echo "$HARBOR_PROJECT $HARBOR_URL $HARBOR_HOST $HARBOR_PASSWORD" +# - docker build -t "${HARBOR_HOST}/${HARBOR_PROJECT}/fb:{$CI_COMMIT_TAG}" . +# - mkdir -p .docker; echo "{\"auths\":{\"${HARBOR_HOST}\":{\"auth\":\"$(echo -n ${HARBOR_USERNAME}:${HARBOR_PASSWORD} | base64)\"}}}" > .docker/config.json +# - docker tag hello-world:latest harbor.lab.com/library/hello_cicd:test +# - docker push "${HARBOR_HOST}/${HARBOR_PROJECT}/hello_cicd:test" + - docker build -t "${HARBOR_HOST}/${HARBOR_PROJECT}/fb:${CI_COMMIT_TAG}" . + - docker push "${HARBOR_HOST}/${HARBOR_PROJECT}/fb:${CI_COMMIT_TAG}" + +run: + stage: staging + script: + - echo "${CI_COMMIT_TAG}" + - docker image ls + - docker run -itd -P --name fb harbor.lab.com/library/fb:${CI_COMMIT_TAG} From a19c22d12c335c8daf391bcc35c2b391992edc77 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Mon, 15 May 2023 13:49:41 +0200 Subject: [PATCH 09/39] fix docker build syntax --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e73e9f..d62090c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ build-image: # - mkdir -p .docker; echo "{\"auths\":{\"${HARBOR_HOST}\":{\"auth\":\"$(echo -n ${HARBOR_USERNAME}:${HARBOR_PASSWORD} | base64)\"}}}" > .docker/config.json # - docker tag hello-world:latest harbor.lab.com/library/hello_cicd:test # - docker push "${HARBOR_HOST}/${HARBOR_PROJECT}/hello_cicd:test" - - docker build -t "${HARBOR_HOST}/${HARBOR_PROJECT}/fb:${CI_COMMIT_TAG}" . + - docker image build -t "${HARBOR_HOST}/${HARBOR_PROJECT}/fb:${CI_COMMIT_TAG}" . - docker push "${HARBOR_HOST}/${HARBOR_PROJECT}/fb:${CI_COMMIT_TAG}" run: From d69a7f8612cd2587b97bc38516ac2ccd8c5e712b Mon Sep 17 00:00:00 2001 From: manuh-L Date: Mon, 15 May 2023 20:32:21 +0200 Subject: [PATCH 10/39] more stages --- .gitlab-ci.yml | 64 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d62090c..df7dcde 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,20 +19,58 @@ default: before_script: - docker login -u $HARBOR_USERNAME -p $HARBOR_PASSWORD $HARBOR_HOST -build-image: + +compile: stage: build + tags: + - docker + image: + name: harbor.lab.com/library/make:v1 script: - - echo "$HARBOR_PROJECT $HARBOR_URL $HARBOR_HOST $HARBOR_PASSWORD" -# - docker build -t "${HARBOR_HOST}/${HARBOR_PROJECT}/fb:{$CI_COMMIT_TAG}" . -# - mkdir -p .docker; echo "{\"auths\":{\"${HARBOR_HOST}\":{\"auth\":\"$(echo -n ${HARBOR_USERNAME}:${HARBOR_PASSWORD} | base64)\"}}}" > .docker/config.json -# - docker tag hello-world:latest harbor.lab.com/library/hello_cicd:test -# - docker push "${HARBOR_HOST}/${HARBOR_PROJECT}/hello_cicd:test" - - docker image build -t "${HARBOR_HOST}/${HARBOR_PROJECT}/fb:${CI_COMMIT_TAG}" . - - docker push "${HARBOR_HOST}/${HARBOR_PROJECT}/fb:${CI_COMMIT_TAG}" + - pwd + - make all + artifacts: + paths: + - bin/facebooc + untracked: true + when: on_success + expire_in: "7 days" + + + +image build: + stage: build + tags: + - lab + script: + - pwd; ls + - docker image build -t "${HARBOR_HOST}/${HARBOR_PROJECT}/fb:${CI_COMMIT_TAG}" -f fb.Dockerfile + dependencies: + - compile + -run: - stage: staging +upload to registry: + stage: test + tags: + - lab script: - - echo "${CI_COMMIT_TAG}" - - docker image ls - - docker run -itd -P --name fb harbor.lab.com/library/fb:${CI_COMMIT_TAG} + - docker push "${HARBOR_HOST}/${HARBOR_PROJECT}/fb:${CI_COMMIT_TAG}" + + +#build-image: +# stage: build +# script: +# - echo "$HARBOR_PROJECT $HARBOR_URL $HARBOR_HOST $HARBOR_PASSWORD" +## - docker build -t "${HARBOR_HOST}/${HARBOR_PROJECT}/fb:{$CI_COMMIT_TAG}" . +## - mkdir -p .docker; echo "{\"auths\":{\"${HARBOR_HOST}\":{\"auth\":\"$(echo -n ${HARBOR_USERNAME}:${HARBOR_PASSWORD} | base64)\"}}}" > .docker/config.json +## - docker tag hello-world:latest harbor.lab.com/library/hello_cicd:test +## - docker push "${HARBOR_HOST}/${HARBOR_PROJECT}/hello_cicd:test" +# - docker image build -t "${HARBOR_HOST}/${HARBOR_PROJECT}/fb:${CI_COMMIT_TAG}" . +# - docker push "${HARBOR_HOST}/${HARBOR_PROJECT}/fb:${CI_COMMIT_TAG}" + +#run: +# stage: staging +# script: +# - echo "${CI_COMMIT_TAG}" +# - docker image ls +# - docker run -itd -P --name fb harbor.lab.com/library/fb:${CI_COMMIT_TAG} From eb0770f052fbf494c6ba613553cf924144c53dad Mon Sep 17 00:00:00 2001 From: manuh-L Date: Mon, 15 May 2023 20:34:31 +0200 Subject: [PATCH 11/39] fb dockerfile --- fb.Dockerfile | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 fb.Dockerfile diff --git a/fb.Dockerfile b/fb.Dockerfile new file mode 100644 index 0000000..0639de3 --- /dev/null +++ b/fb.Dockerfile @@ -0,0 +1,7 @@ +FROM nhiuana/ubuntu-libsqlite3:latest +WORKDIR /opt/facebooc +COPY ./bin ./bin/ +COPY ./static ./static/ +COPY ./templates ./templates/ +EXPOSE 9091 +CMD bin/facebooc \ No newline at end of file From 1e5e600a110b39965a3f612df0cd3901164af124 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Mon, 15 May 2023 21:02:31 +0200 Subject: [PATCH 12/39] add path entrypoint --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df7dcde..241171f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,8 +26,10 @@ compile: - docker image: name: harbor.lab.com/library/make:v1 + entrypoint: + - '/usr/bin/env' + - 'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin' script: - - pwd - make all artifacts: paths: @@ -44,7 +46,7 @@ image build: - lab script: - pwd; ls - - docker image build -t "${HARBOR_HOST}/${HARBOR_PROJECT}/fb:${CI_COMMIT_TAG}" -f fb.Dockerfile + - docker image build -t "${HARBOR_HOST}/${HARBOR_PROJECT}/fb:${CI_COMMIT_TAG}" -f fb.Dockerfile . dependencies: - compile From aa6c83bde7b1f95d3e489fa33c18022c402ee730 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Mon, 15 May 2023 21:19:06 +0200 Subject: [PATCH 13/39] v1.1 make image --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 241171f..057c7b6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,7 @@ compile: tags: - docker image: - name: harbor.lab.com/library/make:v1 + name: harbor.lab.com/library/make:v1.1 entrypoint: - '/usr/bin/env' - 'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin' From 515176cfba4ce7afb1a88d22c9ce19addbcab50e Mon Sep 17 00:00:00 2001 From: manuh-L Date: Mon, 15 May 2023 21:30:17 +0200 Subject: [PATCH 14/39] test packer --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 057c7b6..592317c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,12 +25,12 @@ compile: tags: - docker image: - name: harbor.lab.com/library/make:v1.1 + name: hashicorp/packer:latest entrypoint: - '/usr/bin/env' - - 'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin' + - 'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/bin:/sbin' script: - - make all + - packer version artifacts: paths: - bin/facebooc From 4cea42561a76973aceaecc83018ae629cf9ad215 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Mon, 15 May 2023 22:22:31 +0200 Subject: [PATCH 15/39] outro runner --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 592317c..ea27844 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,14 +23,14 @@ default: compile: stage: build tags: - - docker + - docker-02 image: - name: hashicorp/packer:latest + name: harbor.lab.com/library/make:v1.1 entrypoint: - '/usr/bin/env' - - 'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/bin:/sbin' + - 'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin' script: - - packer version + - make all artifacts: paths: - bin/facebooc From 60e4d2b9851203b489a9d52e0ef64a50fb72b2d7 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Mon, 15 May 2023 22:27:49 +0200 Subject: [PATCH 16/39] comment before script --- .gitlab-ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea27844..a3dd1d2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,9 +15,9 @@ stages: #- template: Auto-DevOps.gitlab-ci.yml -default: - before_script: - - docker login -u $HARBOR_USERNAME -p $HARBOR_PASSWORD $HARBOR_HOST +#default: +# before_script: +# - docker login -u $HARBOR_USERNAME -p $HARBOR_PASSWORD $HARBOR_HOST compile: @@ -56,6 +56,7 @@ upload to registry: tags: - lab script: + - docker login -u $HARBOR_USERNAME -p $HARBOR_PASSWORD $HARBOR_HOST - docker push "${HARBOR_HOST}/${HARBOR_PROJECT}/fb:${CI_COMMIT_TAG}" From 7a9c0c99ad9f3f03ffa05a3294aa670e21cf0460 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Mon, 15 May 2023 22:52:43 +0200 Subject: [PATCH 17/39] needs --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a3dd1d2..5436f4b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,6 +49,9 @@ image build: - docker image build -t "${HARBOR_HOST}/${HARBOR_PROJECT}/fb:${CI_COMMIT_TAG}" -f fb.Dockerfile . dependencies: - compile + needs: + - job: compile + artifacts: true upload to registry: From 8d0f6f20584ea4e3fcb9cf287176b21d1600f435 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Tue, 23 May 2023 14:15:36 +0200 Subject: [PATCH 18/39] kas --- .gitlab/agents/config.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitlab/agents/config.yaml diff --git a/.gitlab/agents/config.yaml b/.gitlab/agents/config.yaml new file mode 100644 index 0000000..e69de29 From 2aed4592e9f6299bf1f502b397f9e092ba50a2fb Mon Sep 17 00:00:00 2001 From: manuh-L Date: Tue, 23 May 2023 16:00:20 +0200 Subject: [PATCH 19/39] k8s agent test --- .gitlab-ci.yml | 36 +++++++++++++++++++++++------------- .gitlab/agents/config.yaml | 3 +++ 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5436f4b..f1312b8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,18 +40,18 @@ compile: -image build: - stage: build - tags: - - lab - script: - - pwd; ls - - docker image build -t "${HARBOR_HOST}/${HARBOR_PROJECT}/fb:${CI_COMMIT_TAG}" -f fb.Dockerfile . - dependencies: - - compile - needs: - - job: compile - artifacts: true +#image build: +# stage: build +# tags: +# - lab +# script: +# - pwd; ls +# - docker image build -t "${HARBOR_HOST}/${HARBOR_PROJECT}/fb:${CI_COMMIT_TAG}" -f fb.Dockerfile . +# dependencies: +# - compile +# needs: +# - job: compile +# artifacts: true upload to registry: @@ -60,7 +60,17 @@ upload to registry: - lab script: - docker login -u $HARBOR_USERNAME -p $HARBOR_PASSWORD $HARBOR_HOST - - docker push "${HARBOR_HOST}/${HARBOR_PROJECT}/fb:${CI_COMMIT_TAG}" + - docker push "${HARBOR_HOST}/${HARBOR_PROJECT}/fb:outro #${CI_COMMIT_TAG}" + + +deploy: + image: + name: bitnami/kubectl:latest + entrypoint: [''] + script: + - kubectl config get-contexts + - kubectl config use-context .gitlab/agents:config + - kubectl get no #build-image: diff --git a/.gitlab/agents/config.yaml b/.gitlab/agents/config.yaml index e69de29..da34ff4 100644 --- a/.gitlab/agents/config.yaml +++ b/.gitlab/agents/config.yaml @@ -0,0 +1,3 @@ +ci_access: + projects: + - id: ./ \ No newline at end of file From 1dcfa2a29721066792058b003ae8be1a6753e1a7 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Tue, 23 May 2023 16:04:35 +0200 Subject: [PATCH 20/39] fix typo --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f1312b8..ca30115 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,7 +60,7 @@ upload to registry: - lab script: - docker login -u $HARBOR_USERNAME -p $HARBOR_PASSWORD $HARBOR_HOST - - docker push "${HARBOR_HOST}/${HARBOR_PROJECT}/fb:outro #${CI_COMMIT_TAG}" + - docker push "${HARBOR_HOST}/${HARBOR_PROJECT}/fb:outro" #${CI_COMMIT_TAG}" deploy: From 955661af6e7d4803a8474f60d89fa2b6187b8cee Mon Sep 17 00:00:00 2001 From: manuh-L Date: Tue, 23 May 2023 16:06:31 +0200 Subject: [PATCH 21/39] fix typo --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ca30115..f85b50d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,7 +60,7 @@ upload to registry: - lab script: - docker login -u $HARBOR_USERNAME -p $HARBOR_PASSWORD $HARBOR_HOST - - docker push "${HARBOR_HOST}/${HARBOR_PROJECT}/fb:outro" #${CI_COMMIT_TAG}" + - docker push "${HARBOR_HOST}/${HARBOR_PROJECT}"/fb:outro #${CI_COMMIT_TAG}" deploy: From 0010ebcc87a7243669b3c3e49dffe53b49c68748 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Tue, 23 May 2023 16:07:52 +0200 Subject: [PATCH 22/39] fix tag error --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f85b50d..e2d92c0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,7 +60,7 @@ upload to registry: - lab script: - docker login -u $HARBOR_USERNAME -p $HARBOR_PASSWORD $HARBOR_HOST - - docker push "${HARBOR_HOST}/${HARBOR_PROJECT}"/fb:outro #${CI_COMMIT_TAG}" + - docker push "${HARBOR_HOST}/${HARBOR_PROJECT}"/fb:33 #${CI_COMMIT_TAG}" deploy: From c98baeb761dd6bcbed7c873237ce35efbe2a1b98 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Tue, 23 May 2023 16:10:52 +0200 Subject: [PATCH 23/39] context --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e2d92c0..b760627 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,7 +69,7 @@ deploy: entrypoint: [''] script: - kubectl config get-contexts - - kubectl config use-context .gitlab/agents:config + - kubectl config use-context manuh/facebooc:config - kubectl get no From 1016bce9c1d4fb254254ff75c3f83227870762c5 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Tue, 23 May 2023 16:19:59 +0200 Subject: [PATCH 24/39] context --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b760627..dec1a56 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,8 +69,9 @@ deploy: entrypoint: [''] script: - kubectl config get-contexts - - kubectl config use-context manuh/facebooc:config - kubectl get no + - kubectl config use-context manuh/facebooc:config + #build-image: From 47b3e4b9f0aa73bb2444d1816d06fd6da06970e8 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Tue, 23 May 2023 16:21:20 +0200 Subject: [PATCH 25/39] use local shell --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dec1a56..bd3d7b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,13 +64,13 @@ upload to registry: deploy: - image: - name: bitnami/kubectl:latest - entrypoint: [''] +# image: +# name: bitnami/kubectl:latest +# entrypoint: [''] script: - kubectl config get-contexts - kubectl get no - - kubectl config use-context manuh/facebooc:config +# - kubectl config use-context manuh/facebooc:config From c5f8d1b923d02bd6574071a68f35894f79e643e6 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Tue, 23 May 2023 16:23:35 +0200 Subject: [PATCH 26/39] use local shell --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bd3d7b2..beb4566 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,7 +68,7 @@ deploy: # name: bitnami/kubectl:latest # entrypoint: [''] script: - - kubectl config get-contexts +# - kubectl config get-contexts - kubectl get no # - kubectl config use-context manuh/facebooc:config From 60394705e5c63061a209e50a87231704574d893c Mon Sep 17 00:00:00 2001 From: manuh-L Date: Tue, 23 May 2023 16:28:11 +0200 Subject: [PATCH 27/39] project path --- .gitlab/agents/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/agents/config.yaml b/.gitlab/agents/config.yaml index da34ff4..d1aa4cc 100644 --- a/.gitlab/agents/config.yaml +++ b/.gitlab/agents/config.yaml @@ -1,3 +1,3 @@ ci_access: projects: - - id: ./ \ No newline at end of file + - id: manuh/facebooc/ \ No newline at end of file From 02949e91aa8f6884d7bea8a4b6745adf7c3dc62c Mon Sep 17 00:00:00 2001 From: manuh-L Date: Tue, 23 May 2023 16:32:06 +0200 Subject: [PATCH 28/39] project path --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index beb4566..6cc1ca8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,6 +69,7 @@ deploy: # entrypoint: [''] script: # - kubectl config get-contexts + - kubectl use-context kind-demo - kubectl get no # - kubectl config use-context manuh/facebooc:config From 22a178b70c9dacd4e4e0045641762142c89e0bc7 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Tue, 23 May 2023 16:46:47 +0200 Subject: [PATCH 29/39] project path --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6cc1ca8..4c0fa7d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,7 +69,7 @@ deploy: # entrypoint: [''] script: # - kubectl config get-contexts - - kubectl use-context kind-demo + - kubectl config use-context kind-demo - kubectl get no # - kubectl config use-context manuh/facebooc:config From 09f733b0d0ca2975df05cd04149b2e2bc5d58f1f Mon Sep 17 00:00:00 2001 From: manuh-L Date: Tue, 23 May 2023 16:53:46 +0200 Subject: [PATCH 30/39] agent path --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4c0fa7d..4a8c8da 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,11 +68,11 @@ deploy: # name: bitnami/kubectl:latest # entrypoint: [''] script: -# - kubectl config get-contexts - - kubectl config use-context kind-demo + - kubectl config get-contexts +# - kubectl config use-context kind-demo +# - kubectl get no + - kubectl config use-context manuh/facebooc/.gitlab/agents:config - kubectl get no -# - kubectl config use-context manuh/facebooc:config - #build-image: From d4fb94c1ebd2a9ba752c579db52ae180e954c4d6 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Tue, 23 May 2023 16:56:01 +0200 Subject: [PATCH 31/39] agent path config --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a8c8da..be2be12 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,7 +71,7 @@ deploy: - kubectl config get-contexts # - kubectl config use-context kind-demo # - kubectl get no - - kubectl config use-context manuh/facebooc/.gitlab/agents:config + - kubectl config use-context manuh/facebooc/.gitlab:config - kubectl get no From 0868ca4be4d9775832152bf1f06ae8c67cffa893 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Tue, 23 May 2023 16:56:46 +0200 Subject: [PATCH 32/39] agent path conf --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index be2be12..0713f45 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,7 +71,7 @@ deploy: - kubectl config get-contexts # - kubectl config use-context kind-demo # - kubectl get no - - kubectl config use-context manuh/facebooc/.gitlab:config + - kubectl config use-context manuh/facebooc:config - kubectl get no From d4d2d576459e04fe557484d6ad39cca6cd4688c5 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Tue, 23 May 2023 17:04:29 +0200 Subject: [PATCH 33/39] tes kct --- .gitlab-ci.yml | 4 ++++ .gitlab/agents/config.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0713f45..bf837e6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,10 +68,14 @@ deploy: # name: bitnami/kubectl:latest # entrypoint: [''] script: + - echo $KUBECONFIG - kubectl config get-contexts # - kubectl config use-context kind-demo # - kubectl get no - kubectl config use-context manuh/facebooc:config + - cat $KUBECONFIG + - kubectl config view + - kubectl get namespaces - kubectl get no diff --git a/.gitlab/agents/config.yaml b/.gitlab/agents/config.yaml index d1aa4cc..0603a97 100644 --- a/.gitlab/agents/config.yaml +++ b/.gitlab/agents/config.yaml @@ -1,3 +1,3 @@ ci_access: projects: - - id: manuh/facebooc/ \ No newline at end of file + - id: manuh/facebooc \ No newline at end of file From 928fb7fee7a646d8af604242f734a6cfc0dac7f3 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Tue, 23 May 2023 17:36:27 +0200 Subject: [PATCH 34/39] k8s only --- .gitlab-ci.yml | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bf837e6..cd58bdf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,23 +20,23 @@ stages: # - docker login -u $HARBOR_USERNAME -p $HARBOR_PASSWORD $HARBOR_HOST -compile: - stage: build - tags: - - docker-02 - image: - name: harbor.lab.com/library/make:v1.1 - entrypoint: - - '/usr/bin/env' - - 'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin' - script: - - make all - artifacts: - paths: - - bin/facebooc - untracked: true - when: on_success - expire_in: "7 days" +#compile: +# stage: build +# tags: +# - docker-02 +# image: +# name: harbor.lab.com/library/make:v1.1 +# entrypoint: +# - '/usr/bin/env' +# - 'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin' +# script: +# - make all +# artifacts: +# paths: +# - bin/facebooc +# untracked: true +# when: on_success +# expire_in: "7 days" @@ -54,13 +54,13 @@ compile: # artifacts: true -upload to registry: - stage: test - tags: - - lab - script: - - docker login -u $HARBOR_USERNAME -p $HARBOR_PASSWORD $HARBOR_HOST - - docker push "${HARBOR_HOST}/${HARBOR_PROJECT}"/fb:33 #${CI_COMMIT_TAG}" +#upload to registry: +# stage: test +# tags: +# - lab +# script: +# - docker login -u $HARBOR_USERNAME -p $HARBOR_PASSWORD $HARBOR_HOST +# - docker push "${HARBOR_HOST}/${HARBOR_PROJECT}"/fb:33 #${CI_COMMIT_TAG}" deploy: From 1ba277d31023d9778ceacef2855406e63fa81b4f Mon Sep 17 00:00:00 2001 From: manuh-L Date: Tue, 23 May 2023 17:38:19 +0200 Subject: [PATCH 35/39] k8s only --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cd58bdf..c72da55 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,9 +64,9 @@ stages: deploy: -# image: -# name: bitnami/kubectl:latest -# entrypoint: [''] + image: + name: bitnami/kubectl:latest + entrypoint: [''] script: - echo $KUBECONFIG - kubectl config get-contexts From 59de3ec8f5734fac6c170af9cb31fb2e5f22f64d Mon Sep 17 00:00:00 2001 From: manuh-L Date: Tue, 23 May 2023 17:40:33 +0200 Subject: [PATCH 36/39] k8s docker --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c72da55..b34aafd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,7 +71,6 @@ deploy: - echo $KUBECONFIG - kubectl config get-contexts # - kubectl config use-context kind-demo -# - kubectl get no - kubectl config use-context manuh/facebooc:config - cat $KUBECONFIG - kubectl config view From 808db2fe8e70d90316f9952204ab813837c22529 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Tue, 23 May 2023 17:43:29 +0200 Subject: [PATCH 37/39] k8s docker exec --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b34aafd..33c5aff 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,6 +64,8 @@ stages: deploy: + tags: + - docker-02 image: name: bitnami/kubectl:latest entrypoint: [''] From 96000b6b74d872b133605adac09eb6a5fdac9066 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Tue, 23 May 2023 20:52:21 +0200 Subject: [PATCH 38/39] new agent --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 33c5aff..c1570d0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -73,7 +73,7 @@ deploy: - echo $KUBECONFIG - kubectl config get-contexts # - kubectl config use-context kind-demo - - kubectl config use-context manuh/facebooc:config + - kubectl config use-context manuh/facebooc:joker - cat $KUBECONFIG - kubectl config view - kubectl get namespaces From 3612b90acbecfb235dba899972e69f91b398eb21 Mon Sep 17 00:00:00 2001 From: manuh-L Date: Sat, 30 Sep 2023 09:24:11 +0200 Subject: [PATCH 39/39] lb service --- k8s/fb-svc-lb.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 k8s/fb-svc-lb.yml diff --git a/k8s/fb-svc-lb.yml b/k8s/fb-svc-lb.yml new file mode 100644 index 0000000..dcc62ff --- /dev/null +++ b/k8s/fb-svc-lb.yml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app: fb + name: fb +spec: + ports: + - name: "noventa" + port: 9091 + protocol: TCP + targetPort: 9091 + selector: + app: fb + type: LoadBalancer +status: + loadBalancer: {} \ No newline at end of file