Skip to content

Commit

Permalink
Merge pull request #50 from polardb/release/v1.7.0
Browse files Browse the repository at this point in the history
release v1.7.0
  • Loading branch information
dingfeng authored Sep 25, 2024
2 parents 72dcf9a + 65e9a0a commit 4405cb0
Show file tree
Hide file tree
Showing 64 changed files with 7,424 additions and 5,710 deletions.
1 change: 0 additions & 1 deletion api/v1/common/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions api/v1/polardbx/restore.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,6 @@ type RestoreBinlogSource struct {
Checksum string `json:"checksum,omitempty"`
//StorageProvider defines the source binlog sink
StorageProvider *BackupStorageProvider `json:"storageProvider,omitempty"`
//SName defines the heartbeat sname in the cdc heartbeat table
HeartbeatSName string `json:"heartbeatSName,omitempty"`
}
1 change: 0 additions & 1 deletion api/v1/polardbx/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/v1/polardbxparametertemplate_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ type TemplateNodeType struct {
// +optional
DN TemplateNode `json:"dn,omitempty"`
// +optional
GMS TemplateNode `json:"gms,omitempty"`
GMS *TemplateNode `json:"gms,omitempty"`
}

type PolarDBXParameterTemplateSpec struct {
Expand Down
1 change: 0 additions & 1 deletion api/v1/systemtask/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion api/v1/xstore/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions api/v1/xstorebackup_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ type XStoreBackupStatus struct {
// Message includes human-readable message related to current status.
// +optional
Message string `json:"message,omitempty"`

// XStoreSpecSnapshot records the snapshot of xstore spec
// +optional
XStoreSpecSnapshot *XStoreSpec `json:"xstoreSpecSnapshot,omitempty"`
}

type XStoreBackupPhase string
Expand Down
18 changes: 14 additions & 4 deletions api/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 47 additions & 0 deletions build/images/backupset-importer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Copyright 2021 Alibaba Group Holding Limited.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# See the License for the specific language governing permissions and
# limitations under the License.

# Build the manager binary
ARG IMAGE_SOURCE
FROM ${IMAGE_SOURCE}${IMAGE_SOURCE:+"/"}golang:1.21.1 as builder

WORKDIR /workspace

# Copy the Go Modules manifests
COPY go.mod go.mod
COPY go.sum go.sum

# cache deps before building and copying source so that we don't need to re-download as much
# and so that source changes don't invalidate our downloaded layer
ENV GOPROXY=https://goproxy.cn,direct
RUN go mod download

# Copy the go source
ADD api api
ADD cmd cmd
ADD pkg pkg
ADD third-party third-party

# Build
RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -o backupset-importer cmd/backupset-importer/main.go

FROM ${IMAGE_SOURCE}${IMAGE_SOURCE:+"/"}busybox:latest
WORKDIR /
COPY --from=builder /workspace/backupset-importer .
USER root

ARG VERSION=test
RUN echo "$VERSION" > version

ENV GOMAXPROCS=1
ENTRYPOINT ["/backupset-importer"]
2 changes: 1 addition & 1 deletion build/images/xstore-tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -tags polardbx -o polardbx-


# Build the image with scripts
FROM ${IMAGE_SOURCE}${IMAGE_SOURCE:+"/"}xstore-tools-base:ts20240430102300
FROM ${IMAGE_SOURCE}${IMAGE_SOURCE:+"/"}xstore-tools-base:ts20240913161759

ARG VERSION=test

Expand Down
4 changes: 2 additions & 2 deletions build/root/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ $(LOCALBIN):
CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen

## Tool Versions
CONTROLLER_TOOLS_VERSION ?= v0.9.0
CONTROLLER_TOOLS_VERSION ?= v0.16.1

define ALL_HELP_INFO
# Build code.
Expand Down Expand Up @@ -193,7 +193,7 @@ e2e-test:
endif

.PHONY: manifests
manifests: download-controller-gen
manifests: controller-gen
$(CONTROLLER_GEN) crd:crdVersions=v1 rbac:roleName=manager-role webhook paths="./api/..." output:crd:artifacts:config=charts/polardbx-operator/crds

.PHONY: generate-notice
Expand Down
4 changes: 2 additions & 2 deletions charts/polardbx-logcollector/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: polardbx-logcollector
description: Helm chart of polardbx-operator logcollector plugin
type: application
version: 1.6.2
appVersion: v1.6.2
version: 1.7.0
appVersion: v1.7.0
keywords:
- polardb-x
- operator
Expand Down
4 changes: 2 additions & 2 deletions charts/polardbx-monitor/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: polardbx-monitor
description: Helm chart of polardbx-operator monitor plugin
type: application
version: 1.6.2
appVersion: v1.6.2
version: 1.7.0
appVersion: v1.7.0
keywords:
- polardb-x
- operator
Expand Down
4 changes: 2 additions & 2 deletions charts/polardbx-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: polardbx-operator
description: Helm chart of polardbx-operator
type: application
version: 1.6.2
appVersion: v1.6.2
version: 1.7.0
appVersion: v1.7.0
keywords:
- polardb-x
- operator
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.9.0
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.16.1
name: polardbxbackupbinlogs.polardbx.aliyun.com
spec:
group: polardbx.aliyun.com
Expand All @@ -26,14 +25,19 @@ spec:
openAPIV3Schema:
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
Expand Down
Loading

0 comments on commit 4405cb0

Please sign in to comment.