Update webhook configuration naming

Signed-off-by: Per Goncalves da Silva <[email protected]>

Author: Per Goncalves da Silva

internal/operator-controller/rukpak/render/generators/generators_test.go

@@ -1547,8 +1547,8 @@ func Test_BundleValidatingWebhookResourceGenerator_Succeeds(t *testing.T) {
 						APIVersion: admissionregistrationv1.SchemeGroupVersion.String(),
 					},
 					ObjectMeta: metav1.ObjectMeta{
-						GenerateName: "my-webhook-",
-						Namespace:    "install-namespace",
+						Name:      "my-webhook",
+						Namespace: "install-namespace",
 					},
 					Webhooks: []admissionregistrationv1.ValidatingWebhook{
 						{
@@ -1616,8 +1616,8 @@ func Test_BundleValidatingWebhookResourceGenerator_Succeeds(t *testing.T) {
 						APIVersion: admissionregistrationv1.SchemeGroupVersion.String(),
 					},
 					ObjectMeta: metav1.ObjectMeta{
-						GenerateName: "my-webhook-",
-						Namespace:    "install-namespace",
+						Name:      "my-webhook",
+						Namespace: "install-namespace",
 						Annotations: map[string]string{
 							"cert-provider": "annotation",
 						},
@@ -1719,8 +1719,8 @@ func Test_BundleMutatingWebhookResourceGenerator_Succeeds(t *testing.T) {
 						APIVersion: admissionregistrationv1.SchemeGroupVersion.String(),
 					},
 					ObjectMeta: metav1.ObjectMeta{
-						GenerateName: "my-webhook-",
-						Namespace:    "install-namespace",
+						Name:      "my-webhook",
+						Namespace: "install-namespace",
 					},
 					Webhooks: []admissionregistrationv1.MutatingWebhook{
 						{
@@ -1789,8 +1789,8 @@ func Test_BundleMutatingWebhookResourceGenerator_Succeeds(t *testing.T) {
 						APIVersion: admissionregistrationv1.SchemeGroupVersion.String(),
 					},
 					ObjectMeta: metav1.ObjectMeta{
-						GenerateName: "my-webhook-",
-						Namespace:    "install-namespace",
+						Name:      "my-webhook",
+						Namespace: "install-namespace",
 						Annotations: map[string]string{
 							"cert-provider": "annotation",
 						},

internal/operator-controller/rukpak/render/generators/resources.go

@@ -1,8 +1,6 @@
 package generators
 
 import (
-	"fmt"
-
 	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -217,36 +215,41 @@ func CreateDeploymentResource(name string, namespace string, opts ...ResourceCre
 	).(*appsv1.Deployment)
 }
 
-func CreateValidatingWebhookConfigurationResource(generateName string, namespace string, opts ...ResourceCreatorOption) *admissionregistrationv1.ValidatingWebhookConfiguration {
+// CreateValidatingWebhookConfigurationResource creates a ValidatingWebhookConfiguration resource with name 'name',
+// namespace 'namespace', and applying any ValidatingWebhookConfiguration related options in opts
+func CreateValidatingWebhookConfigurationResource(name string, namespace string, opts ...ResourceCreatorOption) *admissionregistrationv1.ValidatingWebhookConfiguration {
 	return ResourceCreatorOptions(opts).ApplyTo(
 		&admissionregistrationv1.ValidatingWebhookConfiguration{
 			TypeMeta: metav1.TypeMeta{
 				Kind:       "ValidatingWebhookConfiguration",
 				APIVersion: admissionregistrationv1.SchemeGroupVersion.String(),
 			},
 			ObjectMeta: metav1.ObjectMeta{
-				GenerateName: fmt.Sprintf("%s-", generateName),
-				Namespace:    namespace,
+				Name:      name,
+				Namespace: namespace,
 			},
 		},
 	).(*admissionregistrationv1.ValidatingWebhookConfiguration)
 }
 
-func CreateMutatingWebhookConfigurationResource(generateName string, namespace string, opts ...ResourceCreatorOption) *admissionregistrationv1.MutatingWebhookConfiguration {
+// CreateMutatingWebhookConfigurationResource creates a MutatingWebhookConfiguration resource with name 'name',
+// namespace 'namespace', and applying any MutatingWebhookConfiguration related options in opts
+func CreateMutatingWebhookConfigurationResource(name string, namespace string, opts ...ResourceCreatorOption) *admissionregistrationv1.MutatingWebhookConfiguration {
 	return ResourceCreatorOptions(opts).ApplyTo(
 		&admissionregistrationv1.MutatingWebhookConfiguration{
 			TypeMeta: metav1.TypeMeta{
 				Kind:       "MutatingWebhookConfiguration",
 				APIVersion: admissionregistrationv1.SchemeGroupVersion.String(),
 			},
 			ObjectMeta: metav1.ObjectMeta{
-				GenerateName: fmt.Sprintf("%s-", generateName),
-				Namespace:    namespace,
+				Name:      name,
+				Namespace: namespace,
 			},
 		},
 	).(*admissionregistrationv1.MutatingWebhookConfiguration)
 }
 
+// CreateServiceResource creates a Service resource with name 'name', namespace 'namespace', and applying any Service related options in opts
 func CreateServiceResource(name string, namespace string, opts ...ResourceCreatorOption) *corev1.Service {
 	return ResourceCreatorOptions(opts).ApplyTo(&corev1.Service{
 		TypeMeta: metav1.TypeMeta{

internal/operator-controller/rukpak/render/generators/resources_test.go

@@ -85,14 +85,14 @@ func Test_CreateService(t *testing.T) {
 func Test_CreateValidatingWebhookConfiguration(t *testing.T) {
 	wh := generators.CreateValidatingWebhookConfigurationResource("my-validating-webhook-configuration", "my-namespace")
 	require.NotNil(t, wh)
-	require.Equal(t, "my-validating-webhook-configuration-", wh.GenerateName)
+	require.Equal(t, "my-validating-webhook-configuration", wh.Name)
 	require.Equal(t, "my-namespace", wh.Namespace)
 }
 
 func Test_CreateMutatingWebhookConfiguration(t *testing.T) {
 	wh := generators.CreateMutatingWebhookConfigurationResource("my-mutating-webhook-configuration", "my-namespace")
 	require.NotNil(t, wh)
-	require.Equal(t, "my-mutating-webhook-configuration-", wh.GenerateName)
+	require.Equal(t, "my-mutating-webhook-configuration", wh.Name)
 	require.Equal(t, "my-namespace", wh.Namespace)
 }