@@ -35,22 +35,23 @@ import (
35
35
36
36
const (
37
37
// envPrefix = "pg"
38
- metricsAddrSvcMgrFlg = "metrics-addr-svc-mgr"
39
- metricsAddrCtrlMgrFlg = "metrics-addr-ctrl-mgr"
40
- enableLeaderElectionFlg = "enable-leader-election"
41
- partitionIDFlg = "partition-id"
42
- tenantFlg = "tenant"
43
- ctrlPlaneKubeConfifgFlg = "controlplane-kubeconfig"
44
- loadBalancerIPFlg = "load-balancer-ip"
45
- portRangeStartFlg = "port-range-start"
46
- portRangeSizeFlg = "port-range-size"
47
- customPSPNameFlg = "custom-psp-name"
48
- storageClassFlg = "storage-class"
49
- postgresImageFlg = "postgres-image"
50
- etcdHostFlg = "etcd-host"
51
- crdValidationFlg = "enable-crd-validation"
52
- operatorImageFlg = "operator-image"
53
- pgParamBlockListFlg = "postgres-param-blocklist"
38
+ metricsAddrSvcMgrFlg = "metrics-addr-svc-mgr"
39
+ metricsAddrCtrlMgrFlg = "metrics-addr-ctrl-mgr"
40
+ enableLeaderElectionFlg = "enable-leader-election"
41
+ partitionIDFlg = "partition-id"
42
+ tenantFlg = "tenant"
43
+ ctrlPlaneKubeConfifgFlg = "controlplane-kubeconfig"
44
+ loadBalancerIPFlg = "load-balancer-ip"
45
+ portRangeStartFlg = "port-range-start"
46
+ portRangeSizeFlg = "port-range-size"
47
+ customPSPNameFlg = "custom-psp-name"
48
+ storageClassFlg = "storage-class"
49
+ postgresImageFlg = "postgres-image"
50
+ etcdHostFlg = "etcd-host"
51
+ crdValidationFlg = "enable-crd-validation"
52
+ operatorImageFlg = "operator-image"
53
+ pgParamBlockListFlg = "postgres-param-blocklist"
54
+ majorVersionUpgradeModeFlg = "major-version-upgrade-mode"
54
55
)
55
56
56
57
var (
@@ -69,7 +70,7 @@ func init() {
69
70
}
70
71
71
72
func main () {
72
- var metricsAddrCtrlMgr , metricsAddrSvcMgr , partitionID , tenant , ctrlClusterKubeconfig , pspName , lbIP , storageClass , postgresImage , etcdHost , operatorImage string
73
+ var metricsAddrCtrlMgr , metricsAddrSvcMgr , partitionID , tenant , ctrlClusterKubeconfig , pspName , lbIP , storageClass , postgresImage , etcdHost , operatorImage , majorVersionUpgradeMode string
73
74
var enableLeaderElection , enableCRDValidation bool
74
75
var portRangeStart , portRangeSize int
75
76
var pgParamBlockList map [string ]bool
@@ -133,6 +134,9 @@ func main() {
133
134
pgParamBlockList [blockedParam ] = true
134
135
}
135
136
137
+ viper .SetDefault (majorVersionUpgradeModeFlg , "manual" )
138
+ majorVersionUpgradeMode = viper .GetString (majorVersionUpgradeModeFlg )
139
+
136
140
ctrl .SetLogger (zap .New (zap .UseDevMode (true )))
137
141
138
142
ctrl .Log .Info ("flag" ,
@@ -152,6 +156,7 @@ func main() {
152
156
etcdHostFlg , etcdHost ,
153
157
crdValidationFlg , enableCRDValidation ,
154
158
pgParamBlockListFlg , pgParamBlockList ,
159
+ majorVersionUpgradeModeFlg , majorVersionUpgradeMode ,
155
160
)
156
161
157
162
svcClusterConf := ctrl .GetConfigOrDie ()
@@ -185,11 +190,12 @@ func main() {
185
190
}
186
191
187
192
var opMgrOpts operatormanager.Options = operatormanager.Options {
188
- PspName : pspName ,
189
- OperatorImage : operatorImage ,
190
- DockerImage : postgresImage ,
191
- EtcdHost : etcdHost ,
192
- CRDValidation : enableCRDValidation ,
193
+ PspName : pspName ,
194
+ OperatorImage : operatorImage ,
195
+ DockerImage : postgresImage ,
196
+ EtcdHost : etcdHost ,
197
+ CRDValidation : enableCRDValidation ,
198
+ MajorVersionUpgradeMode : majorVersionUpgradeMode ,
193
199
}
194
200
opMgr , err := operatormanager .New (svcClusterConf , "external/svc-postgres-operator.yaml" , scheme , ctrl .Log .WithName ("OperatorManager" ), opMgrOpts )
195
201
if err != nil {
0 commit comments