update codegen

Signed-off-by: Karol Szwaj <[email protected]>

On-behalf-of: @SAP [email protected]

Author: cnvergence

deploy/crd/kcp.io/syncagent.kcp.io_publishedresources.yaml

@@ -407,6 +407,9 @@ spec:
                               type: object
                             type: array
                         type: object
+                      optional:
+                        description: Optional indicates whether the related resource must be referenced.
+                        type: boolean
                       origin:
                         description: '"service" or "kcp"'
                         type: string

hack/update-codegen-crds.sh

@@ -28,8 +28,13 @@ reconcileHelpers=internal/resources/reconciling/zz_generated_reconcile.go
 go run k8c.io/reconciler/cmd/reconciler-gen --config hack/reconciling.yaml > $reconcileHelpers
 
 currentYear=$(date +%Y)
-$sed -i "s/Copyright YEAR/Copyright $currentYear/g" $reconcileHelpers
-$sed -i "s/Copyright © YEAR/Copyright © $currentYear/g" $reconcileHelpers
+if [[ "$sed" == "gsed" ]]; then
+  $sed -i "s/Copyright YEAR/Copyright $currentYear/g" $reconcileHelpers
+  $sed -i "s/Copyright © YEAR/Copyright © $currentYear/g" $reconcileHelpers
+else
+  $sed -i "" "s/Copyright YEAR/Copyright $currentYear/g" $reconcileHelpers
+  $sed -i "" "s/Copyright © YEAR/Copyright © $currentYear/g" $reconcileHelpers
+fi
 
 CRD_DIR=deploy/crd
 KCP_CRD_DIR="$CRD_DIR/kcp.io"

internal/sync/syncer_related.go

@@ -72,23 +72,28 @@ func (s *ResourceSyncer) processRelatedResource(log *zap.SugaredLogger, stateSto
 		dest = local
 	}
 
+	// to find the source related object, we first need to determine its name/namespace
 	sourceKey, err := resolveResourceReference(source.object, relRes.Reference)
 	if err != nil {
 		return false, fmt.Errorf("failed to determine related object's source key: %w", err)
 	}
 
+	// find the source related object
 	sourceObj := &unstructured.Unstructured{}
-	sourceObj.SetAPIVersion("v1")
+	sourceObj.SetAPIVersion("v1") // we only support ConfigMaps and Secrets, both are in core/v1
 	sourceObj.SetKind(relRes.Kind)
 
 	err = source.client.Get(source.ctx, *sourceKey, sourceObj)
 	if err != nil {
 		if apierrors.IsNotFound(err) {
+			// the source object doesn't exist yet, so we can just stop
 			return false, nil
 		}
+
 		return false, fmt.Errorf("failed to get source object: %w", err)
 	}
 
+	// do the same to find the destination object
 	destKey, err := resolveResourceReference(dest.object, relRes.Reference)
 	if err != nil {
 		return false, fmt.Errorf("failed to determine related object's destination key: %w", err)
@@ -237,8 +242,10 @@ func resolveResourceLocator(jsonData string, loc syncagentv1alpha1.ResourceLocat
 		if err != nil {
 			return "", fmt.Errorf("invalid pattern %q: %w", re.Pattern, err)
 		}
+		// this does apply some coalescing, like turning numbers into strings
+		strVal := gval.String()
 
-		return expr.ReplaceAllString(gval.String(), re.Replacement), nil
+		return expr.ReplaceAllString(strVal, re.Replacement), nil
 	}
 
 	return gval.String(), nil