diff --git a/ceph-csi/ceph-csi-rbd.yaml b/ceph-csi/ceph-csi-rbd.yaml index 83a445038467d8883e4dabdf49c8600e9d031041..a9f4843ffa24715d296c386ec1bc4e2ee5f96fff 100644 --- a/ceph-csi/ceph-csi-rbd.yaml +++ b/ceph-csi/ceph-csi-rbd.yaml @@ -6,16 +6,16 @@ metadata: spec: repo: https://ceph.github.io/csi-charts chart: ceph-csi-rbd - #chart: http://s3.home.dlimba.top:89/260501/cdn/installer/charts/ceph-csi-rbd-3.15.0.tgz + #chart: http://s3.home.dlimba.top:89/260501/cdn/installer/charts/ceph-csi-rbd-3.16.2.tgz targetNamespace: ceph-csi-rbd - version: v3.15.0 + version: v3.16.2 valuesContent: |- storageClass: create: true clusterID: c2c4c418-991f-11f0-82d7-000c29478be4 #pool: k8s-volume - pool: k8s-volume_metadata - dataPool: k8s-volume_data + pool: k8s_volume_metadata + dataPool: k8s_volume_data csiConfig: - clusterID: c2c4c418-991f-11f0-82d7-000c29478be4 monitors: diff --git a/mirrors/mirror-statefulset.yaml b/mirrors/mirror-statefulset.yaml index 55c7c189811dd46dd13e2034aef7d677513245cd..27f7cca3c5e0fe132eb18a339340dd31f83ebe3c 100644 --- a/mirrors/mirror-statefulset.yaml +++ b/mirrors/mirror-statefulset.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: ubuntu-mirror - image: hub.imba.cc/library/ubuntu-mirror:v2 + image: hub.imba.cc/library/ubuntu-mirror:v1 volumeMounts: - name: store mountPath: /data diff --git a/mirrors/mirror-sync-job.yaml b/mirrors/mirror-sync-job.yaml index 85e555a3d2e91bb15cfc9f9f356eec6b5e655471..7a018f9b91364d58352434779d7a0b9a432829ad 100644 --- a/mirrors/mirror-sync-job.yaml +++ b/mirrors/mirror-sync-job.yaml @@ -16,4 +16,4 @@ spec: restartPolicy: OnFailure containers: - name: mirror-sync - image: hub.imba.cc/library/ubuntu-sync:v3 \ No newline at end of file + image: hub.imba.cc/library/ubuntu-sync:v1 \ No newline at end of file diff --git a/monitoring/p8s.yaml b/monitoring/p8s.yaml index 1c9cd88366d2c227b9c7ed03747587853e05f5bf..6a45a5aeb71f39c74cd9b7fc19efaded7d68b9d5 100644 --- a/monitoring/p8s.yaml +++ b/monitoring/p8s.yaml @@ -6,9 +6,9 @@ metadata: spec: repo: https://prometheus-community.github.io/helm-charts chart: kube-prometheus-stack - #chart: http://s3.home.dlimba.top:89/260501/cdn/installer/charts/kube-prometheus-stack-77.9.1.tgz + #chart: http://s3.home.dlimba.top:89/260501/cdn/installer/charts/kube-prometheus-stack-85.1.1.tgz targetNamespace: monitoring - version: 77.9.1 + version: 85.1.1 valuesContent: |- defaultRules: rules: @@ -22,11 +22,11 @@ spec: image: registry: hub.imba.cc repository: rancher/prometheus-operator/prometheus-config-reloader - tag: v0.85.0 + tag: v0.90.1 image: registry: hub.imba.cc repository: rancher/prometheus-operator/prometheus-operator - tag: v0.85.0 + tag: v0.90.1 prometheus: ingress: enabled: true @@ -37,7 +37,7 @@ spec: image: registry: hub.imba.cc repository: rancher/prometheus/prometheus - tag: v3.5.0 + tag: v3.11.3-distroless storageSpec: volumeClaimTemplate: spec: @@ -52,12 +52,12 @@ spec: image: registry: hub.imba.cc repository: rancher/prometheus/node-exporter - tag: v1.9.1 + tag: v1.11.1 kube-state-metrics: image: registry: hub.imba.cc repository: rancher/kube-state-metrics/kube-state-metrics - tag: v2.17.0 + tag: v2.18.0 grafana: ingress: enabled: true @@ -67,12 +67,12 @@ spec: image: registry: hub.imba.cc repository: rancher/grafana/grafana - tag: 12.1.1 + tag: 13.0.1-security-01 sidecar: image: registry: hub.imba.cc repository: rancher/kiwigrid/k8s-sidecar - tag: 1.30.10 + tag: 2.7.3 datasources: alertmanager: enabled: false