From 4985a4d209ec723976387c80cb31020188b78e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Sch=C3=B6chlin?= Date: Sun, 5 Jan 2025 12:36:34 +0100 Subject: [PATCH] Also template and release a kubernetes manifest --- .github/workflows/shared.yml | 2 +- .gitignore | 1 + create_docker | 2 ++ zabbix-agent-daemonset-kubernetes.yaml | 8 ++++---- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/shared.yml b/.github/workflows/shared.yml index e11cf04..8c1962f 100644 --- a/.github/workflows/shared.yml +++ b/.github/workflows/shared.yml @@ -33,7 +33,7 @@ jobs: - uses: ncipollo/release-action@v1 if: ${{ inputs.publish_steps }} with: - artifacts: "zabbix-agent-extensions*.deb,zabbix-agent-extensions-*.rpm" + artifacts: "zabbix-agent-extensions*.deb,zabbix-agent-extensions-*.rpm,zabbix-agent-daemonset-kubernetes-release.yaml" - name: Login to Docker Hub if: ${{ inputs.publish_steps }} uses: docker/login-action@v3 diff --git a/.gitignore b/.gitignore index 3e56e44..686a1b5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ *.deb *.rpm *.idea +zabbix-agent-daemonset-kubernetes-release.yaml diff --git a/create_docker b/create_docker index 227fbab71..c79fc1b 100755 --- a/create_docker +++ b/create_docker @@ -93,6 +93,8 @@ buildDocker(){ --build-arg BUILD_DATE="$(date "+%Y-%m-%d")" \ --build-arg BUILD_VERSION="$VERSION" \ -t ${IMAGE_NAME}:${VERSION} -f Dockerfile . + sed "~s,${IMAGE_REPO}/${IMAGE_NAME}:latest,${IMAGE_REPO}/${IMAGE_NAME}:${VERSION}," zabbix-agent-daemonset-kubernetes.yaml > \ + zabbix-agent-daemonset-kubernetes-release.yaml set +xe } diff --git a/zabbix-agent-daemonset-kubernetes.yaml b/zabbix-agent-daemonset-kubernetes.yaml index 7e62d01..84ea503 100644 --- a/zabbix-agent-daemonset-kubernetes.yaml +++ b/zabbix-agent-daemonset-kubernetes.yaml @@ -19,7 +19,7 @@ spec: labels: name: zabbix-agent spec: - # this toleration is to have the daemonset runnable on master nodes + # this toleration is to have the daemonset runnable also on master nodes # tolerations: # - key: node-role.kubernetes.io/master # effect: NoSchedule @@ -43,7 +43,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: ZBX_ACTIVESERVERS + - name: ZBX_SERVER_HOST value: "zabbix-proxy" - name: ZBX_PASSIVESERVERS value: "127.0.0.1,zabbix-proxy" @@ -77,5 +77,5 @@ metadata: name: zabbix-agent-extensions-include namespace: "infra-zabbix-agent" data: - "zabbix-agent-extensions-include.conf": | - Include=/usr/share/zabbix-agent-extensions/include.d/*.conf + "zabbix-agent-extensions-include-extra.conf": | + # Extra