Skip to content

Commit f663c17

Browse files
pooknullpooknull
committed
Merge remote-tracking branch 'origin/main' into K8SPS-413
2 parents 741bc64 + a16b171 commit f663c17

File tree

81 files changed

+1277
-411
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+1277
-411
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ undeploy: manifests ## Undeploy operator
159159

160160
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
161161
controller-gen: ## Download controller-gen locally if necessary.
162-
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.3)
162+
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.18.0)
163163

164164
KUSTOMIZE = $(shell pwd)/bin/kustomize
165165
kustomize: ## Download kustomize locally if necessary.

‎api/v1alpha1/perconaservermysql_types.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,9 @@ type PodSpec struct {
201201
SchedulerName string `json:"schedulerName,omitempty"`
202202
RuntimeClassName *string `json:"runtimeClassName,omitempty"`
203203

204-
PodSecurityContext *corev1.PodSecurityContext `json:"podSecurityContext,omitempty"`
205-
ServiceAccountName string `json:"serviceAccountName,omitempty"`
204+
PodSecurityContext *corev1.PodSecurityContext `json:"podSecurityContext,omitempty"`
205+
ServiceAccountName string `json:"serviceAccountName,omitempty"`
206+
PodDisruptionBudget *PodDisruptionBudgetSpec `json:"podDisruptionBudget,omitempty"`
206207

207208
Configuration string `json:"configuration,omitempty"`
208209

‎api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/ps-pre-stop.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@ fi
88

99
LOG_FILE=/var/lib/mysql/pre-stop.log
1010
NAMESPACE=$(</var/run/secrets/kubernetes.io/serviceaccount/namespace)
11-
OPERATOR_PASSWORD=$(</etc/mysql/mysql-users-secret/operator)
11+
OPERATOR_PASSWORD=$(perl -MURI::Escape -e 'print uri_escape($ARGV[0]);' "$(</etc/mysql/mysql-users-secret/operator)")
1212
FQDN="${HOSTNAME}.${SERVICE_NAME}.${NAMESPACE}"
1313
POD_IP=$(hostname -I | awk '{print $1}')
1414

1515
echo "$(date +%Y-%m-%dT%H:%M:%S%Z): Removing ${FQDN} from cluster" >>${LOG_FILE}
16-
mysqlsh --js -i -h "${POD_IP}" -P 33062 -u operator -p"${OPERATOR_PASSWORD}" -e "dba.getCluster().removeInstance('${FQDN}:3306')" >>${LOG_FILE} 2>&1
16+
17+
mysqlsh --js -i \
18+
-h "${POD_IP}" -P 33062 \
19+
-u operator -p"${OPERATOR_PASSWORD}" \
20+
-e "dba.getCluster().removeInstance('${FQDN}:3306')" >>${LOG_FILE} 2>&1

‎cmd/bootstrap/group_replication.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,8 @@ func (m *mysqlsh) getURI() string {
5555
if err != nil {
5656
return ""
5757
}
58-
escapedPass := url.QueryEscape(operatorPass)
5958

60-
return fmt.Sprintf("%s:%s@%s", apiv1alpha1.UserOperator, escapedPass, m.host)
59+
return fmt.Sprintf("%s:%s@%s", apiv1alpha1.UserOperator, url.QueryEscape(operatorPass), m.host)
6160
}
6261

6362
func (m *mysqlsh) run(ctx context.Context, cmd string) (bytes.Buffer, bytes.Buffer, error) {

‎config/crd/bases/ps.percona.com_perconaservermysqls.yaml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,6 +1097,19 @@ spec:
10971097
additionalProperties:
10981098
type: string
10991099
type: object
1100+
podDisruptionBudget:
1101+
properties:
1102+
maxUnavailable:
1103+
anyOf:
1104+
- type: integer
1105+
- type: string
1106+
x-kubernetes-int-or-string: true
1107+
minAvailable:
1108+
anyOf:
1109+
- type: integer
1110+
- type: string
1111+
x-kubernetes-int-or-string: true
1112+
type: object
11001113
podSecurityContext:
11011114
properties:
11021115
appArmorProfile:
@@ -3550,6 +3563,19 @@ spec:
35503563
additionalProperties:
35513564
type: string
35523565
type: object
3566+
podDisruptionBudget:
3567+
properties:
3568+
maxUnavailable:
3569+
anyOf:
3570+
- type: integer
3571+
- type: string
3572+
x-kubernetes-int-or-string: true
3573+
minAvailable:
3574+
anyOf:
3575+
- type: integer
3576+
- type: string
3577+
x-kubernetes-int-or-string: true
3578+
type: object
35533579
podSecurityContext:
35543580
properties:
35553581
appArmorProfile:
@@ -6438,6 +6464,19 @@ spec:
64386464
additionalProperties:
64396465
type: string
64406466
type: object
6467+
podDisruptionBudget:
6468+
properties:
6469+
maxUnavailable:
6470+
anyOf:
6471+
- type: integer
6472+
- type: string
6473+
x-kubernetes-int-or-string: true
6474+
minAvailable:
6475+
anyOf:
6476+
- type: integer
6477+
- type: string
6478+
x-kubernetes-int-or-string: true
6479+
type: object
64416480
podSecurityContext:
64426481
properties:
64436482
appArmorProfile:
@@ -7887,6 +7926,19 @@ spec:
78877926
additionalProperties:
78887927
type: string
78897928
type: object
7929+
podDisruptionBudget:
7930+
properties:
7931+
maxUnavailable:
7932+
anyOf:
7933+
- type: integer
7934+
- type: string
7935+
x-kubernetes-int-or-string: true
7936+
minAvailable:
7937+
anyOf:
7938+
- type: integer
7939+
- type: string
7940+
x-kubernetes-int-or-string: true
7941+
type: object
78907942
podSecurityContext:
78917943
properties:
78927944
appArmorProfile:
@@ -9212,6 +9264,19 @@ spec:
92129264
additionalProperties:
92139265
type: string
92149266
type: object
9267+
podDisruptionBudget:
9268+
properties:
9269+
maxUnavailable:
9270+
anyOf:
9271+
- type: integer
9272+
- type: string
9273+
x-kubernetes-int-or-string: true
9274+
minAvailable:
9275+
anyOf:
9276+
- type: integer
9277+
- type: string
9278+
x-kubernetes-int-or-string: true
9279+
type: object
92159280
podSecurityContext:
92169281
properties:
92179282
appArmorProfile:

‎config/crd/patches/versionlabel_in_perconaserverformysql.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
name: perconaservermysqls.ps.percona.com
55
labels:
6-
app.kubernetes.io/version: v0.11.0
6+
app.kubernetes.io/version: v0.12.0
77
app.kubernetes.io/name: percona-server-crd
88
app.kubernetes.io/part-of: percona-server-mysql-operator
99
app.kubernetes.io/component: crd

‎config/crd/patches/versionlabel_in_perconaserverformysqlbackups.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
name: perconaservermysqlbackups.ps.percona.com
55
labels:
6-
app.kubernetes.io/version: v0.11.0
6+
app.kubernetes.io/version: v0.12.0
77
app.kubernetes.io/name: percona-server-crd
88
app.kubernetes.io/part-of: percona-server-mysql-operator
99
app.kubernetes.io/component: crd

‎config/crd/patches/versionlabel_in_perconaserverformysqlrestores.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
33
metadata:
44
name: perconaservermysqlrestores.ps.percona.com
55
labels:
6-
app.kubernetes.io/version: v0.11.0
6+
app.kubernetes.io/version: v0.12.0
77
app.kubernetes.io/name: percona-server-crd
88
app.kubernetes.io/part-of: percona-server-mysql-operator
99
app.kubernetes.io/component: crd

‎config/rbac/cluster/role.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,17 @@ rules:
9494
- list
9595
- patch
9696
- watch
97+
- apiGroups:
98+
- policy
99+
resources:
100+
- poddisruptionbudgets
101+
verbs:
102+
- create
103+
- get
104+
- list
105+
- patch
106+
- update
107+
- watch
97108
- apiGroups:
98109
- ps.percona.com
99110
resources:

0 commit comments

Comments
 (0)