major refactor

Author: PatrickLaabs

Dockerfile

@@ -72,20 +72,27 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
 FROM ${deployment_base_image}:${deployment_base_image_tag}
 
 # Set shell with pipefail option for better error handling
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+SHELL ["/bin/sh", "-o", "pipefail", "-c"]
 
 # Install Node.js and cdk8s-cli directly
 # hadolint ignore=DL3015
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends ca-certificates=20240203~22.04.1 curl=7.81.0-1ubuntu1.20 && \
-    curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
-    apt-get install -y nodejs=18.19.1-1nodesource1 && \
-    npm install -g [email protected] && \
-    curl -fsSL -o go1.24.4.linux-amd64.tar.gz https://go.dev/dl/go1.24.4.linux-amd64.tar.gz && \
-    tar -C /usr/local -xzf go1.24.4.linux-amd64.tar.gz && \
-    rm go1.24.4.linux-amd64.tar.gz && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+#RUN apt-get update && \
+#    apt-get install -y --no-install-recommends ca-certificates=20240203~22.04.1 curl=7.81.0-1ubuntu1.20 && \
+#    curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
+#    apt-get install -y nodejs=18.19.1-1nodesource1 && \
+#    npm install -g [email protected] && \
+#    curl -fsSL -o go1.24.4.linux-amd64.tar.gz https://go.dev/dl/go1.24.4.linux-amd64.tar.gz && \
+#    tar -C /usr/local -xzf go1.24.4.linux-amd64.tar.gz && \
+#    rm go1.24.4.linux-amd64.tar.gz && \
+#    apt-get clean && \
+#    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+RUN apk add --no-cache ca-certificates curl nodejs npm \
+    && npm install -g [email protected] \
+    && curl -fsSL -o go1.24.4.linux-amd64.tar.gz https://go.dev/dl/go1.24.4.linux-amd64.tar.gz \
+    && tar -C /usr/local -xzf go1.24.4.linux-amd64.tar.gz \
+    && rm go1.24.4.linux-amd64.tar.gz \
+    && rm -rf /tmp/*
 
 # Set Go environment variables
 ENV PATH=$PATH:/usr/local/go/bin
@@ -95,7 +102,7 @@ WORKDIR /
 COPY --from=builder /workspace/manager .
 
 # Create non-root user
-RUN useradd --uid 65532 --create-home --shell /bin/bash nonroot
+RUN adduser -u 65532 -D -h /home/nonroot -s /bin/sh nonroot
 
 # Switch back to non-root user (this line should already exist)
 # USER root # This was part of the removed direct install, ensure it's not re-added here unless needed for COPY permissions

Makefile

@@ -45,8 +45,8 @@ export GO111MODULE=on
 # Base docker images
 
 DOCKERFILE_CONTAINER_IMAGE ?= docker.io/docker/dockerfile:1.4
-DEPLOYMENT_BASE_IMAGE ?= ubuntu
-DEPLOYMENT_BASE_IMAGE_TAG ?= 22.04
+DEPLOYMENT_BASE_IMAGE ?= alpine
+DEPLOYMENT_BASE_IMAGE_TAG ?= 3.20
 BUILD_CONTAINER_ADDITIONAL_ARGS ?=
 
 #
@@ -231,11 +231,10 @@ CAPI_KIND_CLUSTER_NAME ?= capi-test
 # It is set by Prow GIT_TAG, a git-based tag of the form vYYYYMMDD-hash, e.g., v20210120-v0.3.10-308-gc61521971
 
 # Next release is: v0.3.2
-TAG ?= v0.3.2-preview.28
+TAG ?= v0.3.2-preview.39
 ARCH ?= $(shell go env GOARCH)
 ALL_ARCH = amd64 arm arm64
 
-
 # Allow overriding manifest generation destination directory
 MANIFEST_ROOT ?= config
 CRD_ROOT ?= $(MANIFEST_ROOT)/crd/bases

README.md

@@ -50,24 +50,9 @@ spec:
     reference: "main"
     referencePollInterval: '5'
     path: "examples/cdk8s-sample-deployment"
-    # authSecretRef:
-    #   name: git-credentials
   clusterSelector: {}
           # matchLabels:
   # environment: development
-# ---
-# apiVersion: v1
-# kind: Secret
-# metadata:
-#   name: git-credentials
-#   namespace: default
-# type: Opaque
-# data:
-#   # Base64 encoded username
-#   username: <base64-encoded-username>
-#   # Base64 encoded password/token
-#   password: <base64-encoded-password-or-token>
-
 ```
 
 ### Cdk8sAppProxySpec Fields

api/v1alpha1/cdk8sappproxy_types.go

@@ -17,7 +17,6 @@ limitations under the License.
 package v1alpha1
 
 import (
-	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 )
@@ -41,12 +40,6 @@ type GitRepositorySpec struct {
 	// Defaults to the root of the repository.
 	// +kubebuilder:validation:Required
 	Path string `json:"path"`
-
-	// AuthSecretRef is a reference to a Secret in the same namespace
-	// containing authentication credentials for the Git repository.
-	// The secret must contain 'username' and 'password' fields.
-	// +kubebuilder:validation:Optional
-	AuthSecretRef *corev1.LocalObjectReference `json:"authSecretRef,omitempty"`
 }
 
 // Cdk8sAppProxySpec defines the desired state of Cdk8sAppProxy.

api/v1alpha1/condition_consts.go

@@ -22,12 +22,20 @@ import clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 const (
 	// DeploymentProgressingCondition indicates that the cdk8s application deployment is progressing.
 	DeploymentProgressingCondition clusterv1.ConditionType = "DeploymentProgressing"
-	// GitCloneFailedReason indicates that git clone operation failed.
-	GitCloneFailedReason = "GitCloneFailed"
-	// GitCheckoutFailedReason indicates that git checkout operation failed.
-	GitCheckoutFailedReason = "GitCheckoutFailed"
-	// SourceNotSpecifiedReason indicates that no source (GitRepository) was specified.
-	SourceNotSpecifiedReason = "SourceNotSpecified"
+	// GitCloneSuccessCondition indicates that the git clone operation was successful.
+	GitCloneSuccessCondition = "GitCloneSuccess"
+	// GitCloneFailedCondition indicates that git clone operation failed.
+	GitCloneFailedCondition = "GitCloneFailed"
+	// ValidGitRepositoryReason indicates that the given repository is valid.
+	ValidGitRepositoryReason = "ValidGitRepository"
+	// InvalidGitRepositoryReason indicates that the given repository is invalid.
+	InvalidGitRepositoryReason = "InvalidGitRepository"
+	// EmptyGitRepositoryReason indicates that no repository has been defined.
+	EmptyGitRepositoryReason = "EmptyGitRepository"
+	// GitHashSuccessReason indicates that the current commit hash was retrievable.
+	GitHashSuccessReason = "GitHashSuccess"
+	// GitHashFailureReason indicates that the current commit hash was not retrievable.
+	GitHashFailureReason     = "GitHashFailure"
 	GitOperationFailedReason = "GitOperationFailed"
 	// Cdk8sSynthFailedReason indicates that cdk8s synth operation failed.
 	Cdk8sSynthFailedReason = "Cdk8sSynthFailed"
@@ -53,8 +61,6 @@ const (
 	KubeconfigUnavailableReason = "KubeconfigUnavailable"
 	// ResourceApplyFailedReason indicates that applying a resource to a target cluster failed.
 	ResourceApplyFailedReason = "ResourceApplyFailed"
-	// GitAuthSecretInvalidReason indicates that the specified Git authentication Secret is invalid or missing required fields.
-	GitAuthSecretInvalidReason string = "GitAuthSecretInvalid"
 	// GitAuthenticationFailedReason indicates that Git authentication failed (e.g., bad credentials).
 	GitAuthenticationFailedReason string = "GitAuthenticationFailed"
 )

api/v1alpha1/zz_generated.deepcopy.go

@@ -103,23 +103,6 @@ spec:
                 description: GitRepository specifies the Git repository for the cdk8s
                   app.
                 properties:
-                  authSecretRef:
-                    description: |-
-                      AuthSecretRef is a reference to a Secret in the same namespace
-                      containing authentication credentials for the Git repository.
-                      The secret must contain 'username' and 'password' fields.
-                    properties:
-                      name:
-                        default: ""
-                        description: |-
-                          Name of the referent.
-                          This field is effectively required, but due to backwards compatibility is
-                          allowed to be empty. Instances of this type with an empty value here are
-                          almost certainly wrong.
-                          More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                        type: string
-                    type: object
-                    x-kubernetes-map-type: atomic
                   path:
                     description: |-
                       Path is the path within the repository where the cdk8s application is located.

config/crd/bases/addons.cluster.x-k8s.io_cdk8sappproxies.yaml

@@ -7,5 +7,5 @@ spec:
   template:
     spec:
       containers:
-      - image: ghcr.io/patricklaabs/cluster-api-addon-provider-cdk8s/cluster-api-cdk8s-controller:v0.3.2-preview.28
+      - image: ghcr.io/patricklaabs/cluster-api-addon-provider-cdk8s/cluster-api-cdk8s-controller:v0.3.2-preview.39
         name: manager

config/default/manager_image_patch.yaml

@@ -7,5 +7,5 @@ spec:
   template:
     spec:
       containers:
-      - image: ghcr.io/patricklaabs/cluster-api-addon-provider-cdk8s/cluster-api-cdk8s-controller:v0.3.2-preview.28
+      - image: ghcr.io/patricklaabs/cluster-api-addon-provider-cdk8s/cluster-api-cdk8s-controller:v0.3.2-preview.39
         name: manager