From 058a9e48ffded692883cbc0a6b904cf6d7821639 Mon Sep 17 00:00:00 2001 From: csuzhangxc Date: Tue, 10 Nov 2026 10:57:48 +0800 Subject: [PATCH] Retire standalone Alertmanager and pin initializer base images --- alertmanager/alertmanager-config.yaml | 7 -- alertmanager/alertmanager-deployment.yaml | 79 --------------------- alertmanager/alertmanger-service.yaml | 14 ---- cmd/Dockerfile | 2 +- monitor-snapshot/master/operator/Dockerfile | 2 +- platform-monitoring/operator/Dockerfile | 2 +- 6 files changed, 3 insertions(+), 103 deletions(-) delete mode 100644 alertmanager/alertmanager-config.yaml delete mode 100644 alertmanager/alertmanager-deployment.yaml delete mode 100644 alertmanager/alertmanger-service.yaml diff --git a/alertmanager/alertmanager-config.yaml b/alertmanager/alertmanager-config.yaml deleted file mode 100644 index 35c28da6..00000000 --- a/alertmanager/alertmanager-config.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v1 -data: - alertmanager.yaml: Imdsb2JhbCI6IAogICJyZXNvbHZlX3RpbWVvdXQiOiAiNW0iCiJyZWNlaXZlcnMiOiAKLSAibmFtZSI6ICJudWxsIgoicm91dGUiOiAKICAiZ3JvdXBfYnkiOiAKICAtICJqb2IiCiAgImdyb3VwX2ludGVydmFsIjogIjVtIgogICJncm91cF93YWl0IjogIjMwcyIKICAicmVjZWl2ZXIiOiAibnVsbCIKICAicmVwZWF0X2ludGVydmFsIjogIjEyaCIKICAicm91dGVzIjogCiAgLSAibWF0Y2giOiAKICAgICAgImFsZXJ0bmFtZSI6ICJXYXRjaGRvZyIKICAgICJyZWNlaXZlciI6ICJudWxsIg== -kind: Secret -metadata: - name: alertmanager-main -type: Opaque \ No newline at end of file diff --git a/alertmanager/alertmanager-deployment.yaml b/alertmanager/alertmanager-deployment.yaml deleted file mode 100644 index 055ee7a8..00000000 --- a/alertmanager/alertmanager-deployment.yaml +++ /dev/null @@ -1,79 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: alertmanager-main -spec: - replicas: 1 - selector: - matchLabels: - app: simple-alertmanager - template: - metadata: - name: alertmanager-main - labels: - app: simple-alertmanager - spec: - containers: - - name: reloader - image: quay.io/coreos/configmap-reload:v0.0.1 - imagePullPolicy: IfNotPresent - args: - - -webhook-url=http://localhost:9093/-/reload - - -volume-dir=/etc/alertmanager/config - volumeMounts: - - mountPath: /etc/alertmanager/config - name: config-volume - readOnly: true - - name: alertmanager - image: prom/alertmanager:latest - args: - - --config.file=/etc/alertmanager/config/alertmanager.yaml - - --cluster.listen-address=[$(POD_IP)]:6783 - - --storage.path=/alertmanager - - --data.retention=120h - - --web.listen-address=:9093 - - --web.route-prefix=/ - ports: - - name: web - containerPort: 9093 - protocol: TCP - - name: mesh - containerPort: 6783 - protocol: TCP - livenessProbe: - failureThreshold: 10 - httpGet: - path: /api/v1/status - port: web - scheme: HTTP - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 3 - readinessProbe: - failureThreshold: 10 - httpGet: - path: /api/v1/status - port: web - scheme: HTTP - initialDelaySeconds: 3 - periodSeconds: 5 - successThreshold: 1 - timeoutSeconds: 3 - env: - - name: POD_IP - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: status.podIP - volumeMounts: - - name: config-volume - mountPath: /etc/alertmanager/config - - mountPath: /alertmanager - name: alertmanager-main-db - volumes: - - name: config-volume - secret: - defaultMode: 420 - secretName: alertmanager-main - - name: alertmanager-main-db - emptyDir: {} \ No newline at end of file diff --git a/alertmanager/alertmanger-service.yaml b/alertmanager/alertmanger-service.yaml deleted file mode 100644 index 812511d7..00000000 --- a/alertmanager/alertmanger-service.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - name: alertmanager-main - name: alertmanager-main -spec: - selector: - app: simple-alertmanager - ports: - - name: alertmanager - protocol: TCP - port: 9093 - targetPort: 9093 \ No newline at end of file diff --git a/cmd/Dockerfile b/cmd/Dockerfile index 903032ee..40133042 100644 --- a/cmd/Dockerfile +++ b/cmd/Dockerfile @@ -1,4 +1,4 @@ -FROM busybox +FROM busybox:1.37.0@sha256:a7dbc319b1438115a207e11930dc4bb3e643dcb3ec0bdd694bb36cd8fad289ec # Add user and group to support run it with non-root. ARG PINGCAP_UID=1000 diff --git a/monitor-snapshot/master/operator/Dockerfile b/monitor-snapshot/master/operator/Dockerfile index 29ebf702..40133042 100644 --- a/monitor-snapshot/master/operator/Dockerfile +++ b/monitor-snapshot/master/operator/Dockerfile @@ -1,4 +1,4 @@ -FROM busybox:1.37.0 +FROM busybox:1.37.0@sha256:a7dbc319b1438115a207e11930dc4bb3e643dcb3ec0bdd694bb36cd8fad289ec # Add user and group to support run it with non-root. ARG PINGCAP_UID=1000 diff --git a/platform-monitoring/operator/Dockerfile b/platform-monitoring/operator/Dockerfile index 29ebf702..40133042 100644 --- a/platform-monitoring/operator/Dockerfile +++ b/platform-monitoring/operator/Dockerfile @@ -1,4 +1,4 @@ -FROM busybox:1.37.0 +FROM busybox:1.37.0@sha256:a7dbc319b1438115a207e11930dc4bb3e643dcb3ec0bdd694bb36cd8fad289ec # Add user and group to support run it with non-root. ARG PINGCAP_UID=1000