create a clusterpodconvention with a ytt template

Author: katmutua

pkg/apis/conventions/v1alpha1/clusterpodconvention_validation.go

@@ -79,7 +79,12 @@ func (s *ClusterPodConventionSpec) Validate() validation.FieldErrors {
 	} else {
 		// validate  via the ytt field as well
 		// return multiple errors for this to request a desired configuration
-		errs = errs.Also(s.Webhook.Validate().ViaField("webhook"))
+
+		// only invoke webhook validations if the ytt configuration is not being used
+		if s.Ytt == nil && s.Webhook != nil {
+			errs = errs.Also(s.Webhook.Validate().ViaField("webhook"))
+		}
+		// errs = errs.Also(s.Ytt.Validate().ViaField("ytt"))
 	}
 
 	if s.SelectorTarget != PodTemplateSpecLabels && s.SelectorTarget != PodIntentLabels {
@@ -88,10 +93,17 @@ func (s *ClusterPodConventionSpec) Validate() validation.FieldErrors {
 				`Accepted selector target values are "PodIntent" and "PodTemplateSpec". The default value is set to "PodTemplateSpec"`),
 		})
 	}
-
 	return errs
 }
 
+// func (s *ClusterPodConventionYttTemplate) Validate() validation.FieldErrors {
+// 	errs := validation.FieldErrors{}
+// 	if s.Template == "" {
+// 		errs = errs.Also(validation.ErrMissingField("template"))
+// 	}
+// 	return errs
+// }
+
 func (s *ClusterPodConventionWebhook) Validate() validation.FieldErrors {
 	errs := validation.FieldErrors{}
 

pkg/binding/convention.go

@@ -34,6 +34,7 @@ type Convention struct {
 	Selectors      []metav1.LabelSelector
 	Priority       conventionsv1alpha1.PriorityLevel
 	ClientConfig   admissionregistrationv1.WebhookClientConfig
+	YTTTemplate    conventionsv1alpha1.ClusterPodConventionYttTemplate
 }
 
 func (o *Convention) Apply(ctx context.Context, conventionRequest *webhookv1alpha1.PodConventionContext, wc WebhookConfig) (*webhookv1alpha1.PodConventionContext, error) {

pkg/binding/conventions.go

@@ -84,15 +84,12 @@ func (c *Conventions) Sort() Conventions {
 	return originalConventions
 }
 
-func (c *Conventions) Apply(ctx context.Context,
-	parent *conventionsv1alpha1.PodIntent,
-	wc WebhookConfig,
-	rc RegistryConfig,
-) (*corev1.PodTemplateSpec, error) {
+func (c *Conventions) Apply(ctx context.Context, parent *conventionsv1alpha1.PodIntent, wc WebhookConfig, rc RegistryConfig) (*corev1.PodTemplateSpec, error) {
 	log := logr.FromContextOrDiscard(ctx)
 	if parent == nil {
 		return nil, fmt.Errorf("pod intent is not set")
 	}
+	// extract the pod template spec
 	workload := parent.Spec.Template.AsPodTemplateSpec()
 	appliedConventions := []string{}
 	if str := workload.Annotations[conventionsv1alpha1.AppliedConventionsAnnotationKey]; str != "" {
@@ -105,6 +102,7 @@ func (c *Conventions) Apply(ctx context.Context,
 			log.Error(err, "fetching metadata for Images failed")
 			return nil, fmt.Errorf("fetching metadata for Images failed: %v", err)
 		}
+
 		conventionRequestObj := &webhookv1alpha1.PodConventionContext{
 			ObjectMeta: metav1.ObjectMeta{
 				Name: fmt.Sprintf("%s-%s", parent.GetName(), convention.Name),

pkg/controllers/podintent_reconciler.go

@@ -98,7 +98,6 @@ func ResolveConventions() reconcilers.SubReconciler {
 		Name: "ResolveConventions",
 		Sync: func(ctx context.Context, parent *conventionsv1alpha1.PodIntent) error {
 			log := logr.FromContextOrDiscard(ctx)
-			log.Info("HERE FIRST =========")
 			c := reconcilers.RetrieveConfigOrDie(ctx)
 			sources := &conventionsv1alpha1.ClusterPodConventionList{}
 			if err := c.List(ctx, sources); err != nil {
@@ -109,11 +108,15 @@ func ResolveConventions() reconcilers.SubReconciler {
 			for i := range sources.Items {
 				source := sources.Items[i].DeepCopy()
 				source.Default()
+
 				convention := binding.Convention{
 					Name:      source.Name,
 					Selectors: source.Spec.Selectors,
 					Priority:  source.Spec.Priority,
 				}
+
+				log.Info("created convention ... ", convention)
+
 				if source.Spec.Webhook != nil {
 					clientConfig := source.Spec.Webhook.ClientConfig.DeepCopy()
 					if source.Spec.Webhook.Certificate != nil {
@@ -128,6 +131,7 @@ func ResolveConventions() reconcilers.SubReconciler {
 					}
 					convention.ClientConfig = *clientConfig
 				} else if source.Spec.Ytt != nil {
+					log.Info("handling a ytt based convention")
 					// read template spec and convenert to a sptream of bytes
 					// template
 					template := &parent.Spec.Template