release v1.6.2

build/images/polardbx-clinic/Dockerfile

@@ -12,8 +12,9 @@
 # limitations under the License.
 
 # Build the manager binary
+ARG IMAGE_SOURCE
+FROM ${IMAGE_SOURCE}${IMAGE_SOURCE:+"/"}centos:7
 
-FROM centos:7
 WORKDIR /root
 USER root
 COPY build/images/polardbx-clinic/diagnose.sh /root/diagnose.sh

build/images/polardbx-clinic/install_tool.sh

@@ -14,6 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Remove mirrorlist.centos.org.
+sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo
+sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo
+sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
+
 cat <<EOF | tee /etc/yum.repos.d/kubernetes.repo
 [kubernetes]
 name=Kubernetes

build/images/polardbx-exporter/Dockerfile

@@ -12,8 +12,8 @@
 # limitations under the License.
 
 # Build the manager binary
-
-FROM golang:1.21.1 as builder
+ARG IMAGE_SOURCE
+FROM ${IMAGE_SOURCE}${IMAGE_SOURCE:+"/"}golang:1.21.1 as builder
 
 WORKDIR /workspace
 
@@ -35,7 +35,7 @@ ADD third-party third-party
 # Build
 RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -o polardbx-exporter cmd/polardbx-exporter/main.go
 
-FROM  busybox:latest
+FROM  ${IMAGE_SOURCE}${IMAGE_SOURCE:+"/"}busybox:latest
 WORKDIR /
 COPY --from=builder /workspace/polardbx-exporter .
 USER root

build/images/polardbx-hpfs/Dockerfile

@@ -13,7 +13,8 @@
 # limitations under the License.
 
 # Build the init command
-FROM golang:1.21.1 as builder
+ARG IMAGE_SOURCE
+FROM ${IMAGE_SOURCE}${IMAGE_SOURCE:+"/"}golang:1.21.1 as builder
 
 WORKDIR /workspace
 
@@ -35,14 +36,14 @@ ADD third-party third-party
 RUN mkdir -p target
 RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -o target/polardbx-hpfs cmd/polardbx-hpfs/main.go
 
-FROM alpine:latest as certs
+FROM ${IMAGE_SOURCE}${IMAGE_SOURCE:+"/"}alpine:latest as certs
 
 # install ca-certificates
 RUN apk --update add ca-certificates
 
 
 # Use alpine as the base image
-FROM busybox:latest
+FROM ${IMAGE_SOURCE}${IMAGE_SOURCE:+"/"}busybox:latest
 
 WORKDIR /
 COPY --from=builder /workspace/target/polardbx-hpfs .

build/images/polardbx-init/Dockerfile

@@ -12,8 +12,8 @@
 # limitations under the License.
 
 # Build the manager binary
-
-FROM golang:1.21.1 as builder
+ARG IMAGE_SOURCE
+FROM ${IMAGE_SOURCE}${IMAGE_SOURCE:+"/"}golang:1.21.1 as builder
 
 WORKDIR /workspace
 
@@ -35,7 +35,7 @@ ADD third-party third-party
 # Build
 RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -o polardbx-init cmd/polardbx-init/main.go
 
-FROM  busybox:latest
+FROM  ${IMAGE_SOURCE}/busybox:latest
 WORKDIR /
 COPY --from=builder /workspace/polardbx-init .
 USER root

build/images/polardbx-job/Dockerfile

@@ -13,7 +13,8 @@
 # limitations under the License.
 
 # Build the init command
-FROM golang:1.21.1 as builder
+ARG IMAGE_SOURCE
+FROM ${IMAGE_SOURCE}${IMAGE_SOURCE:+"/"}golang:1.21.1 as builder
 
 WORKDIR /workspace
 
@@ -36,7 +37,7 @@ RUN mkdir -p target
 RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -tags polardbx -o target/polardbx-job cmd/polardbx-job/main.go
 
 # Use alpine as the base image
-FROM busybox:latest
+FROM ${IMAGE_SOURCE}${IMAGE_SOURCE:+"/"}busybox:latest
 
 WORKDIR /
 COPY --from=builder /workspace/target/polardbx-job .

build/images/polardbx-logstash/Dockerfile

@@ -1,12 +1,14 @@
-FROM jruby:9.3.8.0-jdk8 as builder
+ARG IMAGE_SOURCE
+FROM ${IMAGE_SOURCE}${IMAGE_SOURCE:+"/"}jruby:9.3.8.0-jdk8 as builder
+
 WORKDIR /workspace
 ADD tools/logstash-filter-polardbx .
 RUN gem install bundler:2.3.10
 RUN bundle update
 RUN bundle install
 RUN gem build logstash-filter-polardbx.gemspec
 
-FROM logstash:8.1.2
+FROM ${IMAGE_SOURCE}${IMAGE_SOURCE:+"/"}logstash:8.1.2
 WORKDIR /usr/share/logstash/
 USER root
 COPY --from=builder /workspace/logstash-filter-polardbx-1.0.0.gem /usr/share/logstash/

build/images/polardbx-operator/Dockerfile

@@ -12,8 +12,8 @@
 # limitations under the License.
 
 # Build the manager binary
-
-FROM golang:1.21.1 as builder
+ARG IMAGE_SOURCE
+FROM ${IMAGE_SOURCE}${IMAGE_SOURCE:+"/"}golang:1.21.1 as builder
 
 WORKDIR /workspace
 
@@ -35,7 +35,7 @@ ADD third-party third-party
 # Build
 RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -o polardbx-operator cmd/polardbx-operator/main.go
 
-FROM  busybox:latest
+FROM  ${IMAGE_SOURCE}${IMAGE_SOURCE:+"/"}busybox:latest
 WORKDIR /
 COPY --from=builder /workspace/polardbx-operator .
 USER root

build/images/probe-proxy/Dockerfile

@@ -12,8 +12,8 @@
 # limitations under the License.
 
 # Build the manager binary
-
-FROM golang:1.21.1 as builder
+ARG IMAGE_SOURCE
+FROM ${IMAGE_SOURCE}${IMAGE_SOURCE:+"/"}golang:1.21.1 as builder
 
 WORKDIR /workspace
 
@@ -37,7 +37,7 @@ RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -o probe-proxy cmd/probe-pr
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
-FROM busybox:latest
+FROM ${IMAGE_SOURCE}${IMAGE_SOURCE:+"/"}busybox:latest
 WORKDIR /
 COPY --from=builder /workspace/probe-proxy .
 

build/images/xstore-tools/Dockerfile

@@ -12,7 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM centos:7 AS builder
+ARG IMAGE_SOURCE
+FROM ${IMAGE_SOURCE}${IMAGE_SOURCE:+"/"}centos:7 AS builder
+
+# Remove mirrorlist.centos.org.
+RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo
+RUN sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo
+RUN sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
 
 # Install python3.
 RUN rpm --rebuilddb && yum install -y python3 && yum clean all
@@ -37,7 +43,7 @@ COPY tools/xstore .
 RUN ./venv/bin/python3 -m compileall . && LC_LANG=en_US.utf8 LC_ALL=en_US.utf8 ENGINE=mock ./venv/bin/python3 cli.py
 
 
-FROM golang:1.21.1 as gobuilder
+FROM ${IMAGE_SOURCE}${IMAGE_SOURCE:+"/"}golang:1.21.1 as gobuilder
 
 WORKDIR /workspace
 
@@ -65,7 +71,7 @@ RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -tags polardbx -o polardbx-
 
 
 # Build the image with scripts
-FROM polardbx/xstore-tools-base:ts20240430102300
+FROM ${IMAGE_SOURCE}${IMAGE_SOURCE:+"/"}xstore-tools-base:ts20240430102300
 
 ARG VERSION=test
 

build/root/Makefile

@@ -69,6 +69,9 @@ endif
 ifneq (, $(LATEST))
 	BUILD_IMAGE_ARGS:=${BUILD_IMAGE_ARGS} --also-latest
 endif
+ifneq (, $(IMAGE_SOURCE))
+	BUILD_IMAGE_ARGS:=${BUILD_IMAGE_ARGS} --image-source $(IMAGE_SOURCE)
+endif
 ifneq (, $(TARGET))
 	BUILD_IMAGE_ARGS:=${BUILD_IMAGE_ARGS} $(TARGET)
 endif
@@ -83,7 +86,11 @@ define BUILD_IMAGES_HELP_INFO
 #   make build TARGET=cmd/hpfs
 #   make build REPO=registry.aliyun.com/custom
 #   make build REPO=registry.aliyun.com/custom TARGET=cmd/hpfs
+#   make build REPO=registry.aliyun.com/custom IMAGE_SOURCE=docker.io/custom
+#   make build REPO=... IMAGE_SOURCE=... TARGET=... TAG=... TARGET=...
 endef
+export BUILD_IMAGES_HELP_INFO
+
 .PHONY: build
 ifeq ($(PRINT_HELP), y)
 build:
@@ -101,7 +108,11 @@ define PUSH_IMAGES_HELP_INFO
 #   make push TARGET=cmd/hpfs
 #   make push REPO=registry.aliyun.com/custom
 #   make push REPO=registry.aliyun.com/custom TARGET=cmd/hpfs
+#   make push REPO=registry.aliyun.com/custom IMAGE_SOURCE=docker.io/custom
+#   make push REPO=... IMAGE_SOURCE=... TARGET=... TAG=... TARGET=...
 endef
+export PUSH_IMAGES_HELP_INFO
+
 .PHONY: push
 ifeq ($(PRINT_HELP), y)
 push:

charts/polardbx-logcollector/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: polardbx-logcollector
 description: Helm chart of polardbx-operator logcollector plugin
 type: application
-version: 1.6.1
-appVersion: v1.6.1
+version: 1.6.2
+appVersion: v1.6.2
 keywords:
   - polardb-x
   - operator

charts/polardbx-logcollector/values.yaml

@@ -2,7 +2,7 @@
 logstash:
   image:
     #image repo of logstash
-    repo: polardbx
+    repo: polardbx-opensource-registry.cn-beijing.cr.aliyuncs.com/polardbx
     #image name of logstash
     name: polardbx-logstash
     #image tag of logstash
@@ -47,7 +47,7 @@ logstash:
 filebeat:
   image:
     #the image repo of the filebeat
-    repo: docker.elastic.co/beats
+    repo: polardbx-opensource-registry.cn-beijing.cr.aliyuncs.com/polardbx
     #the image name of the  filebeat
     name: filebeat
     #the image tag f the filebeat

charts/polardbx-monitor/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: polardbx-monitor
 description: Helm chart of polardbx-operator monitor plugin
 type: application
-version: 1.6.1
-appVersion: v1.6.1
+version: 1.6.2
+appVersion: v1.6.2
 keywords:
   - polardb-x
   - operator

charts/polardbx-monitor/values.yaml

@@ -4,7 +4,7 @@ monitors:
   # AlertManager will not be installed by default
   alertManager:
     # AlertManager docker repo and image. It can be set to your private repo.
-    repo: quay.io/prometheus
+    repo: polardbx-opensource-registry.cn-beijing.cr.aliyuncs.com/polardbx
     image: alertmanager
     # AlertManager version
     version: v0.21.0
@@ -28,7 +28,7 @@ monitors:
   # Grafana related configurations
   grafana:
     # Grafana docker repo and image. It can be set to your private repo.
-    repo: grafana
+    repo: polardbx-opensource-registry.cn-beijing.cr.aliyuncs.com/polardbx
     image: grafana
     version: 8.5.27
     # Grafana replicas, you can scale out/in grafana by this value.
@@ -58,7 +58,7 @@ monitors:
   # kube-state-metrics (KSM) is a simple service that listens to the Kubernetes API server and generates metrics
   # about the state of the objects.
   kubeStateMetrics:
-    repo: kubesphere
+    repo: polardbx-opensource-registry.cn-beijing.cr.aliyuncs.com/polardbx
     image: kube-state-metrics
     version: v2.3.0
     replicas: 1
@@ -78,7 +78,7 @@ monitors:
   # KubeRBACProxy is a small HTTP proxy for a single upstream, that can perform RBAC authorization
   # against the Kubernetes API using SubjectAccessReview.
   kubeRBACProxy:
-    repo: quay.io/brancz
+    repo: polardbx-opensource-registry.cn-beijing.cr.aliyuncs.com/polardbx
     image: kube-rbac-proxy
     version: v0.8.0
 
@@ -89,11 +89,11 @@ monitors:
   # It is a DaemonSet deployed in K8s
   nodeExporter:
     # NodeExporter docker repo and image
-    repo: quay.io/prometheus
+    repo: polardbx-opensource-registry.cn-beijing.cr.aliyuncs.com/polardbx
     image: node-exporter
     version: v1.0.1
     # Node exporter port, update this value if port conflict
-    port: 9100
+    port: 9103
 
     # Node exporter RBAC and ServiceAccount
     rbac:
@@ -113,7 +113,7 @@ monitors:
   # PrometheusAdapter is an implementation of the custom.metrics.k8s.io API using Prometheus
   prometheusAdapter:
     # PrometheusAdapter docker repo and image
-    repo: directxman12
+    repo: polardbx-opensource-registry.cn-beijing.cr.aliyuncs.com/polardbx
     image: k8s-prometheus-adapter
     version: v0.8.2
     # PrometheusAdapter replicas
@@ -134,7 +134,7 @@ monitors:
   # Prometheus configuration
   prometheus:
     # Docker repo and image of Prometheus
-    repo: quay.io/prometheus
+    repo: polardbx-opensource-registry.cn-beijing.cr.aliyuncs.com/polardbx
     image: prometheus
     version: v2.22.1
     # Prometheus node replicas, you can scale out/in prometheus by this value
@@ -176,7 +176,7 @@ monitors:
   # components. The purpose of this component is to simplify and automate the configuration of a Prometheus based
   # monitoring stack for Kubernetes clusters.
   prometheusOperator:
-    repo: quay.io/prometheus-operator
+    repo: polardbx-opensource-registry.cn-beijing.cr.aliyuncs.com/polardbx
     image: prometheus-operator
     version: v0.44.1
     replicas: 1
@@ -201,6 +201,6 @@ monitors:
 
   # PrometheusOperator related component
   prometheusConfigReloader:
-    repo: quay.io/prometheus-operator
+    repo: polardbx-opensource-registry.cn-beijing.cr.aliyuncs.com/polardbx
     image: prometheus-config-reloader
     version: v0.44.1

charts/polardbx-operator/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: polardbx-operator
 description: Helm chart of polardbx-operator
 type: application
-version: 1.6.1
-appVersion: v1.6.1
+version: 1.6.2
+appVersion: v1.6.2
 keywords:
 - polardb-x
 - operator

charts/polardbx-operator/templates/controller-config-configmap.yaml

@@ -38,9 +38,9 @@ data:
       store:
         galaxy:
           engine: {{ .Values.clusterDefaults.images.galaxyengine }}:{{ .Values.clusterDefaults.version }}
-          exporter: prom/mysqld-exporter:master
+          exporter: mysqld-exporter:master
         xcluster:
-          exporter: prom/mysqld-exporter:master
+          exporter: mysqld-exporter:master
 {{- if .Values.extension.config.images.store }}
 {{ toYaml .Values.extension.config.images.store | indent 8 }}
 {{- end}}

charts/polardbx-operator/templates/host-path-file-service-daemonset.yaml

@@ -103,7 +103,7 @@ spec:
           name: tmpfs
         - mountPath: /config
           name: config
-        - mountPath: /proc
+        - mountPath: /host/proc
           name: proc
         - mountPath: /var/run
           name: varrun