Use the same member names between CertGenerator and KatibConfig

Signed-off-by: Yuki Iwai <[email protected]>

Author: tenzen-y

pkg/certgenerator/v1beta1/generator.go

@@ -50,11 +50,11 @@ var (
 
 // CertGenerator is the manager to generate certs.
 type CertGenerator struct {
-	namespace   string
-	serviceName string
-	secretName  string
-	kubeClient  client.Client
-	certsReady  chan struct{}
+	namespace          string
+	webhookServiceName string
+	webhookSecretName  string
+	kubeClient         client.Client
+	certsReady         chan struct{}
 
 	certs             *certificates
 	fullServiceDomain string
@@ -79,18 +79,18 @@ func (c *CertGenerator) NeedLeaderElection() bool {
 // AddToManager adds the cert-generator to the manager.
 func AddToManager(mgr manager.Manager, config configv1beta1.CertGeneratorConfig, certsReady chan struct{}) error {
 	return mgr.Add(&CertGenerator{
-		namespace:   consts.DefaultKatibNamespace,
-		serviceName: config.WebhookServiceName,
-		secretName:  config.WebhookSecretName,
-		kubeClient:  mgr.GetClient(),
-		certsReady:  certsReady,
+		namespace:          consts.DefaultKatibNamespace,
+		webhookServiceName: config.WebhookServiceName,
+		webhookSecretName:  config.WebhookSecretName,
+		kubeClient:         mgr.GetClient(),
+		certsReady:         certsReady,
 	})
 }
 
 // generate generates certificates for the admission webhooks.
 func (c *CertGenerator) generate(ctx context.Context) error {
 	controllerService := &corev1.Service{}
-	if err := c.kubeClient.Get(ctx, client.ObjectKey{Name: c.serviceName, Namespace: c.namespace}, controllerService); err != nil {
+	if err := c.kubeClient.Get(ctx, client.ObjectKey{Name: c.webhookServiceName, Namespace: c.namespace}, controllerService); err != nil {
 		return fmt.Errorf("%w: %v", errServiceNotFound, err)
 	}
 
@@ -99,7 +99,7 @@ func (c *CertGenerator) generate(ctx context.Context) error {
 		return fmt.Errorf("%w: %v", errCertCheckFail, err)
 	}
 	if !certExist {
-		c.fullServiceDomain = strings.Join([]string{c.serviceName, c.namespace, "svc"}, ".")
+		c.fullServiceDomain = strings.Join([]string{c.webhookServiceName, c.namespace, "svc"}, ".")
 
 		if err = c.createCert(); err != nil {
 			return fmt.Errorf("%w: %v", errCreateCertFail, err)
@@ -119,7 +119,7 @@ func (c *CertGenerator) generate(ctx context.Context) error {
 // since another controller pod will create the secret.
 func (c *CertGenerator) isCertExist(ctx context.Context) (bool, error) {
 	secret := &corev1.Secret{}
-	if err := c.kubeClient.Get(ctx, client.ObjectKey{Name: c.secretName, Namespace: c.namespace}, secret); err != nil {
+	if err := c.kubeClient.Get(ctx, client.ObjectKey{Name: c.webhookSecretName, Namespace: c.namespace}, secret); err != nil {
 		return false, err
 	}
 	key := secret.Data[serverKeyName]
@@ -170,7 +170,7 @@ func (c *CertGenerator) createCert() error {
 // updateCertSecret updates Secret embedded tls.key and tls.crt.
 func (c *CertGenerator) updateCertSecret(ctx context.Context) error {
 	secret := &corev1.Secret{}
-	if err := c.kubeClient.Get(ctx, client.ObjectKey{Name: c.secretName, Namespace: c.namespace}, secret); err != nil {
+	if err := c.kubeClient.Get(ctx, client.ObjectKey{Name: c.webhookSecretName, Namespace: c.namespace}, secret); err != nil {
 		return err
 	}
 	newSecret := &corev1.Secret{

pkg/certgenerator/v1beta1/generator_test.go

@@ -98,9 +98,9 @@ func TestGenerate(t *testing.T) {
 	}{
 		"Generate successfully": {
 			opts: &CertGenerator{
-				namespace:   testNamespace,
-				serviceName: "katib-controller",
-				secretName:  "katib-test-secret",
+				namespace:          testNamespace,
+				webhookServiceName: "katib-controller",
+				webhookSecretName:  "katib-test-secret",
 			},
 			objects: []client.Object{
 				emptyVWebhookConfig,
@@ -111,9 +111,9 @@ func TestGenerate(t *testing.T) {
 		},
 		"There is not ValidatingWebhookConfiguration": {
 			opts: &CertGenerator{
-				namespace:   testNamespace,
-				serviceName: "katib-controller",
-				secretName:  "katib-test-secret",
+				namespace:          testNamespace,
+				webhookServiceName: "katib-controller",
+				webhookSecretName:  "katib-test-secret",
 			},
 			objects: []client.Object{
 				emptyMWebhookConfig,
@@ -124,9 +124,9 @@ func TestGenerate(t *testing.T) {
 		},
 		"There is not MutatingWebhookConfiguration": {
 			opts: &CertGenerator{
-				namespace:   testNamespace,
-				serviceName: "katib-controller",
-				secretName:  "katib-test-secret",
+				namespace:          testNamespace,
+				webhookServiceName: "katib-controller",
+				webhookSecretName:  "katib-test-secret",
 			},
 			objects: []client.Object{
 				emptyVWebhookConfig,
@@ -137,9 +137,9 @@ func TestGenerate(t *testing.T) {
 		},
 		"There is not Service katib-controller": {
 			opts: &CertGenerator{
-				namespace:   testNamespace,
-				serviceName: "katib-controller",
-				secretName:  "katib-test-secret",
+				namespace:          testNamespace,
+				webhookServiceName: "katib-controller",
+				webhookSecretName:  "katib-test-secret",
 			},
 			objects: []client.Object{
 				emptyVWebhookConfig,
@@ -150,9 +150,9 @@ func TestGenerate(t *testing.T) {
 		},
 		"There is not Secret katib-webhook-cert": {
 			opts: &CertGenerator{
-				namespace:   testNamespace,
-				serviceName: "katib-controller",
-				secretName:  "katib-test-secret",
+				namespace:          testNamespace,
+				webhookServiceName: "katib-controller",
+				webhookSecretName:  "katib-test-secret",
 			},
 			objects: []client.Object{
 				emptyVWebhookConfig,
@@ -173,7 +173,7 @@ func TestGenerate(t *testing.T) {
 
 			if tc.wantError == nil {
 				secret := &corev1.Secret{}
-				if err = kc.Get(context.Background(), client.ObjectKey{Name: tc.opts.secretName, Namespace: testNamespace}, secret); err != nil {
+				if err = kc.Get(context.Background(), client.ObjectKey{Name: tc.opts.webhookSecretName, Namespace: testNamespace}, secret); err != nil {
 					t.Fatalf("Failed to get a webhookSecret: %v", err)
 				}
 				if len(secret.Data[serverKeyName]) == 0 {