Merge pull request #19 from polardb/release/v1.4.1

Release v1.4.1
polardb · Apr 12, 2023 · 9050ec5 · 9050ec5
2 parents a72ad55 + e1d0910
commit 9050ec5
Show file tree

Hide file tree

Showing 56 changed files with 1,879 additions and 149 deletions.
diff --git a/.github/config/values.yaml b/.github/config/values.yaml
@@ -2,5 +2,5 @@ clusterDefaults:
   version: latest
   images:
     galaxysql: pxc-registry.cn-shanghai.cr.aliyuncs.com/polardbx/polardbx-sql
-    galaxyengine: pxc-registry.cn-shanghai.cr.aliyuncs.com/polardbx/polardbx-engine
+    galaxyengine: pxc-registry.cn-shanghai.cr.aliyuncs.com/polardbx/polardbx-engine-2.0
     galaxycdc: pxc-registry.cn-shanghai.cr.aliyuncs.com/polardbx/polardbx-cdc
diff --git a/CHANGELOG/README.md b/CHANGELOG/README.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## 2023-04-12
+
+Release v1.4.1
+
++ Enhancement & New Features
+  + Support PolarDB-X Engine 2.0.0
+  + Remove single download proxy for consensus logs in point-in-time recovery(PITR)
++ Bug Fix
+  + Fix readonly pxc when shareGms is `true`
+  + Fix Compute Nodes metadata inconsistency when upgrading frequently
+
 ## 2023-03-23
 
 Release v1.4.0

diff --git a/api/v1/polardbx/config.go b/api/v1/polardbx/config.go
@@ -22,7 +22,8 @@ import (
 )
 
 type CNStaticConfig struct {
-	AttendHtap           bool                          `json:"AttendHtap,omitempty"`
+	AttendHtap bool `json:"AttendHtap,omitempty"`
+	// +kubebuilder:default=true
 	EnableCoroutine      bool                          `json:"EnableCoroutine,omitempty"`
 	EnableReplicaRead    bool                          `json:"EnableReplicaRead,omitempty"`
 	EnableJvmRemoteDebug bool                          `json:"EnableJvmRemoteDebug,omitempty"`
@@ -58,6 +59,10 @@ type CDCConfig struct {
 	Envs map[string]intstr.IntOrString `json:"envs,omitempty"`
 }
 
+type ColumnarConfig struct {
+	Envs map[string]intstr.IntOrString `json:"envs,omitempty"`
+}
+
 type Config struct {
 	// CN config.
 	CN CNConfig `json:"cn,omitempty"`
@@ -67,4 +72,7 @@ type Config struct {
 
 	// CDC config
 	CDC CDCConfig `json:"cdc,omitempty"`
+
+	// Columnar config
+	Columnar ColumnarConfig `json:"columnar,omitempty"`
 }
diff --git a/api/v1/polardbx/status.go b/api/v1/polardbx/status.go
@@ -98,6 +98,8 @@ type ReplicaStatusForPrint struct {
 	DN string `json:"dn,omitempty"`
 	// CDC status, e.g. 1/2 or - when CDC nodes not requested.
 	CDC string `json:"cdc,omitempty"`
+	// Columnar status, e.g. 1/2 or - when Columnar nodes not requested.
+	Columnar string `json:"columnar,omitempty"`
 }
 
 // StatusForPrint represents the overall printable status of the cluster.
@@ -151,6 +153,9 @@ type ClusterReplicasStatus struct {
 
 	// CDC defines the replica status for CDC.
 	CDC *ReplicasStatus `json:"cdc,omitempty"`
+
+	// Columnar defines the replica status for CDC.
+	Columnar *ReplicasStatus `json:"columnar,omitempty"`
 }
 
 // PitrStatus represents the status ot pitr restore

diff --git a/api/v1/polardbx/topology.go b/api/v1/polardbx/topology.go
@@ -64,10 +64,11 @@ type XStoreTopologyRule struct {
 }
 
 type TopologyRuleComponents struct {
-	CN  []StatelessTopologyRuleItem `json:"cn,omitempty"`
-	CDC []StatelessTopologyRuleItem `json:"cdc,omitempty"`
-	GMS *XStoreTopologyRule         `json:"gms,omitempty"`
-	DN  *XStoreTopologyRule         `json:"dn,omitempty"`
+	CN       []StatelessTopologyRuleItem `json:"cn,omitempty"`
+	CDC      []StatelessTopologyRuleItem `json:"cdc,omitempty"`
+	Columnar []StatelessTopologyRuleItem `json:"columnar,omitempty"`
+	GMS      *XStoreTopologyRule         `json:"gms,omitempty"`
+	DN       *XStoreTopologyRule         `json:"dn,omitempty"`
 }
 
 type TopologyRules struct {
@@ -157,6 +158,28 @@ type CDCTemplate struct {
 	Resources corev1.ResourceRequirements `json:"resources,omitempty"`
 }
 
+type ColumnarTemplate struct {
+	// Image for Columnar. Should be replaced by default value if not present.
+	// +optional
+	Image string `json:"image,omitempty"`
+
+	// ImagePullPolicy describes a policy for if/when to pull a container image (especially
+	// for the engine container).
+	ImagePullPolicy corev1.PullPolicy `json:"imagePullPolicy,omitempty"`
+
+	// ImagePullSecrets represents the secrets for pulling private images.
+	ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"`
+
+	// HostNetwork mode.
+	// +optional
+	HostNetwork bool `json:"hostNetwork,omitempty"`
+
+	// +kubebuilder:default={limits: {cpu: 4, memory: "8Gi"}}
+
+	// Resources. Default is limits of 4 cpu and 8Gi memory.
+	Resources corev1.ResourceRequirements `json:"resources,omitempty"`
+}
+
 type TopologyNodeGMS struct {
 	// Template of GMS xstore. If not provided, the operator will use
 	// the template for DN as template for GMS.
@@ -200,6 +223,17 @@ type TopologyNodeCDC struct {
 	Template CDCTemplate `json:"template,omitempty"`
 }
 
+type TopologyNodeColumnar struct {
+	// +kubebuilder:default=2
+	// +kubebuilder:validation:Minimum=0
+
+	Replicas int32 `json:"replicas,omitempty"`
+
+	// +kubebuilder:default={resources: {limits: {cpu: 4, memory: "8Gi"}}}
+
+	Template ColumnarTemplate `json:"template,omitempty"`
+}
+
 type TopologyNodes struct {
 	GMS TopologyNodeGMS `json:"gms,omitempty"`
 
@@ -210,6 +244,8 @@ type TopologyNodes struct {
 	DN TopologyNodeDN `json:"dn,omitempty"`
 
 	CDC *TopologyNodeCDC `json:"cdc,omitempty"`
+
+	Columnar *TopologyNodeColumnar `json:"columnar,omitempty"`
 }
 
 type Topology struct {

diff --git a/api/v1/polardbx/zz_generated.deepcopy.go b/api/v1/polardbx/zz_generated.deepcopy.go
diff --git a/api/v1/polardbxcluster_types.go b/api/v1/polardbxcluster_types.go
@@ -141,6 +141,7 @@ type PolarDBXClusterStatus struct {
 // +kubebuilder:printcolumn:name="CN",type=string,JSONPath=`.status.statusForPrint.replicaStatus.cn`
 // +kubebuilder:printcolumn:name="DN",type=string,JSONPath=`.status.statusForPrint.replicaStatus.dn`
 // +kubebuilder:printcolumn:name="CDC",type=string,JSONPath=`.status.statusForPrint.replicaStatus.cdc`
+// +kubebuilder:printcolumn:name="COLUMNAR",type=string,JSONPath=`.status.statusForPrint.replicaStatus.columnar`
 // +kubebuilder:printcolumn:name="PHASE",type=string,JSONPath=`.status.phase`
 // +kubebuilder:printcolumn:name="DISK",type=string,JSONPath=`.status.statusForPrint.storageSize`
 // +kubebuilder:printcolumn:name="STAGE",type=string,priority=1,JSONPath=`.status.stage`

diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/build/images/xstore-tools/Dockerfile b/build/images/xstore-tools/Dockerfile
@@ -60,10 +60,12 @@ ADD third-party third-party
 RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -tags polardbx -o polardbx-binlog cmd/polardbx-binlog/main.go
 # Build filestream tools
 RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -o polardbx-filestream-client cmd/polardbx-filestream-cli/main.go
+# Build polardbx-job
+RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -tags polardbx -o polardbx-job cmd/polardbx-job/main.go
 
 
 # Build the image with scripts
-FROM polardbx/xstore-tools-base:v1.3.0
+FROM polardbx/xstore-tools-base:v1.4.1
 
 ARG VERSION=test
 
@@ -77,6 +79,7 @@ COPY --from=builder /tools/xstore/current/__pycache__ __pycache__
 COPY --from=gobuilder /workspace/polardbx-binlog bb
 RUN mkdir -p /tools/xstore/current/bin
 COPY --from=gobuilder /workspace/polardbx-filestream-client /tools/xstore/current/bin/
+COPY --from=gobuilder /workspace/polardbx-job /tools/xstore/current/bin/
 
 # Copy all scripts
 RUN ln -s cli.py xsl && chmod +x xsl

diff --git a/charts/polardbx-logcollector/Chart.yaml b/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.4.0
-appVersion: v1.4.0
+version: 1.4.1
+appVersion: v1.4.1
 keywords:
   - polardb-x
   - operator

diff --git a/charts/polardbx-monitor/Chart.yaml b/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.4.0
-appVersion: v1.4.0
+version: 1.4.1
+appVersion: v1.4.1
 keywords:
   - polardb-x
   - operator

diff --git a/charts/polardbx-operator/Chart.yaml b/charts/polardbx-operator/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: polardbx-operator
 description: Helm chart of polardbx-operator
 type: application
-version: 1.4.0
-appVersion: v1.4.0
+version: 1.4.1
+appVersion: v1.4.1
 keywords:
 - polardb-x
 - operator