While at it, also rename the deprecated enable_crd_validation param

Author: eberlep

main.go

@@ -58,7 +58,7 @@ const (
 	storageClassFlg                        = "storage-class"
 	postgresImageFlg                       = "postgres-image"
 	etcdHostFlg                            = "etcd-host"
-	crdValidationFlg                       = "enable-crd-validation"
+	crdRegistrationFlg                     = "enable-crd-registration"
 	operatorImageFlg                       = "operator-image"
 	pgParamBlockListFlg                    = "postgres-param-blocklist" // nolint
 	majorVersionUpgradeModeFlg             = "major-version-upgrade-mode"
@@ -136,7 +136,7 @@ func main() {
 		tlsSubDomain            string
 
 		enableLeaderElection                bool
-		enableCRDValidation                 bool
+		enableCRDRegistration               bool
 		enableNetPol                        bool
 		enablePodAntiaffinity               bool
 		enableStandbyLeaderSelector         bool
@@ -214,8 +214,8 @@ func main() {
 
 	etcdHost = viper.GetString(etcdHostFlg)
 
-	viper.SetDefault(crdValidationFlg, true)
-	enableCRDValidation = viper.GetBool(crdValidationFlg)
+	viper.SetDefault(crdRegistrationFlg, true)
+	enableCRDRegistration = viper.GetBool(crdRegistrationFlg)
 
 	// read the (space-separated) list of configured blocked params
 	blockedPgParams := viper.GetStringSlice(pgParamBlockListFlg)
@@ -330,7 +330,7 @@ func main() {
 		operatorImageFlg, operatorImage,
 		postgresImageFlg, postgresImage,
 		etcdHostFlg, etcdHost,
-		crdValidationFlg, enableCRDValidation,
+		crdRegistrationFlg, enableCRDRegistration,
 		pgParamBlockListFlg, pgParamBlockList,
 		majorVersionUpgradeModeFlg, majorVersionUpgradeMode,
 		standbyClustersSourceRangesFlg, standbyClusterSourceRanges,
@@ -424,7 +424,7 @@ func main() {
 		OperatorImage:           operatorImage,
 		DockerImage:             postgresImage,
 		EtcdHost:                etcdHost,
-		CRDValidation:           enableCRDValidation,
+		CRDRegistration:         enableCRDRegistration,
 		MajorVersionUpgradeMode: majorVersionUpgradeMode,
 		PostgresletNamespace:    postgresletNamespace,
 		SidecarsConfigMapName:   sidecarsCMName,

pkg/operatormanager/operatormanager.go

@@ -63,7 +63,7 @@ type Options struct {
 	OperatorImage           string
 	DockerImage             string
 	EtcdHost                string
-	CRDValidation           bool
+	CRDRegistration         bool
 	MajorVersionUpgradeMode string
 	PostgresletNamespace    string
 	SidecarsConfigMapName   string
@@ -425,7 +425,7 @@ func (m *OperatorManager) editConfigMap(cm *corev1.ConfigMap, namespace string,
 		cm.Data["etcd_host"] = options.EtcdHost
 	}
 
-	cm.Data["enable_crd_validation"] = strconv.FormatBool(options.CRDValidation)
+	cm.Data["enable_crd_registration"] = strconv.FormatBool(options.CRDRegistration)
 	cm.Data["major_version_upgrade_mode"] = options.MajorVersionUpgradeMode
 
 	// we specifically refer to those two users in the cloud-api, so we hardcode them here as well to be on the safe side.