cleanup

Author: PatrickLaabs

Dockerfile

@@ -80,7 +80,7 @@ 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].99 && \
+    npm install -g [email protected].108 && \
     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 && \

Makefile

@@ -231,7 +231,7 @@ 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.21
+TAG ?= v0.3.2-preview.22
 ARCH ?= $(shell go env GOARCH)
 ALL_ARCH = amd64 arm arm64
 

api/v1alpha1/cdk8sappproxy_types.go

@@ -32,7 +32,8 @@ type GitRepositorySpec struct {
 	// +kubebuilder:validation:Required
 	Reference string `json:"reference"`
 
-	// ReferencePollInterval
+	// ReferencePollInterval polls the defined git repository for changes.
+	// Defaults to 5 min.
 	// +kubebuilder:validation:optional
 	ReferencePollInterval *metav1.Duration `json:"referencePollInterval,omitempty"`
 

api/v1alpha1/cdk8sappproxy_webook.go

@@ -2,6 +2,8 @@ package v1alpha1
 
 import (
 	"fmt"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"time"
 
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -33,6 +35,12 @@ func (c *Cdk8sAppProxy) Default() {
 		c.Spec.GitRepository.Reference = "main"
 	}
 
+	if c.Spec.GitRepository != nil && c.Spec.GitRepository.ReferencePollInterval == nil {
+		c.Spec.GitRepository.ReferencePollInterval = &metav1.Duration{
+			Duration: 5 * time.Minute,
+		}
+	}
+
 	// Set the default path if not specified
 	if c.Spec.GitRepository != nil && c.Spec.GitRepository.Path == "" {
 		c.Spec.GitRepository.Path = "."

api/v1alpha1/zz_generated.deepcopy.go

@@ -128,6 +128,11 @@ spec:
                   reference:
                     description: Reference is the git reference (branch, tag, or commit).
                     type: string
+                  referencePollInterval:
+                    description: |-
+                      ReferencePollInterval polls the defined git repository for changes.
+                      Defaults to 5 min.
+                    type: string
                   url:
                     description: URL is the git repository URL.
                     type: string

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

@@ -1,7 +1,5 @@
 package cdk8sappproxy
 
-import "time"
-
 // Finalizer is the finalizer used by the cdk8sappproxy controller.
 const (
 	Finalizer = "cdk8sappproxy.addons.cluster.x-k8s.io/finalizer"
@@ -17,10 +15,3 @@ const (
 	OperationApply      = "apply"
 	OperationNpmInstall = "npmInstall"
 )
-
-// gitPollInterval is the interval at which the cdk8sappproxy controller polls the git repository for changes.
-const (
-	gitPollInterval      = 1 * time.Minute
-	consecutiveErrors    = 0
-	maxConsecutiveErrors = 5
-)

controllers/cdk8sappproxy/cdk8sappproxy_consts.go

@@ -96,11 +96,27 @@ func (r *Reconciler) cloneGitRepository(ctx context.Context, cdk8sAppProxy *addo
 	return nil
 }
 
+func getPollInterval(c *addonsv1alpha1.Cdk8sAppProxy) time.Duration {
+	if c.Spec.GitRepository != nil && c.Spec.GitRepository.ReferencePollInterval != nil {
+		return c.Spec.GitRepository.ReferencePollInterval.Duration
+	}
+	return 5 * time.Minute // default
+}
+
 // pollGitRepository periodically checks the remote git repository for changes.
 func (r *Reconciler) pollGitRepository(ctx context.Context, proxyName types.NamespacedName) {
 	logger := log.FromContext(ctx).WithValues("cdk8sappproxy", proxyName.String(), "goroutine", "pollGitRepository")
 
-	ticker := time.NewTicker(gitPollInterval)
+	cdk8sAppProxy := &addonsv1alpha1.Cdk8sAppProxy{}
+	err := r.Get(ctx, proxyName, cdk8sAppProxy)
+	if err != nil {
+		logger.Error(err, "Failed to get cdk8sAppProxy")
+
+		return
+	}
+	pollInterval := getPollInterval(cdk8sAppProxy)
+
+	ticker := time.NewTicker(pollInterval)
 	defer ticker.Stop()
 
 	for {

controllers/cdk8sappproxy/cdk8sappproxy_git_operator.go

@@ -7,6 +7,7 @@ spec:
   gitRepository:
     url: "https://github.com/PatrickLaabs/cluster-api-addon-provider-cdk8s"
     reference: "main"
+    referencePollInterval: '5'
     path: "examples/cdk8s-sample-deployment"
     # authSecretRef:
     #   name: git-credentials

examples/cdk8sappproxy_sample-go.yaml

@@ -1,13 +1,14 @@
 apiVersion: addons.cluster.x-k8s.io/v1alpha1
 kind: Cdk8sAppProxy
 metadata:
-  name: cdk8s-sample-app-go
+  name: cdk8s-sample-app-typescript
   namespace: default
 spec:
   gitRepository:
     url: "https://github.com/PatrickLaabs/cluster-api-addon-provider-cdk8s"
     reference: "main"
-    path: "examples/cdk8s-sample-deployment"
+    referencePollInterval: '5'
+    path: "examples/cdk8s-sample-deployment-typescript"
     # authSecretRef:
     #   name: git-credentials
   clusterSelector: {}