From 25fc7b4122fce934281617778bc841317451a4e2 Mon Sep 17 00:00:00 2001 From: Tom Neuber Date: Tue, 27 Aug 2024 01:12:00 +0200 Subject: [PATCH 1/8] chore(ci): move to woodpecker --- .drone.yml | 53 ---------------------------------------- .woodpecker/.deploy.yaml | 25 +++++++++++++++++++ README.md | 4 +-- kustomization.yaml | 2 +- 4 files changed, 28 insertions(+), 56 deletions(-) delete mode 100644 .drone.yml create mode 100644 .woodpecker/.deploy.yaml diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index a5baf36..0000000 --- a/.drone.yml +++ /dev/null @@ -1,53 +0,0 @@ -kind: pipeline -name: deploy -steps: -- name: kustomize build - image: git.ar21.de/aaron/kustomize-ci - commands: - - cd /source-repo - - git clone https://git.ar21.de/yolokube/fail2ban-prometheus-exporter.git . - - cd /deployment-repo - - git clone https://git.ar21.de/yolokube/fail2ban-exporter-deployment.git . - - rm -r /deployment-repo/deploy/* || true - - cp -rv /source-repo/deploy /deployment-repo/base - - mkdir -p /deployment-repo/deploy - - kustomize build -o /deployment-repo/deploy/fail2ban-exporter.yaml - - rm -r /deployment-repo/base - volumes: - - name: deployment-repo - path: /deployment-repo - - name: source-repo - path: /source-repo - when: - branch: - - main - event: - - push -- name: kustomize push changes - image: appleboy/drone-git-push - settings: - branch: main - remote: ssh://git@git.ar21.de:2222/yolokube/fail2ban-exporter-deployment.git - path: /deployment-repo - force: false - commit: true - commit_message: "KUSTOMIZE BUILD: build fail2ban-exporter deployment with kustomize ${DRONE_BUILD_NUMBER} (done automagically via Drone pipeline) [CI SKIP]" - ssh_key: - from_secret: GITEA_SSH_KEY - volumes: - - name: deployment-repo - path: /deployment-repo - when: - branch: - - main - event: - - push -volumes: -- name: deployment-repo - temp: {} -- name: source-repo - temp: {} -when: - event: - exclude: - - pull_request \ No newline at end of file diff --git a/.woodpecker/.deploy.yaml b/.woodpecker/.deploy.yaml new file mode 100644 index 0000000..e4541ba --- /dev/null +++ b/.woodpecker/.deploy.yaml @@ -0,0 +1,25 @@ +steps: +- name: kustomize build + image: git.ar21.de/aaron/kustomize-ci + commands: + - mv deploy base + - mkdir -p deploy + - kustomize build -o deploy/fail2ban-exporter.yaml + - rm -r base + when: + - branch: main + event: push +- name: kustomize push changes + image: appleboy/drone-git-push + settings: + branch: main + remote: ssh://git@git.ar21.de:2222/yolokube/fail2ban-exporter-deployment.git + path: . + force: false + commit: true + commit_message: "KUSTOMIZE BUILD: build fail2ban-exporter deployment with kustomize ${CI_PIPELINE_NUMBER} (done automagically via Woodpecker pipeline) [CI SKIP]" + ssh_key: + from_secret: FORGEJO_SSH_KEY + when: + - branch: main + event: push diff --git a/README.md b/README.md index 115d934..8b5ba2e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -[![Build Status](https://drone.ar21.de/api/badges/yolokube/fail2ban-exporter-deployment/status.svg)](https://drone.ar21.de/yolokube/fail2ban-exporter-deployment) +[![Build Status](https://woodpecker.ar21.de/api/badges/6/status.svg)](https://woodpecker.ar21.de/repos/6) -# Do not edit anything in the "deploy" folder manually \ No newline at end of file +# Do not edit anything in the "deploy" folder manually diff --git a/kustomization.yaml b/kustomization.yaml index b53977b..7df4676 100644 --- a/kustomization.yaml +++ b/kustomization.yaml @@ -1,5 +1,5 @@ resources: -- ./base +- ./base/fail2ban-exporter.yaml apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: From 5b16055864f0c826c7b0cee70da51186c3176dac Mon Sep 17 00:00:00 2001 From: tom Date: Mon, 26 Aug 2024 23:37:40 +0000 Subject: [PATCH 2/8] KUSTOMIZE BUILD: build fail2ban-exporter deployment with kustomize 5 (done automagically via Woodpecker pipeline) [CI SKIP] --- deploy/fail2ban-exporter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/fail2ban-exporter.yaml b/deploy/fail2ban-exporter.yaml index c87628c..ec37562 100644 --- a/deploy/fail2ban-exporter.yaml +++ b/deploy/fail2ban-exporter.yaml @@ -100,7 +100,7 @@ spec: value: :8080 - name: GEOIP_DATA_URL value: https://data.neuber.io/data.csv - image: git.ar21.de/yolokube/country-geo-locations:93 + image: git.ar21.de/yolokube/country-geo-locations:1 imagePullPolicy: IfNotPresent name: fail2ban-geoip ports: From 8e834789faa5cb3720fdaad205cfbc0e1fbaac08 Mon Sep 17 00:00:00 2001 From: tom Date: Tue, 27 Aug 2024 00:16:03 +0000 Subject: [PATCH 3/8] yolokube/fail2ban-prometheus-exporter: update image tag to 3 (done automagically via Woodpecker pipeline) --- kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kustomization.yaml b/kustomization.yaml index 7df4676..d501ec8 100644 --- a/kustomization.yaml +++ b/kustomization.yaml @@ -8,5 +8,5 @@ images: newTag: "1" - name: git.ar21.de/yolokube/fail2ban-prometheus-exporter newName: git.ar21.de/yolokube/fail2ban-prometheus-exporter - newTag: "144" + newTag: "3" namespace: fail2ban-prometheus From 2a2613f4274cfb63a20af4b8d2bb61c8d840b07e Mon Sep 17 00:00:00 2001 From: woodpecker Date: Tue, 27 Aug 2024 00:17:11 +0000 Subject: [PATCH 4/8] KUSTOMIZE BUILD: build fail2ban-exporter deployment with kustomize 6 (done automagically via Woodpecker pipeline) [CI SKIP] --- deploy/fail2ban-exporter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/fail2ban-exporter.yaml b/deploy/fail2ban-exporter.yaml index ec37562..f7d2644 100644 --- a/deploy/fail2ban-exporter.yaml +++ b/deploy/fail2ban-exporter.yaml @@ -149,7 +149,7 @@ spec: - env: - name: F2B_GEOIP_SERVICE value: fail2ban-geoip - image: git.ar21.de/yolokube/fail2ban-prometheus-exporter:144 + image: git.ar21.de/yolokube/fail2ban-prometheus-exporter:3 imagePullPolicy: IfNotPresent name: fail2ban-prometheus-exporter ports: From af3bdc048bff307407ebfa6234bcef024917cad6 Mon Sep 17 00:00:00 2001 From: Tom Neuber Date: Tue, 27 Aug 2024 01:12:00 +0200 Subject: [PATCH 5/8] chore(ci): move to woodpecker --- .drone.yml | 53 ---------------------------------------- .woodpecker/.deploy.yaml | 25 +++++++++++++++++++ README.md | 4 +-- kustomization.yaml | 2 +- 4 files changed, 28 insertions(+), 56 deletions(-) delete mode 100644 .drone.yml create mode 100644 .woodpecker/.deploy.yaml diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index a5baf36..0000000 --- a/.drone.yml +++ /dev/null @@ -1,53 +0,0 @@ -kind: pipeline -name: deploy -steps: -- name: kustomize build - image: git.ar21.de/aaron/kustomize-ci - commands: - - cd /source-repo - - git clone https://git.ar21.de/yolokube/fail2ban-prometheus-exporter.git . - - cd /deployment-repo - - git clone https://git.ar21.de/yolokube/fail2ban-exporter-deployment.git . - - rm -r /deployment-repo/deploy/* || true - - cp -rv /source-repo/deploy /deployment-repo/base - - mkdir -p /deployment-repo/deploy - - kustomize build -o /deployment-repo/deploy/fail2ban-exporter.yaml - - rm -r /deployment-repo/base - volumes: - - name: deployment-repo - path: /deployment-repo - - name: source-repo - path: /source-repo - when: - branch: - - main - event: - - push -- name: kustomize push changes - image: appleboy/drone-git-push - settings: - branch: main - remote: ssh://git@git.ar21.de:2222/yolokube/fail2ban-exporter-deployment.git - path: /deployment-repo - force: false - commit: true - commit_message: "KUSTOMIZE BUILD: build fail2ban-exporter deployment with kustomize ${DRONE_BUILD_NUMBER} (done automagically via Drone pipeline) [CI SKIP]" - ssh_key: - from_secret: GITEA_SSH_KEY - volumes: - - name: deployment-repo - path: /deployment-repo - when: - branch: - - main - event: - - push -volumes: -- name: deployment-repo - temp: {} -- name: source-repo - temp: {} -when: - event: - exclude: - - pull_request \ No newline at end of file diff --git a/.woodpecker/.deploy.yaml b/.woodpecker/.deploy.yaml new file mode 100644 index 0000000..e4541ba --- /dev/null +++ b/.woodpecker/.deploy.yaml @@ -0,0 +1,25 @@ +steps: +- name: kustomize build + image: git.ar21.de/aaron/kustomize-ci + commands: + - mv deploy base + - mkdir -p deploy + - kustomize build -o deploy/fail2ban-exporter.yaml + - rm -r base + when: + - branch: main + event: push +- name: kustomize push changes + image: appleboy/drone-git-push + settings: + branch: main + remote: ssh://git@git.ar21.de:2222/yolokube/fail2ban-exporter-deployment.git + path: . + force: false + commit: true + commit_message: "KUSTOMIZE BUILD: build fail2ban-exporter deployment with kustomize ${CI_PIPELINE_NUMBER} (done automagically via Woodpecker pipeline) [CI SKIP]" + ssh_key: + from_secret: FORGEJO_SSH_KEY + when: + - branch: main + event: push diff --git a/README.md b/README.md index 115d934..72ea4d6 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -[![Build Status](https://drone.ar21.de/api/badges/yolokube/fail2ban-exporter-deployment/status.svg)](https://drone.ar21.de/yolokube/fail2ban-exporter-deployment) +[![status-badge](https://woodpecker.ar21.de/api/badges/6/status.svg)](https://woodpecker.ar21.de/repos/6) -# Do not edit anything in the "deploy" folder manually \ No newline at end of file +# Do not edit anything in the "deploy" folder manually diff --git a/kustomization.yaml b/kustomization.yaml index b53977b..7df4676 100644 --- a/kustomization.yaml +++ b/kustomization.yaml @@ -1,5 +1,5 @@ resources: -- ./base +- ./base/fail2ban-exporter.yaml apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: From 1fe305431d33dc0d941fc28ba28b48f789d753cc Mon Sep 17 00:00:00 2001 From: tom Date: Mon, 26 Aug 2024 23:37:40 +0000 Subject: [PATCH 6/8] KUSTOMIZE BUILD: build fail2ban-exporter deployment with kustomize 5 (done automagically via Woodpecker pipeline) [CI SKIP] --- deploy/fail2ban-exporter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/fail2ban-exporter.yaml b/deploy/fail2ban-exporter.yaml index c87628c..ec37562 100644 --- a/deploy/fail2ban-exporter.yaml +++ b/deploy/fail2ban-exporter.yaml @@ -100,7 +100,7 @@ spec: value: :8080 - name: GEOIP_DATA_URL value: https://data.neuber.io/data.csv - image: git.ar21.de/yolokube/country-geo-locations:93 + image: git.ar21.de/yolokube/country-geo-locations:1 imagePullPolicy: IfNotPresent name: fail2ban-geoip ports: From f76b28f631cdf2a63271deff508db6b16d7d5ff6 Mon Sep 17 00:00:00 2001 From: tom Date: Tue, 27 Aug 2024 00:16:03 +0000 Subject: [PATCH 7/8] yolokube/fail2ban-prometheus-exporter: update image tag to 3 (done automagically via Woodpecker pipeline) --- kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kustomization.yaml b/kustomization.yaml index 7df4676..d501ec8 100644 --- a/kustomization.yaml +++ b/kustomization.yaml @@ -8,5 +8,5 @@ images: newTag: "1" - name: git.ar21.de/yolokube/fail2ban-prometheus-exporter newName: git.ar21.de/yolokube/fail2ban-prometheus-exporter - newTag: "144" + newTag: "3" namespace: fail2ban-prometheus From c6667f193c8b45854e31c80c4c22acab916c61cc Mon Sep 17 00:00:00 2001 From: woodpecker Date: Tue, 27 Aug 2024 00:17:11 +0000 Subject: [PATCH 8/8] KUSTOMIZE BUILD: build fail2ban-exporter deployment with kustomize 6 (done automagically via Woodpecker pipeline) [CI SKIP] --- deploy/fail2ban-exporter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/fail2ban-exporter.yaml b/deploy/fail2ban-exporter.yaml index ec37562..f7d2644 100644 --- a/deploy/fail2ban-exporter.yaml +++ b/deploy/fail2ban-exporter.yaml @@ -149,7 +149,7 @@ spec: - env: - name: F2B_GEOIP_SERVICE value: fail2ban-geoip - image: git.ar21.de/yolokube/fail2ban-prometheus-exporter:144 + image: git.ar21.de/yolokube/fail2ban-prometheus-exporter:3 imagePullPolicy: IfNotPresent name: fail2ban-prometheus-exporter ports: