Rename secretName with webhookSecretName in the .init.certGenerator

Signed-off-by: Yuki Iwai <yuki.iwai.tz@gmail.com>
kubeflow · Aug 3, 2023 · 7bcaa1a · 7bcaa1a
1 parent ce64c4d
commit 7bcaa1a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/pkg/apis/config/v1beta1/defaults.go b/pkg/apis/config/v1beta1/defaults.go
@@ -103,11 +103,11 @@ func setControllerConfig(controllerConfig *ControllerConfig) {
 }
 
 func setCertGeneratorConfig(certGeneratorConfig *CertGeneratorConfig) {
-	if len(certGeneratorConfig.ServiceName) != 0 || len(certGeneratorConfig.WebhookSecretName) != 0 {
+	if len(certGeneratorConfig.WebhookServiceName) != 0 || len(certGeneratorConfig.WebhookSecretName) != 0 {
 		certGeneratorConfig.Enable = true
 	}
-	if certGeneratorConfig.Enable && len(certGeneratorConfig.ServiceName) == 0 {
-		certGeneratorConfig.ServiceName = DefaultWebhookServiceName
+	if certGeneratorConfig.Enable && len(certGeneratorConfig.WebhookServiceName) == 0 {
+		certGeneratorConfig.WebhookServiceName = DefaultWebhookServiceName
 	}
 	if certGeneratorConfig.Enable && len(certGeneratorConfig.WebhookSecretName) == 0 {
 		certGeneratorConfig.WebhookSecretName = DefaultWebhookSecretName

diff --git a/pkg/apis/config/v1beta1/defaults_test.go b/pkg/apis/config/v1beta1/defaults_test.go
@@ -274,14 +274,14 @@ func TestSetCertGeneratorConfig(t *testing.T) {
 	}{
 		"All parameters correctly are specified": {
 			config: CertGeneratorConfig{
-				Enable:            true,
-				ServiceName:       "test",
-				WebhookSecretName: "katib-test",
+				Enable:             true,
+				WebhookServiceName: "test",
+				WebhookSecretName:  "katib-test",
 			},
 			wantConfig: CertGeneratorConfig{
-				Enable:            true,
-				ServiceName:       "test",
-				WebhookSecretName: "katib-test",
+				Enable:             true,
+				WebhookServiceName: "test",
+				WebhookSecretName:  "katib-test",
 			},
 		},
 		"CertGeneratorConfig is empty": {
@@ -293,9 +293,9 @@ func TestSetCertGeneratorConfig(t *testing.T) {
 				Enable: true,
 			},
 			wantConfig: CertGeneratorConfig{
-				Enable:            true,
-				ServiceName:       DefaultWebhookServiceName,
-				WebhookSecretName: DefaultWebhookSecretName,
+				Enable:             true,
+				WebhookServiceName: DefaultWebhookServiceName,
+				WebhookSecretName:  DefaultWebhookSecretName,
 			},
 		},
 	}

diff --git a/pkg/apis/config/v1beta1/types.go b/pkg/apis/config/v1beta1/types.go
@@ -87,10 +87,10 @@ type CertGeneratorConfig struct {
 	// Enable indicates the internal cert-generator is enabled.
 	// Defaults to 'false'.
 	Enable bool `json:"enable,omitempty"`
-	// ServiceName indicates which service is used for the admission webhook.
+	// WebhookServiceName indicates which service is used for the admission webhook.
 	// If it is set, the cert-generator forcefully is enabled even if the '.init.certGenerator.enable' is false.
 	// Defaults to 'katib-controller'.
-	ServiceName string `json:"serviceName,omitempty"`
+	WebhookServiceName string `json:"webhookServiceName,omitempty"`
 	// WebhookSecretName indicates which secrets is used to save the certs for the admission webhook.
 	// If it is set, the cert-generator forcefully is enabled even if the '.init.certGenerator.enable' is false.
 	// Defaults to 'katib-webhook-cert'.

diff --git a/pkg/cert-generator/v1beta1/generator.go b/pkg/cert-generator/v1beta1/generator.go
@@ -79,7 +79,7 @@ func (c *CertGenerator) NeedLeaderElection() bool {
 func AddToManager(mgr manager.Manager, config configv1beta1.CertGeneratorConfig, certsReady chan struct{}) error {
 	return mgr.Add(&CertGenerator{
 		namespace:   consts.DefaultKatibNamespace,
-		serviceName: config.ServiceName,
+		serviceName: config.WebhookServiceName,
 		secretName:  config.WebhookSecretName,
 		kubeClient:  mgr.GetClient(),
 		certsReady:  certsReady,

diff --git a/pkg/util/v1beta1/katibconfig/config_test.go b/pkg/util/v1beta1/katibconfig/config_test.go
@@ -387,7 +387,7 @@ kind: KatibConfig
 init:
   certGenerator:
     enable: true
-    serviceName: katib-test
+    webhookServiceName: katib-test
     webhookSecretName: katib-test-secret
   controller:
     experimentSuggestionName: test
@@ -440,9 +440,9 @@ runtime:
 			katibConfigFile: fullInitConfig,
 			wantInitConfigData: configv1beta1.InitConfig{
 				CertGeneratorConfig: configv1beta1.CertGeneratorConfig{
-					Enable:            true,
-					ServiceName:       "katib-test",
-					WebhookSecretName: "katib-test-secret",
+					Enable:             true,
+					WebhookServiceName: "katib-test",
+					WebhookSecretName:  "katib-test-secret",
 				},
 				ControllerConfig: configv1beta1.ControllerConfig{
 					ExperimentSuggestionName:    "test",