From 17f8b2f5cb9e83cfcc8414a936b4b651464052db Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sat, 30 Jul 2022 12:43:56 +0200 Subject: [PATCH] mosquitto and prometheus --- apps/mosquitto/Dockerfile | 6 +- apps/mosquitto/prometheus/Dockerfile | 10 ++++ apps/mosquitto/tekton-image-build.yaml | 77 -------------------------- apps/mosquitto/tekton-prometheus.yaml | 24 ++++++++ apps/mosquitto/tekton.yaml | 23 ++++++++ 5 files changed, 59 insertions(+), 81 deletions(-) create mode 100644 apps/mosquitto/prometheus/Dockerfile delete mode 100644 apps/mosquitto/tekton-image-build.yaml create mode 100644 apps/mosquitto/tekton-prometheus.yaml create mode 100644 apps/mosquitto/tekton.yaml diff --git a/apps/mosquitto/Dockerfile b/apps/mosquitto/Dockerfile index 0024670..ecf8ced 100644 --- a/apps/mosquitto/Dockerfile +++ b/apps/mosquitto/Dockerfile @@ -1,8 +1,6 @@ -FROM debian:stable-slim +FROM cr.lan/debian-stable -RUN sed -i 's@deb.debian.org@apt-cache.lan/deb.debian.org@g' /etc/apt/sources.list && \ - sed -i 's@security.debian.org@apt-cache.lan/security.debian.org@g' /etc/apt/sources.list && \ - apt-get update && \ +RUN apt-get update && \ apt-get install -y --no-install-recommends \ mosquitto procps && \ apt-get clean -y && \ diff --git a/apps/mosquitto/prometheus/Dockerfile b/apps/mosquitto/prometheus/Dockerfile new file mode 100644 index 0000000..aed1275 --- /dev/null +++ b/apps/mosquitto/prometheus/Dockerfile @@ -0,0 +1,10 @@ +FROM cr.lan/debian-golang-stable + +ENV GOARCH=arm64 +ENV GOPATH=/usr/src/gopath +ENV GOCACHE=/usr/src/gocache +RUN go env +WORKDIR /usr/src +RUN go get github.com/sapcc/mosquitto-exporter +RUN make j4 build CGO_ENABLED=0 +RUN ls -al \ No newline at end of file diff --git a/apps/mosquitto/tekton-image-build.yaml b/apps/mosquitto/tekton-image-build.yaml deleted file mode 100644 index 815a5a2..0000000 --- a/apps/mosquitto/tekton-image-build.yaml +++ /dev/null @@ -1,77 +0,0 @@ -apiVersion: tekton.dev/v1alpha1 -kind: PipelineResource -metadata: - name: chaos-kubernetes-git -spec: - type: git - params: - - name: revision - value: master - - name: url - value: http://git-ui.lan/chaos/kubernetes.git - - name: submodules - value: "false" ---- -apiVersion: tekton.dev/v1alpha1 -kind: PipelineResource -metadata: - name: img-mosquitto -spec: - type: image - params: - - name: url - value: cr.lan/mosquitto ---- -apiVersion: tekton.dev/v1beta1 -kind: Task -metadata: - name: build-mosquitto -spec: - params: - - name: pathToDockerFile - type: string - default: $(resources.inputs.source.path)/apps/mosquitto/Dockerfile - - name: pathToContext - type: string - default: $(resources.inputs.source.path)/apps/mosquitto - resources: - inputs: - - name: source - type: git - outputs: - - name: builtImage - type: image - steps: - - name: build-and-push - image: gcr.io/kaniko-project/executor:arm64 - command: - - /kaniko/executor - args: - - --dockerfile=$(params.pathToDockerFile) - - --destination=$(resources.outputs.builtImage.url) - - --context=$(params.pathToContext) - - --snapshotMode=redo - - --skip-tls-verify ---- -apiVersion: tekton.dev/v1beta1 -kind: TaskRun -metadata: - name: img-mosquitto-taskrun -spec: - #serviceAccountName: dockerhub-service - taskRef: - name: build-mosquitto - params: - - name: pathToDockerFile - value: Dockerfile - resources: - inputs: - - name: source - resourceRef: - name: chaos-kubernetes-git - outputs: - - name: builtImage - resourceRef: - name: img-mosquitto - - \ No newline at end of file diff --git a/apps/mosquitto/tekton-prometheus.yaml b/apps/mosquitto/tekton-prometheus.yaml new file mode 100644 index 0000000..f2c6b15 --- /dev/null +++ b/apps/mosquitto/tekton-prometheus.yaml @@ -0,0 +1,24 @@ +apiVersion: tekton.dev/v1beta1 +kind: PipelineRun +metadata: + name: img-mosquitto-prometheus +spec: + pipelineRef: + name: kaniko-pipeline + params: + - name: git-url + value: http://git-ui.lan/chaos/kubernetes.git + - name: git-revision + value: master + - name: path-to-image-context + value: apps/mosquitto/prometheus + - name: path-to-dockerfile + value: apps/mosquitto/prometheus/Dockerfile + - name: image-name + value: cr.lan/mosquitto-prometheus-exporter + workspaces: + - name: git-source + persistentVolumeClaim: + claimName: tektoncd-workspaces + subPath: tekton/mosquitto-prometheus + \ No newline at end of file diff --git a/apps/mosquitto/tekton.yaml b/apps/mosquitto/tekton.yaml new file mode 100644 index 0000000..185a277 --- /dev/null +++ b/apps/mosquitto/tekton.yaml @@ -0,0 +1,23 @@ +apiVersion: tekton.dev/v1beta1 +kind: PipelineRun +metadata: + name: img-mosquitto +spec: + pipelineRef: + name: kaniko-pipeline + params: + - name: git-url + value: http://git-ui.lan/chaos/kubernetes.git + - name: git-revision + value: master + - name: path-to-image-context + value: apps/mosquitto + - name: path-to-dockerfile + value: apps/mosquitto/Dockerfile + - name: image-name + value: cr.lan/mosquitto + workspaces: + - name: git-source + persistentVolumeClaim: + claimName: tektoncd-workspaces + subPath: tekton/mosquitto \ No newline at end of file