From 315520baa6b74ba1201e4519c6496c81e1e6f060 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Sun, 24 Jan 2021 00:20:55 +0100 Subject: [PATCH] static pvs for essential services --- apps/mariadb/mariadb-deployment.yaml | 31 +++++++++++++++---- apps/smarthome/home-assistant.yaml | 4 +-- apps/tekton/dashboard | 2 +- apps/tekton/tekton-dashboard-release.yaml | 3 ++ .../additional-scrape-configs.yaml | 2 +- .../prometheus-additional.yaml | 7 +++++ storage-classes.yaml | 9 ------ 7 files changed, 39 insertions(+), 19 deletions(-) delete mode 100644 storage-classes.yaml diff --git a/apps/mariadb/mariadb-deployment.yaml b/apps/mariadb/mariadb-deployment.yaml index b3e940b..2e7b079 100644 --- a/apps/mariadb/mariadb-deployment.yaml +++ b/apps/mariadb/mariadb-deployment.yaml @@ -11,7 +11,7 @@ spec: selector: app: mariadb type: LoadBalancer - loadBalancerIP: 172.23.255.4 + loadBalancerIP: 172.23.255.5 --- apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2 kind: Deployment @@ -65,18 +65,37 @@ spec: volumes: - name: mariadb-persistent-storage persistentVolumeClaim: - claimName: mariadb-pv-claim + claimName: mariadb-data --- apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: mariadb-pv-claim - annotations: - volume.beta.kubernetes.io/storage-class: nfs-ssd + name: mariadb-data spec: storageClassName: nfs-ssd + volumeName: mariadb-data accessModes: - ReadWriteOnce resources: requests: - storage: 20Gi \ No newline at end of file + storage: 40Gi +--- +apiVersion: v1 +kind: PersistentVolume +metadata: + name: mariadb-data +spec: + storageClassName: "nfs-ssd" + nfs: + path: /data/raid1-ssd/k8s-data/mariadb-data + server: ebin01 + capacity: + storage: 40Gi + accessModes: + - ReadWriteOnce + volumeMode: Filesystem + persistentVolumeReclaimPolicy: Retain + claimRef: + kind: PersistentVolumeClaim + name: mariadb-data + namespace: default diff --git a/apps/smarthome/home-assistant.yaml b/apps/smarthome/home-assistant.yaml index 721359c..c1b181d 100644 --- a/apps/smarthome/home-assistant.yaml +++ b/apps/smarthome/home-assistant.yaml @@ -19,7 +19,7 @@ spec: spec: containers: - name: hassio - image: "homeassistant/home-assistant:latest" + image: "homeassistant/home-assistant:stable" #image: "homeassistant/aarch64-hassio-supervisor:latest" imagePullPolicy: Always env: @@ -146,4 +146,4 @@ spec: paths: - backend: serviceName: hassio-conf - servicePort: adm \ No newline at end of file + servicePort: adm diff --git a/apps/tekton/dashboard b/apps/tekton/dashboard index 31915a8..c881ad4 160000 --- a/apps/tekton/dashboard +++ b/apps/tekton/dashboard @@ -1 +1 @@ -Subproject commit 31915a8c92b01586cca69a5d0064fa5a4016792b +Subproject commit c881ad4d3a87f6cad109027bda99248cee0031ab diff --git a/apps/tekton/tekton-dashboard-release.yaml b/apps/tekton/tekton-dashboard-release.yaml index 61c6bf3..c7eb3da 100644 --- a/apps/tekton/tekton-dashboard-release.yaml +++ b/apps/tekton/tekton-dashboard-release.yaml @@ -395,8 +395,11 @@ spec: fieldPath: metadata.namespace - name: WEB_RESOURCES_DIR value: /go/src/github.com/tektoncd/dashboard/web + - name: TEKTON_PIPELINES_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 + imagePullPolicy: Always livenessProbe: httpGet: path: /health diff --git a/cluster-monitoring-local/additional-scrape-configs.yaml b/cluster-monitoring-local/additional-scrape-configs.yaml index cafa7e6..d4222e7 100644 --- a/cluster-monitoring-local/additional-scrape-configs.yaml +++ b/cluster-monitoring-local/additional-scrape-configs.yaml @@ -1,6 +1,6 @@ apiVersion: v1 data: - prometheus-additional.yaml: LSBqb2JfbmFtZTogZ2l0ZWEKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGdpdC11aS5sYW4KLSBqb2JfbmFtZTogbmdpbngKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGF1dG8uY2hhb3M6OTExMwotIGpvYl9uYW1lOiBteXNxbGQKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIG1hcmlhZGIubGFuOjkxMDQKLSBqb2JfbmFtZTogbXF0dC5tb3NxdWl0dG8KICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIG1xdHQubGFuOjkyMzQKLSBqb2JfbmFtZTogaGFwcm94eQogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gZHJ1Y2tpLndrczo5MTAxCi0gam9iX25hbWU6IGtsaXBwZXIKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGRydWNraS53a3M6MzkwMwotIGpvYl9uYW1lOiBvY3RvcHJpbnQKICBtZXRyaWNzX3BhdGg6IC9wbHVnaW4vcHJvbWV0aGV1c19leHBvcnRlci9tZXRyaWNzCiAgcGFyYW1zOgogICAgYXBpa2V5OgogICAgLSAzMEU4QjAxQkZENjc0RTVCQkQ0NDZEMDhDNDczMERGNAogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gZHJ1Y2tpLndrczo4MAotIGpvYl9uYW1lOiBvcGVuaGFiMgogIG1ldHJpY3NfcGF0aDogLwogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gYXV0by5jaGFvczo5OTk5Ci0gam9iX25hbWU6IG5vZGUKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGR1bW9udC53a3M6OTEwMAogICAgLSBkcnVja2kud2tzOjkxMDAKICAgIC0gZWJpbjAxLndrczo5MTAwCiAgICAtIGViaW4wMi53a3M6OTEwMAogICAgLSByaW90MDEud2tzOjkxMDAKICAgIC0gdHJ1aGUuY2hhb3M6OTEwMAogICAgLSBhdXRvMDEuY2hhb3M6OTEwMAogICAgLSBkdW1vbnQuY2hhb3M6OTEwMAogICAgLSB0dW1vci5jaGFvczo5MTAwCiAgICAtIHdvaG56LmNoYW9zOjkxMDAKICAgIC0geW9yaS5jaGFvczo5MTAwCg== + prometheus-additional.yaml: LSBqb2JfbmFtZTogZ2l0ZWEKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGdpdC11aS5sYW4KLSBqb2JfbmFtZTogbmdpbngKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGF1dG8uY2hhb3M6OTExMwotIGpvYl9uYW1lOiBteXNxbGQKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIG1hcmlhZGIubGFuOjkxMDQKLSBqb2JfbmFtZTogbXF0dC5tb3NxdWl0dG8KICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIG1xdHQubGFuOjkyMzQKLSBqb2JfbmFtZTogaGFwcm94eQogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gZHJ1Y2tpLndrczo5MTAxCi0gam9iX25hbWU6IGtsaXBwZXIKICBzdGF0aWNfY29uZmlnczoKICAtIHRhcmdldHM6CiAgICAtIGRydWNraS53a3M6MzkwMwotIGpvYl9uYW1lOiBvY3RvcHJpbnQKICBtZXRyaWNzX3BhdGg6IC9wbHVnaW4vcHJvbWV0aGV1c19leHBvcnRlci9tZXRyaWNzCiAgcGFyYW1zOgogICAgYXBpa2V5OgogICAgLSAzMEU4QjAxQkZENjc0RTVCQkQ0NDZEMDhDNDczMERGNAogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gZHJ1Y2tpLndrczo4MAotIGpvYl9uYW1lOiBvcGVuaGFiMgogIG1ldHJpY3NfcGF0aDogLwogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gYXV0by5jaGFvczo5OTk5Ci0gam9iX25hbWU6IGhhc3NpbwogIG1ldHJpY3NfcGF0aDogL2FwaS9wcm9tZXRoZXVzCiAgYmVhcmVyX3Rva2VuOiAnZXlKMGVYQWlPaUpLVjFRaUxDSmhiR2NpT2lKSVV6STFOaUo5LmV5SnBjM01pT2lJM05EUm1aV1EzT0ROak5UVTBaRE0xWWpoaVlUWmpNV0ppTjJJeFl6TTNOQ0lzSW1saGRDSTZNVFl4TVRNd05EQXhOaXdpWlhod0lqb3hPVEkyTmpZME1ERTJmUS4wV1B5eHM4N192cXZhNi1LRDBPd0F3TTdXS3RXeGhmbGFRMnBGeWtUNmMwJwogIHN0YXRpY19jb25maWdzOgogICAgLSB0YXJnZXRzOgogICAgICAtIGhhc3Npby5sYW46ODAKLSBqb2JfbmFtZTogbm9kZQogIHN0YXRpY19jb25maWdzOgogIC0gdGFyZ2V0czoKICAgIC0gYWRtMDEud2tzOjkxMDAKICAgIC0gZHVtb250Lndrczo5MTAwCiAgICAtIGRydWNraS53a3M6OTEwMAogICAgLSBlYmluMDEud2tzOjkxMDAKICAgIC0gZWJpbjAyLndrczo5MTAwCiAgICAtIHJpb3QwMS53a3M6OTEwMAogICAgLSB0cnVoZS5jaGFvczo5MTAwCiAgICAtIGF1dG8wMS5jaGFvczo5MTAwCiAgICAtIGR1bW9udC5jaGFvczo5MTAwCiAgICAtIHR1bW9yLmNoYW9zOjkxMDAKICAgIC0gd29obnouY2hhb3M6OTEwMAogICAgLSB5b3JpLmNoYW9zOjkxMDAK kind: Secret metadata: creationTimestamp: null diff --git a/cluster-monitoring-local/prometheus-additional.yaml b/cluster-monitoring-local/prometheus-additional.yaml index 555531e..c35832c 100644 --- a/cluster-monitoring-local/prometheus-additional.yaml +++ b/cluster-monitoring-local/prometheus-additional.yaml @@ -35,9 +35,16 @@ static_configs: - targets: - auto.chaos:9999 +- job_name: hassio + metrics_path: /api/prometheus + bearer_token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiI3NDRmZWQ3ODNjNTU0ZDM1YjhiYTZjMWJiN2IxYzM3NCIsImlhdCI6MTYxMTMwNDAxNiwiZXhwIjoxOTI2NjY0MDE2fQ.0WPyxs87_vqva6-KD0OwAwM7WKtWxhflaQ2pFykT6c0' + static_configs: + - targets: + - hassio.lan:80 - job_name: node static_configs: - targets: + - adm01.wks:9100 - dumont.wks:9100 - drucki.wks:9100 - ebin01.wks:9100 diff --git a/storage-classes.yaml b/storage-classes.yaml deleted file mode 100644 index 3ee916d..0000000 --- a/storage-classes.yaml +++ /dev/null @@ -1,9 +0,0 @@ -kind: StorageClass -apiVersion: storage.k8s.io/v1 -metadata: - name: fast - annotations: - storageclass.kubernetes.io/is-default-class: true -provisioner: kubernetes.io/no-provisioner -volumeBindingMode: WaitForFirstConsumer -reclaimPolicy: Retain