tweak workload image and update pod reconciler go file

Author: katmutua

cleanup.sh

@@ -3,25 +3,50 @@ set -euo pipefail
 # make sure to regenerate manifests and run tests 
 make all
 
+# delete existing workload
+if [[ -n $( kubectl get podintent.conventions.carto.run/spring-sample -n my-apps) ]]; then
+    kubectl delete -f samples/ytt-based-conventions/workload.yaml 
+fi 
+
 # delete any existing convention and deployment
-kubectl delete -f samples/ytt-based-conventions/ytt-example.yaml
-kapp delete -a conventions -n cartographer-system 
-
-# create a new deployment 
-kapp deploy -n cartographer-system -a conventions -f  <( \
-  ko resolve -f <( \
-    ytt \
-      -f dist/cartographer-conventions.yaml
-    ) \
-)
-
-# create the ytt based convention 
-kubectl apply -f samples/ytt-based-conventions/ytt-example.yaml
-#kubectl delete -f samples/ytt-based-conventions/ytt-example.yaml
-
-# inspect the ytt based convention
-kubectl get clusterpodconvention.conventions.carto.run/spring-ytt-sample -o yaml
-
-# create a workload 
-kubectl apply -f samples/ytt-based-conventions/workload.yaml
-#kubectl delete -f samples/ytt-based-conventions/workload.yaml
+if [[ -n $(kubectl get clusterpodconvention.conventions.carto.run/spring-ytt-sample) ]]; then
+  kubectl delete -f samples/ytt-based-conventions/ytt-example.yaml
+fi 
+
+# delete convention deployent if it exists 
+if [[ -n $( kapp list -n cartographer-system  | grep 'conventions') ]]; then
+  kapp delete -a conventions -n cartographer-system -y 
+fi 
+
+
+if [[ -n $(kubectl get secret image-pull-secret -n my-apps) ]]; then 
+# delete existing secret 
+  kubectl delete secret image-pull-secret -n my-apps 
+else 
+ # create secret  with credentials
+  kubectl create secret docker-registry image-pull-secret \
+          --docker-server='dev.registry.tanzu.vmware.com' \
+          --docker-username='robot$tap-integrations+ytt-feature-test' \
+          --docker-password="qMkLheVd3EwrRzUesdCjBDFZAhkD5Jzf" \
+          -n my-apps
+
+  fi 
+
+# make a new deployment 
+# kapp deploy -n cartographer-system -a conventions -f  <( \
+# ko resolve -f <( \
+#       ytt \
+#         -f dist/cartographer-conventions.yaml
+#       ) \
+#   )
+
+# # create the ytt based convention 
+# kubectl apply -f samples/ytt-based-conventions/ytt-example.yaml
+# #kubectl delete -f samples/ytt-based-conventions/ytt-example.yaml
+
+# # inspect the ytt based convention
+# kubectl get clusterpodconvention.conventions.carto.run/spring-ytt-sample -o yaml
+
+# # create a workload 
+# kubectl apply -f samples/ytt-based-conventions/workload.yaml
+# #kubectl delete -f samples/ytt-based-conventions/workload.yaml

pkg/apis/conventions/v1alpha1/clusterpodconvention_defaults.go

@@ -36,6 +36,7 @@ func (s *ClusterPodConventionSpec) Default() {
 	}
 
 	// only set this default if ytt is not the current configuration
+	// ensure that  we only set the default if ytt is not set
 	if s.Webhook != nil && s.Ytt == nil {
 		s.Webhook.Default()
 	}

pkg/apis/conventions/v1alpha1/clusterpodconvention_validation.go

@@ -74,14 +74,19 @@ func (s *ClusterPodConventionSpec) Validate() validation.FieldErrors {
 
 	// The Webhook and Ytt configurations are nutually exclusive
 	// return error if neither is provided
+	//
 	if s.Webhook == nil && s.Ytt == nil {
 		errs = errs.Also(validation.ErrMissingField("webhook")).Also(validation.ErrMissingField("ytt"))
 
 	} else {
 		// only invoke webhook specific validations if the ytt configuration is not being used
-		if s.Ytt == nil && s.Webhook != nil {
+		if s.Webhook != nil {
+			// this if check ensures we do not get `webhook configuration must have either service`
 			errs = errs.Also(s.Webhook.Validate().ViaField("webhook"))
 		}
+		// if s.Ytt != nil {
+		// 	errs = errs.Also(s.Ytt.ValidateYtt().ViaField("ytt"))
+		// }
 	}
 
 	if s.SelectorTarget != PodTemplateSpecLabels && s.SelectorTarget != PodIntentLabels {
@@ -95,6 +100,7 @@ func (s *ClusterPodConventionSpec) Validate() validation.FieldErrors {
 
 func (s *ClusterPodConventionYttTemplate) ValidateYtt() validation.FieldErrors {
 	errs := validation.FieldErrors{}
+
 	if s.Template == "" {
 		errs = errs.Also(validation.ErrMissingField("template"))
 	}

pkg/controllers/podintent_reconciler.go

@@ -124,7 +124,10 @@ func ResolveConventions() reconcilers.SubReconciler {
 
 				log.Info("created convention ... ", convention)
 
+				// assuming the validation of the convention ensures that we handle these in a
+				// mutually exclusive fashion
 				if source.Spec.Webhook != nil {
+					log.Info("handling a webhook based convetion", source.Spec.Webhook)
 					clientConfig := source.Spec.Webhook.ClientConfig.DeepCopy()
 					if source.Spec.Webhook.Certificate != nil {
 						caBundle, err := getCABundle(ctx, c, source.Spec.Webhook.Certificate, parent)
@@ -138,15 +141,23 @@ func ResolveConventions() reconcilers.SubReconciler {
 					}
 					convention.ClientConfig = *clientConfig
 				} else if source.Spec.Ytt != nil {
-					log.Info("handling a ytt based convention")
-					log.Info("retrieved pod template spec from the workload", parent)
+					log.Info("handling a ytt based convention", "ytt convention", source.Spec.Ytt)
+					log.Info("retrieved pod template spec from the workload", "templatespec", parent.Spec.Template.AsPodTemplateSpec())
+
+					ExecCall(ctx)
+
+					// get package bianry dir
+					// path, err := os.Executable()
+					// if err != nil {
+					// 	log.Info(" current working directory", "path", path)
+					// }
+					// fmt.Println(path)
 
 					// stampedObj, err := ApplyYtt(ctx, *parent)
 					// if err != nil {
 					// 	return nil
 					// }
 					// log.Info("stamped out object", stampedObj)
-					ExecCall()
 				}
 				conventions = append(conventions, convention)
 			}
@@ -164,23 +175,19 @@ func ResolveConventions() reconcilers.SubReconciler {
 	}
 }
 
-func ExecCall() {
-	app := "echo"
+func ExecCall(ctx context.Context) {
+	app := "kubectl"
+	// log := logr.FromContextOrDiscard(ctx)
 
-	arg0 := "-e"
-	arg1 := "Hello world"
-	arg2 := "\n\tfrom"
-	arg3 := "golang"
-
-	cmd := exec.Command(app, arg0, arg1, arg2, arg3)
+	args := []string{"--version"}
+	cmd := exec.CommandContext(ctx, app, args...)
 	stdout, err := cmd.Output()
 
 	if err != nil {
 		fmt.Println(err.Error())
 		return
 	}
 	fmt.Println(string(stdout))
-
 }
 
 func ApplyYtt(ctx context.Context, workload conventionsv1alpha1.PodIntent) (interface{}, error) {
@@ -198,16 +205,6 @@ func ApplyYtt(ctx context.Context, workload conventionsv1alpha1.PodIntent) (inte
 		ytt = path.Join(kodata, fmt.Sprintf("ytt-%s-%s", runtime.GOOS, runtime.GOARCH))
 	}
 
-	// toolsBinDir := filepath.Join(projectRootDir, constants.ToolsBinDirPath)
-	// ytt_command := exec.Command(
-	// 	filepath.Join(toolsBinDir, "ytt"),
-	// 	"-f-",
-	// 	"-f", packageHelpersLibFile,
-	// 	"-f", packageValuesFile,
-	// 	"-v", "packageRepository="+packageRepository,
-	// 	"-v", "registry="+registry,
-	// ) //
-
 	args := []string{"--version"}
 	stdin := bytes.NewReader([]byte(template.Spec.String()))
 	stdout := bytes.NewBuffer([]byte{})

samples/ytt-based-conventions/ytt-example.yaml renamed to samples/ytt-based-conventions/server.yaml

@@ -3,9 +3,12 @@ apiVersion: conventions.carto.run/v1alpha1
 kind: PodIntent
 metadata:
   name: spring-sample
+  namespace: my-apps
 spec:
   template:
     spec:
       containers:
       - name: workload
-        image: scothis/petclinic:sbom-20211210@sha256:8b517f21f283229e855e316e2753396239884eb9c4009ab6c797bdf2a041140f
+        image: dev.registry.tanzu.vmware.com/tap-integrations/spring-pet-clinic@sha256:ba58ba2e2c8cdbad9eaf2aa5b4cba1bb324808326bfa708c34c7208c5a9e7df0
+      imagePullSecrets:
+      - name: image-pull-secret