diff --git a/.gitmodules b/.gitmodules index 3888c0c..9c805c9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -49,3 +49,6 @@ [submodule "apps/tekton/dashboard"] path = apps/tekton/dashboard url = https://github.com/tektoncd/dashboard.git +[submodule "_sys/haproxy-ingress"] + path = _sys/haproxy-ingress + url = https://github.com/haproxytech/kubernetes-ingress.git diff --git a/_sys/haproxy-ingress.yaml b/_sys/haproxy-ingress.yaml index a50f609..f6942df 100644 --- a/_sys/haproxy-ingress.yaml +++ b/_sys/haproxy-ingress.yaml @@ -167,7 +167,7 @@ spec: containerPort: 1024 env: - name: TZ - value: "Etc/UTC" + value: "Europe/Berlin" - name: POD_NAME valueFrom: fieldRef: @@ -201,4 +201,4 @@ spec: - name: stat port: 1024 protocol: TCP - targetPort: 1024 \ No newline at end of file + targetPort: 1024 diff --git a/apps/gitea.yaml b/apps/gitea.yaml index 0533589..cf6e2d6 100644 --- a/apps/gitea.yaml +++ b/apps/gitea.yaml @@ -24,7 +24,7 @@ spec: containers: - name: gitea image: gitea/gitea:latest - imagePullPolicy: IfNotPresent + imagePullPolicy: Always env: - name: USER_UID value: "1000" diff --git a/apps/pihole-deployment.yaml b/apps/pihole-deployment.yaml index 4f95149..02738d8 100644 --- a/apps/pihole-deployment.yaml +++ b/apps/pihole-deployment.yaml @@ -33,6 +33,8 @@ spec: spec: containers: - env: + - name: TZ + value: Europe/Berlin - name: WEB_PORT value: "80" - name: VIRTUAL_HOST diff --git a/apps/tekton/README.md b/apps/tekton/README.md new file mode 100644 index 0000000..12ff737 --- /dev/null +++ b/apps/tekton/README.md @@ -0,0 +1,8 @@ +Install: + +# Pipelines: @kubectl apply --filename https://storage.googleapis.com/tekton-releases/pipeline/latest/release.yaml@ +# Triggers: @kubectl apply --filename https://storage.googleapis.com/tekton-releases/triggers/latest/release.yaml@ #https://github.com/tektoncd/triggers/blob/master/docs/install.md +# Dashboard: +## update submodule in ./dashboard +## Build: @docker build -t tekton-dashboard:arm64 -t docker-registry.lan/tekton-dashboard:arm64 --platform linux/arm64 --build-arg GOARCH=arm64 .@ +## apply deployment.yaml diff --git a/apps/tekton/tekton-dashboard-release.yaml b/apps/tekton/tekton-dashboard-release.yaml index e284c96..61c6bf3 100644 --- a/apps/tekton/tekton-dashboard-release.yaml +++ b/apps/tekton/tekton-dashboard-release.yaml @@ -393,6 +393,8 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + - name: WEB_RESOURCES_DIR + value: /go/src/github.com/tektoncd/dashboard/web #image: gcr.io/tekton-releases/github.com/tektoncd/dashboard/cmd/dashboard@sha256:744eb92d7d0365bbfb2405df4ba4d2a66c01edc26028c362bd5675e2bc1b9626 image: docker-registry.lan/tekton-dashboard:arm64 livenessProbe: @@ -505,11 +507,17 @@ apiVersion: networking.k8s.io/v1beta1 kind: Ingress metadata: name: tekton-dashboard + namespace: tekton-pipelines + labels: + app.kubernetes.io/component: dashboard + app.kubernetes.io/instance: default + app.kubernetes.io/part-of: tekton-dashboard spec: rules: - host: tekton.lan http: paths: - backend: - serviceName: http + serviceName: tekton-dashboard servicePort: 9097 + diff --git a/cluster-monitoring b/cluster-monitoring index f0581d4..0358769 160000 --- a/cluster-monitoring +++ b/cluster-monitoring @@ -1 +1 @@ -Subproject commit f0581d44d4990145e9e4dec615a9d77781560da4 +Subproject commit 0358769db1cf82c6501f7131ca7ac63202381e28 diff --git a/prometheus/additional-scrape-configs.yaml b/prometheus/additional-scrape-configs.yaml index d610905..d6bbed1 100644 --- a/prometheus/additional-scrape-configs.yaml +++ b/prometheus/additional-scrape-configs.yaml @@ -1,6 +1,6 @@ apiVersion: v1 data: - prometheus-additional.yaml: LSBqb2JfbmFtZTogZ2l0ZWEKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGdpdC11aS5sYW4KLSBqb2JfbmFtZTogbmdpbngKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGF1dG8uY2hhb3M6OTExMwotIGpvYl9uYW1lOiBteXNxbGQKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIG1hcmlhZGIubGFuOjkxMDQKLSBqb2JfbmFtZTogbXF0dC5tb3NxdWl0dG8KICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIG1xdHQubGFuOjkyMzQKLSBqb2JfbmFtZTogaGFwcm94eQogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gZHJ1Y2tpLndrczo5MTAxCi0gam9iX25hbWU6IGtsaXBwZXIKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGRydWNraS53a3M6MzkwMwotIGpvYl9uYW1lOiBvY3RvcHJpbnQKICBtZXRyaWNzX3BhdGg6IC9wbHVnaW4vcHJvbWV0aGV1c19leHBvcnRlci9tZXRyaWNzCiAgcGFyYW1zOgogICAgYXBpa2V5OgogICAgLSAzMEU4QjAxQkZENjc0RTVCQkQ0NDZEMDhDNDczMERGNAogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gZHJ1Y2tpLndrczo4MAotIGpvYl9uYW1lOiBvcGVuaGFiMgogIG1ldHJpY3NfcGF0aDogLwogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gYXV0by5jaGFvczo5OTk5Ci0gam9iX25hbWU6IG5vZGUKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGR1bW9udC5jaGFvczo5MTAwCiAgICAtIGR1bW9udC53a3M6OTEwMAogICAgLSBhdXRvMDE6OTEwMAogICAgLSBkcnVja2kud2tzOjkxMDAKICAgIC0gZWJpbjAxLmNoYW9zOjkxMDAKICAgIC0gZWJpbjAyLmNoYW9zOjkxMDAKICAgIC0gcmlvdDAxLmNoYW9zOjkxMDAKICAgIC0gdHJ1aGU6OTEwMAogICAgLSB0dW1vci5jaGFvczo5MTAwCiAgICAtIHdvaG56OjkxMDAKICAgIC0geW9yaS5jaGFvczo5MTAwCg== + prometheus-additional.yaml: LSBqb2JfbmFtZTogZ2l0ZWEKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGdpdC11aS5sYW4KLSBqb2JfbmFtZTogbmdpbngKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGF1dG8uY2hhb3M6OTExMwotIGpvYl9uYW1lOiBteXNxbGQKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIG1hcmlhZGIubGFuOjkxMDQKLSBqb2JfbmFtZTogbXF0dC5tb3NxdWl0dG8KICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIG1xdHQubGFuOjkyMzQKLSBqb2JfbmFtZTogaGFwcm94eQogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gZHJ1Y2tpLndrczo5MTAxCi0gam9iX25hbWU6IGtsaXBwZXIKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGRydWNraS53a3M6MzkwMwotIGpvYl9uYW1lOiBvY3RvcHJpbnQKICBtZXRyaWNzX3BhdGg6IC9wbHVnaW4vcHJvbWV0aGV1c19leHBvcnRlci9tZXRyaWNzCiAgcGFyYW1zOgogICAgYXBpa2V5OgogICAgLSAzMEU4QjAxQkZENjc0RTVCQkQ0NDZEMDhDNDczMERGNAogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gZHJ1Y2tpLndrczo4MAotIGpvYl9uYW1lOiBvcGVuaGFiMgogIG1ldHJpY3NfcGF0aDogLwogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gYXV0by5jaGFvczo5OTk5Ci0gam9iX25hbWU6IG5vZGUKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGR1bW9udC5jaGFvczo5MTAwCiAgICAtIGR1bW9udC53a3M6OTEwMAogICAgLSBhdXRvMDE6OTEwMAogICAgLSBkcnVja2kud2tzOjkxMDAKICAgIC0gZWJpbjAxOjkxMDAKICAgIC0gZWJpbjAyOjkxMDAKICAgIC0gcmlvdDAxOjkxMDAKICAgIC0gdHJ1aGU6OTEwMAogICAgLSB0dW1vci5jaGFvczo5MTAwCiAgICAtIHdvaG56OjkxMDAKICAgIC0geW9yaS5jaGFvczo5MTAwCg== kind: Secret metadata: creationTimestamp: null diff --git a/prometheus/prometheus-additional.yaml b/prometheus/prometheus-additional.yaml index 15b17cc..fd0d8ca 100644 --- a/prometheus/prometheus-additional.yaml +++ b/prometheus/prometheus-additional.yaml @@ -42,9 +42,9 @@ - dumont.wks:9100 - auto01:9100 - drucki.wks:9100 - - ebin01.chaos:9100 - - ebin02.chaos:9100 - - riot01.chaos:9100 + - ebin01:9100 + - ebin02:9100 + - riot01:9100 - truhe:9100 - tumor.chaos:9100 - wohnz:9100