diff --git a/.project b/.project new file mode 100644 index 0000000..9ae3f8e --- /dev/null +++ b/.project @@ -0,0 +1,11 @@ + + + kubernetes + + + + + + + + diff --git a/docker-apt-cacher-ng b/docker-apt-cacher-ng index 9575c95..dce71fc 160000 --- a/docker-apt-cacher-ng +++ b/docker-apt-cacher-ng @@ -1 +1 @@ -Subproject commit 9575c95ea62ad3172e9aa3c5a7cf9ba73bd46a8b +Subproject commit dce71fc3b52a95039d76639c4b050a77526bfd1c diff --git a/gluster-kubernetes b/gluster-kubernetes deleted file mode 160000 index 4f3693b..0000000 --- a/gluster-kubernetes +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4f3693b6354957c994f27ee91a6066630769a38c diff --git a/glusterfs/glusterfs-endpoints.yaml b/glusterfs/glusterfs-endpoints.yaml deleted file mode 100644 index 2442a33..0000000 --- a/glusterfs/glusterfs-endpoints.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Endpoints -metadata: - name: glusterfs-cluster -subsets: -- addresses: - - ip: 192.168.10.180 - ports: - - port: 1 -- addresses: - - ip: 192.168.10.181 - ports: - - port: 1 diff --git a/glusterfs/glusterfs-pod-example.yaml b/glusterfs/glusterfs-pod-example.yaml deleted file mode 100644 index 9ac1c3e..0000000 --- a/glusterfs/glusterfs-pod-example.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: glusterfs -spec: - containers: - - name: glusterfs - image: nginx - volumeMounts: - - mountPath: "/mnt/glusterfs" - name: glusterfsvol - volumes: - - name: glusterfsvol - glusterfs: - endpoints: glusterfs-cluster - path: k8s - readOnly: false diff --git a/glusterfs/glusterfs-service.yaml b/glusterfs/glusterfs-service.yaml deleted file mode 100644 index 0ec98ae..0000000 --- a/glusterfs/glusterfs-service.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: glusterfs-cluster -spec: - ports: - - port: 1 diff --git a/prometheus/additional-scrape-configs.yaml b/prometheus/additional-scrape-configs.yaml index c175c98..181a6c4 100644 --- a/prometheus/additional-scrape-configs.yaml +++ b/prometheus/additional-scrape-configs.yaml @@ -1,6 +1,6 @@ apiVersion: v1 data: - prometheus-additional.yaml: LSBqb2JfbmFtZTogbXlzcWxkCiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBtYXJpYWRiLmxhbjo5MTA0Ci0gam9iX25hbWU6IG1xdHQubW9zcXVpdHRvCiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBtcXR0Lmxhbjo5MjM0Ci0gam9iX25hbWU6IGhhcHJveHkKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGRydWNraS5jaGFvczo5MTAxCiAgICAtIHJpb3QwMS5jaGFvczo5MTAxCi0gam9iX25hbWU6IGtsaXBwZXIKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGRydWNraS5jaGFvczozOTAzCi0gam9iX25hbWU6IG9jdG9wcmludAogIG1ldHJpY3NfcGF0aDogL3BsdWdpbi9wcm9tZXRoZXVzX2V4cG9ydGVyL21ldHJpY3MKICBwYXJhbXM6CiAgICBhcGlrZXk6CiAgICAtIDMwRThCMDFCRkQ2NzRFNUJCRDQ0NkQwOEM0NzMwREY0CiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBkcnVja2kuY2hhb3M6ODAKLSBqb2JfbmFtZTogb3BlbmhhYjIKICBtZXRyaWNzX3BhdGg6IC8KICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGF1dG8uY2hhb3M6OTk5OQotIGpvYl9uYW1lOiBub2RlCiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBkdW1vbnQuY2hhb3M6OTEwMAogICAgLSBhdXRvMDE6OTEwMAogICAgLSBkcnVja2kuY2hhb3M6OTEwMAogICAgLSBlYmluMDEuY2hhb3M6OTEwMAogICAgLSBlYmluMDIuY2hhb3M6OTEwMAogICAgLSBsZW5ueS5jaGFvczo5MTAwCiAgICAtIHJpb3QwMS5jaGFvczo5MTAwCiAgICAtIHRydWhlOjkxMDAKICAgIC0gdHVtb3IuY2hhb3M6OTEwMAogICAgLSB3b2huejo5MTAwCiAgICAtIHlvcmkuY2hhb3M6OTEwMAo= + prometheus-additional.yaml: LSBqb2JfbmFtZTogbXlzcWxkCiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBtYXJpYWRiLmxhbjo5MTA0Ci0gam9iX25hbWU6IG1xdHQubW9zcXVpdHRvCiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBtcXR0Lmxhbjo5MjM0Ci0gam9iX25hbWU6IGhhcHJveHkKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGRydWNraS5jaGFvczo5MTAxCiAgICAtIHJpb3QwMS5jaGFvczo5MTAxCiAgICAtIGF1dG86OTEwMQotIGpvYl9uYW1lOiBrbGlwcGVyCiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBkcnVja2kuY2hhb3M6MzkwMwotIGpvYl9uYW1lOiBvY3RvcHJpbnQKICBtZXRyaWNzX3BhdGg6IC9wbHVnaW4vcHJvbWV0aGV1c19leHBvcnRlci9tZXRyaWNzCiAgcGFyYW1zOgogICAgYXBpa2V5OgogICAgLSAzMEU4QjAxQkZENjc0RTVCQkQ0NDZEMDhDNDczMERGNAogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gZHJ1Y2tpLmNoYW9zOjgwCi0gam9iX25hbWU6IG9wZW5oYWIyCiAgbWV0cmljc19wYXRoOiAvCiAgc3RhdGljX2NvbmZpZ3M6CiAgLSB0YXJnZXRzOgogICAgLSBhdXRvLmNoYW9zOjk5OTkKLSBqb2JfbmFtZTogbm9kZQogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gZHVtb250LmNoYW9zOjkxMDAKICAgIC0gYXV0bzAxOjkxMDAKICAgIC0gZHJ1Y2tpLmNoYW9zOjkxMDAKICAgIC0gZWJpbjAxLmNoYW9zOjkxMDAKICAgIC0gZWJpbjAyLmNoYW9zOjkxMDAKICAgIC0gbGVubnkuY2hhb3M6OTEwMAogICAgLSByaW90MDEuY2hhb3M6OTEwMAogICAgLSB0cnVoZTo5MTAwCiAgICAtIHR1bW9yLmNoYW9zOjkxMDAKICAgIC0gd29obno6OTEwMAogICAgLSB5b3JpLmNoYW9zOjkxMDAK kind: Secret metadata: creationTimestamp: null diff --git a/prometheus/metallb-system-role.yaml b/prometheus/metallb-system-role.yaml new file mode 100644 index 0000000..87c2c01 --- /dev/null +++ b/prometheus/metallb-system-role.yaml @@ -0,0 +1,30 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: prometheus-k8s + namespace: metallb-system +rules: +- apiGroups: + - "" + resources: + - services + - endpoints + - pods + verbs: + - get + - list + - watch +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: prometheus-k8s + namespace: metallb-system +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: prometheus-k8s +subjects: +- kind: ServiceAccount + name: prometheus-k8s + namespace: monitoring diff --git a/prometheus/prometheus-additional.yaml b/prometheus/prometheus-additional.yaml index ded33df..a84717a 100644 --- a/prometheus/prometheus-additional.yaml +++ b/prometheus/prometheus-additional.yaml @@ -11,6 +11,7 @@ - targets: - drucki.chaos:9101 - riot01.chaos:9101 + - auto:9101 - job_name: klipper static_configs: - targets: