Skip to content

Commit 3f83c9b

Browse files
nmarukovichnmarukovich
committed
rename variable
1 parent 24ef3df commit 3f83c9b

File tree

11 files changed

+19
-19
lines changed

11 files changed

+19
-19
lines changed

‎build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13422,8 +13422,6 @@ spec:
1342213422
pmm:
1342313423
description: The specification of PMM sidecars.
1342413424
properties:
13425-
clusterName:
13426-
type: string
1342713425
containerSecurityContext:
1342813426
description: |-
1342913427
SecurityContext holds security configuration that will be applied to a container.
@@ -13619,6 +13617,8 @@ spec:
1361913617
type: string
1362013618
type: object
1362113619
type: object
13620+
customClusterName:
13621+
type: string
1362213622
enabled:
1362313623
type: boolean
1362413624
image:

‎config/crd/bases/pgv2.percona.com_perconapgclusters.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13827,8 +13827,6 @@ spec:
1382713827
pmm:
1382813828
description: The specification of PMM sidecars.
1382913829
properties:
13830-
clusterName:
13831-
type: string
1383213830
containerSecurityContext:
1383313831
description: |-
1383413832
SecurityContext holds security configuration that will be applied to a container.
@@ -14024,6 +14022,8 @@ spec:
1402414022
type: string
1402514023
type: object
1402614024
type: object
14025+
customClusterName:
14026+
type: string
1402714027
enabled:
1402814028
type: boolean
1402914029
image:

‎deploy/bundle.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14120,8 +14120,6 @@ spec:
1412014120
pmm:
1412114121
description: The specification of PMM sidecars.
1412214122
properties:
14123-
clusterName:
14124-
type: string
1412514123
containerSecurityContext:
1412614124
description: |-
1412714125
SecurityContext holds security configuration that will be applied to a container.
@@ -14317,6 +14315,8 @@ spec:
1431714315
type: string
1431814316
type: object
1431914317
type: object
14318+
customClusterName:
14319+
type: string
1432014320
enabled:
1432114321
type: boolean
1432214322
image:

‎deploy/cr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ spec:
471471
# imagePullPolicy: IfNotPresent
472472
secret: cluster1-pmm-secret
473473
serverHost: monitoring-service
474-
# clusterName: "<string>"
474+
# customClusterName: "<string>"
475475
# querySource: pgstatmonitor
476476
# patroni:
477477
# # Some values of the Liveness/Readiness probes of the patroni container are calculated using syncPeriodSeconds by the following formulas:

‎deploy/crd.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14120,8 +14120,6 @@ spec:
1412014120
pmm:
1412114121
description: The specification of PMM sidecars.
1412214122
properties:
14123-
clusterName:
14124-
type: string
1412514123
containerSecurityContext:
1412614124
description: |-
1412714125
SecurityContext holds security configuration that will be applied to a container.
@@ -14317,6 +14315,8 @@ spec:
1431714315
type: string
1431814316
type: object
1431914317
type: object
14318+
customClusterName:
14319+
type: string
1432014320
enabled:
1432114321
type: boolean
1432214322
image:

‎deploy/cw-bundle.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14120,8 +14120,6 @@ spec:
1412014120
pmm:
1412114121
description: The specification of PMM sidecars.
1412214122
properties:
14123-
clusterName:
14124-
type: string
1412514123
containerSecurityContext:
1412614124
description: |-
1412714125
SecurityContext holds security configuration that will be applied to a container.
@@ -14317,6 +14315,8 @@ spec:
1431714315
type: string
1431814316
type: object
1431914317
type: object
14318+
customClusterName:
14319+
type: string
1432014320
enabled:
1432114321
type: boolean
1432214322
image:

‎e2e-tests/functions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ get_cr() {
182182
.spec.proxy.pgBouncer.image = "'$IMAGE_PGBOUNCER'" |
183183
.spec.pmm.image = "'$IMAGE_PMM_CLIENT'" |
184184
.spec.pmm.secret = "'${cr_name}'-pmm-secret" |
185-
.spec.pmm.clusterName = "'${cr_name}'-pmm-custom-name"
185+
.spec.pmm.customClusterName = "'${cr_name}'-pmm-custom-name"
186186
' $DEPLOY_DIR/cr.yaml >$TEMP_DIR/cr.yaml
187187

188188
if [[ $OPENSHIFT ]]; then

‎e2e-tests/tests/monitoring-pmm3/03-assert.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ spec:
3939
enabled: true
4040
secret: monitoring-pmm3-pmm-secret
4141
serverHost: monitoring-service
42-
clusterName: monitoring-pmm3-pmm-custom-name
42+
customClusterName: monitoring-pmm3-pmm-custom-name
4343
port: 5432
4444
proxy:
4545
pgBouncer:

‎e2e-tests/tests/monitoring/03-assert.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ spec:
3939
enabled: true
4040
secret: monitoring-pmm-secret
4141
serverHost: monitoring-service
42-
clusterName: monitoring-pmm-custom-name
42+
customClusterName: monitoring-pmm-custom-name
4343
port: 5432
4444
proxy:
4545
pgBouncer:

‎percona/pmm/pmm.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ func sidecarContainerV2(pgc *v2.PerconaPGCluster) corev1.Container {
235235

236236
if pgc.CompareVersion("2.7.0") >= 0 {
237237
clusterName := pgc.Name
238-
if pgc.Spec.PMM.ClusterName != "" {
239-
clusterName = pgc.Spec.PMM.ClusterName
238+
if pgc.Spec.PMM.CustomClusterName != "" {
239+
clusterName = pgc.Spec.PMM.CustomClusterName
240240
}
241241
container.Env = append(container.Env, corev1.EnvVar{
242242
Name: "CLUSTER_NAME",
@@ -430,8 +430,8 @@ func sidecarContainerV3(pgc *v2.PerconaPGCluster) corev1.Container {
430430

431431
if pgc.CompareVersion("2.7.0") >= 0 {
432432
clusterName := pgc.Name
433-
if pgc.Spec.PMM.ClusterName != "" {
434-
clusterName = pgc.Spec.PMM.ClusterName
433+
if pgc.Spec.PMM.CustomClusterName != "" {
434+
clusterName = pgc.Spec.PMM.CustomClusterName
435435
}
436436
container.Env = append(container.Env, corev1.EnvVar{
437437
Name: "CLUSTER_NAME",

0 commit comments

Comments
 (0)