From 1fc12c300c166f00c0eb7f6f02b4607f748b3ec0 Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Fri, 29 Sep 2023 13:03:48 +0000 Subject: [PATCH] Update thanos config and rook config. --- Taskfile.yaml | 4 ++- .../monitoring/thanos/app/externalsecret.yaml | 31 ++++++++++++++++++ .../monitoring/thanos/app/helmrelease.yaml | 32 +++---------------- .../monitoring/thanos/app/kustomization.yaml | 2 +- .../thanos/app/objectbucketclaim.yaml | 9 ------ .../rook-ceph/cluster/helmrelease.yaml | 12 +++---- talos/deploy-integrations.sh | 10 +++--- 7 files changed, 50 insertions(+), 50 deletions(-) create mode 100644 kubernetes/apps/monitoring/thanos/app/externalsecret.yaml delete mode 100644 kubernetes/apps/monitoring/thanos/app/objectbucketclaim.yaml diff --git a/Taskfile.yaml b/Taskfile.yaml index e533d85..ef08fa5 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -21,7 +21,9 @@ env: includes: volsync: .taskfiles/VolSync/Tasks.yaml precommit: .taskfiles/PreCommit/Tasks.yaml - rook: .taskfiles/rook/Taskfile.yaml + rook: + taskfile: ".taskfiles/rook" + dir: .taskfiles/rook tasks: diff --git a/kubernetes/apps/monitoring/thanos/app/externalsecret.yaml b/kubernetes/apps/monitoring/thanos/app/externalsecret.yaml new file mode 100644 index 0000000..a9ecd49 --- /dev/null +++ b/kubernetes/apps/monitoring/thanos/app/externalsecret.yaml @@ -0,0 +1,31 @@ +--- +apiVersion: external-secrets.io/v1beta1 +kind: ExternalSecret +metadata: + name: thanos + namespace: monitoring +spec: + secretStoreRef: + kind: ClusterSecretStore + name: onepassword-connect + target: + name: thanos-s3-secret + creationPolicy: Owner + template: + engineVersion: v2 + data: + objstore.yml: |- + type: s3 + config: + access_key: {{ .minio_thanos_access_key }} + bucket: thanos + endpoint: {{ .minio_s3_host }} + region: us-east-1 + secret_key: {{ .minio_thanos_secret_key }} + dataFrom: + - extract: + key: minio + rewrite: + - regexp: + source: "(.*)" + target: "minio_$1" diff --git a/kubernetes/apps/monitoring/thanos/app/helmrelease.yaml b/kubernetes/apps/monitoring/thanos/app/helmrelease.yaml index 0b55404..d3fa3ea 100644 --- a/kubernetes/apps/monitoring/thanos/app/helmrelease.yaml +++ b/kubernetes/apps/monitoring/thanos/app/helmrelease.yaml @@ -35,10 +35,7 @@ spec: registry: quay.io repository: thanos/thanos tag: v0.32.3 - objstoreConfig: - type: s3 - config: - insecure: true + existingObjstoreSecret: thanos-s3-secret queryFrontend: enabled: true replicaCount: 3 @@ -71,14 +68,14 @@ spec: persistence: enabled: true storageClass: ceph-block - size: 100Gi + size: 20Gi storegateway: enabled: true replicaCount: 3 persistence: enabled: true storageClass: ceph-block - size: 20Gi + size: 10Gi ruler: enabled: true replicaCount: 3 @@ -99,29 +96,8 @@ spec: persistence: enabled: true storageClass: ceph-block - size: 20Gi + size: 5Gi metrics: enabled: true serviceMonitor: enabled: true - valuesFrom: - - targetPath: objstoreConfig.config.bucket - kind: ConfigMap - name: thanos-bucket-v1 - valuesKey: BUCKET_NAME - - targetPath: objstoreConfig.config.endpoint - kind: ConfigMap - name: thanos-bucket-v1 - valuesKey: BUCKET_HOST - - targetPath: objstoreConfig.config.region - kind: ConfigMap - name: thanos-bucket-v1 - valuesKey: BUCKET_REGION - - targetPath: objstoreConfig.config.access_key - kind: Secret - name: thanos-bucket-v1 - valuesKey: AWS_ACCESS_KEY_ID - - targetPath: objstoreConfig.config.secret_key - kind: Secret - name: thanos-bucket-v1 - valuesKey: AWS_SECRET_ACCESS_KEY diff --git a/kubernetes/apps/monitoring/thanos/app/kustomization.yaml b/kubernetes/apps/monitoring/thanos/app/kustomization.yaml index f5ab648..e4bccc4 100644 --- a/kubernetes/apps/monitoring/thanos/app/kustomization.yaml +++ b/kubernetes/apps/monitoring/thanos/app/kustomization.yaml @@ -4,7 +4,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: monitoring resources: - - ./objectbucketclaim.yaml + - ./externalsecret.yaml - ./helmrelease.yaml configMapGenerator: - name: thanos-bucket-replicate-dashboard diff --git a/kubernetes/apps/monitoring/thanos/app/objectbucketclaim.yaml b/kubernetes/apps/monitoring/thanos/app/objectbucketclaim.yaml deleted file mode 100644 index 080841c..0000000 --- a/kubernetes/apps/monitoring/thanos/app/objectbucketclaim.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -apiVersion: objectbucket.io/v1alpha1 -kind: ObjectBucketClaim -metadata: - name: thanos-bucket-v1 - namespace: monitoring -spec: - bucketName: thanos-v1 - storageClassName: ceph-bucket diff --git a/kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml b/kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml index 91bc6ff..2d0bd86 100644 --- a/kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml +++ b/kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml @@ -53,15 +53,15 @@ spec: config: osdsPerDevice: "1" nodes: - - name: "valinor-1" + - name: "aule" devices: - - name: /dev/disk/by-id/scsi-0HC_Volume_37231496 - - name: "valinor-2" + - name: /dev/disk/by-id/scsi-0HC_Volume_37460833 + - name: "eonwe" devices: - - name: /dev/disk/by-id/scsi-0HC_Volume_37231521 - - name: "valinor-3" + - name: /dev/disk/by-id/scsi-0HC_Volume_37460887 + - name: "arlen" devices: - - name: /dev/disk/by-id/scsi-0HC_Volume_37231596 + - name: /dev/disk/by-id/scsi-0HC_Volume_37460897 ingress: ingressClassName: "nginx" diff --git a/talos/deploy-integrations.sh b/talos/deploy-integrations.sh index 17d6b7b..cab2aff 100755 --- a/talos/deploy-integrations.sh +++ b/talos/deploy-integrations.sh @@ -2,11 +2,11 @@ # shellcheck disable=2312 pushd integrations >/dev/null 2>&1 || exit 1 -rm -rf cni/charts -envsubst < ../../kubernetes/apps/kube-system/cilium/app/values.yaml > cni/values.yaml -kustomize build --enable-helm cni | kubectl apply -f - -rm cni/values.yaml -rm -rf cni/charts +#rm -rf cni/charts +#envsubst < ../../kubernetes/apps/kube-system/cilium/app/values.yaml > cni/values.yaml +#kustomize build --enable-helm cni | kubectl apply -f - +#rm cni/values.yaml +#rm -rf cni/charts rm -rf kubelet-csr-approver/charts envsubst < ../../kubernetes/apps/system/kubelet-csr-approver/app/values.yaml > kubelet-csr-approver/values.yaml