feat: update crd, format crd, fix annotation and debug

Signed-off-by: will <[email protected]>

Author: wcrum

config/crd/bases/imageshift.dev_imageshifts.yaml

@@ -89,6 +89,79 @@ spec:
             type: object
           status:
             description: ImageshiftStatus defines the observed state of Imageshift.
+            properties:
+              conditions:
+                description: Conditions represent the latest available observations
+                  of the Imageshift's state
+                items:
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
+                  properties:
+                    lastTransitionTime:
+                      description: |-
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                      format: date-time
+                      type: string
+                    message:
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This may be an empty string.
+                      maxLength: 32768
+                      type: string
+                    observedGeneration:
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
+                      format: int64
+                      minimum: 0
+                      type: integer
+                    reason:
+                      description: |-
+                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        Producers of specific condition types may define expected values and meanings for this field,
+                        and whether the values are considered a guaranteed API.
+                        The value should be a CamelCase string.
+                        This field may not be empty.
+                      maxLength: 1024
+                      minLength: 1
+                      pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                      type: string
+                    status:
+                      description: status of the condition, one of True, False, Unknown.
+                      enum:
+                      - "True"
+                      - "False"
+                      - Unknown
+                      type: string
+                    type:
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
+                      maxLength: 316
+                      pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                      type: string
+                  required:
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
+                  type: object
+                type: array
+              configValid:
+                description: ConfigValid indicates whether the current configuration
+                  is valid
+                type: boolean
+              lastReconciled:
+                description: LastReconciled is the timestamp of the last successful
+                  reconciliation
+                format: date-time
+                type: string
+              mutatedPodCount:
+                description: MutatedPodCount tracks the number of pods that have been
+                  mutated
+                format: int64
+                type: integer
             type: object
         type: object
     served: true

config/rbac/role.yaml

@@ -17,10 +17,10 @@ rules:
   resources:
   - pods
   verbs:
+  - delete
   - get
   - list
   - watch
-  - delete
 - apiGroups:
   - imageshift.dev
   resources:

internal/webhook/v1/pod_webhook.go

@@ -133,11 +133,12 @@ func (d *PodCustomDefaulter) Default(ctx context.Context, pod *corev1.Pod) error
 				hasChanged = true
 
 				annotation := fmt.Sprintf("%s.container.imageshift.dev/original", pod.Spec.Containers[i].Name)
-				pod.Annotations[annotation] = pod.Spec.Containers[i].Image
+				originalImage := pod.Spec.Containers[i].Image
+				pod.Annotations[annotation] = originalImage
 
 				pod.Spec.Containers[i].Image = img
 
-				podlog.Info("Patched Container", "pod", container.Name, "reference", img)
+				podlog.Info("Patched Container", "container", container.Name, "reference", img, "originalImage", originalImage, "annotationKey", annotation)
 			}
 		}
 	} else {

pkg/swap/swap.go

@@ -42,20 +42,32 @@ func getCompiledRegex(expression string) (*regexp.Regexp, error) {
 	return re, nil
 }
 
+// normalizeRegistry returns the canonical registry name using go-containerregistry
+func normalizeRegistry(registry string) string {
+	// Parse a dummy image with the registry to get the canonical form
+	ref, err := name.ParseReference(registry + "/dummy:latest")
+	if err != nil {
+		return registry
+	}
+	return ref.Context().RegistryStr()
+}
+
 func SwapImage(config imageshiftv1.Imageshift, image string) string {
 	ref, _ := name.ParseReference(image, name.WithDefaultRegistry(config.Spec.Default))
 
 	registry := ref.Context().RegistryStr()
+	normalizedDefault := normalizeRegistry(config.Spec.Default)
 
 	// if registry == default registry return image
 	var newImage string
 
-	if registry == config.Spec.Default {
+	if registry == normalizedDefault {
 		newImage = ref.Name()
 	}
 
 	for _, swap := range config.Spec.Mappings.Swap {
-		if swap.Registry == registry {
+		normalizedSwapRegistry := normalizeRegistry(swap.Registry)
+		if normalizedSwapRegistry == registry {
 			identifier := ref.Identifier()
 			switch len(strings.Split(identifier, ":")) {
 			case 1: