Bump capi and vcluster

.custom-gcl.yml

@@ -0,0 +1,7 @@
+# This has to be >= v1.57.0 for module plugin system support.
+version: v1.61.0
+plugins:
+  - module: "sigs.k8s.io/logtools"
+    import: "sigs.k8s.io/logtools/logcheck/gclplugin"
+    version: v0.9.0
+

.github/workflows/e2e.yaml

@@ -113,7 +113,7 @@ jobs:
         run: |
           export CLUSTER_NAME=vcluster-k3s
           export CLUSTER_NAMESPACE=vcluster-k3s
-          export CHART_VERSION=0.20.0
+          export CHART_VERSION=0.21.0
           export VCLUSTER_YAML=$(cat ./test/e2e/k3s-values.yaml | sed -z 's/\n/\\n/g')
           kubectl create namespace ${CLUSTER_NAMESPACE}
           cat templates/cluster-template.yaml | ./bin/envsubst | kubectl apply -n ${CLUSTER_NAMESPACE} -f -
@@ -129,7 +129,7 @@ jobs:
         run: |
           export CLUSTER_NAME=vcluster-k0s
           export CLUSTER_NAMESPACE=vcluster-k0s
-          export CHART_VERSION=0.20.0
+          export CHART_VERSION=0.21.0
           export CHART_NAME=vcluster
           export VCLUSTER_YAML=$(cat ./test/e2e/k0s-values.yaml | sed -z 's/\n/\\n/g')
           kubectl create namespace ${CLUSTER_NAMESPACE}
@@ -146,7 +146,7 @@ jobs:
         run: |
           export CLUSTER_NAME=vcluster-k8s
           export CLUSTER_NAMESPACE=vcluster-k8s
-          export CHART_VERSION=0.20.0
+          export CHART_VERSION=0.21.0
           export CHART_NAME=vcluster
           export VCLUSTER_YAML=$(cat ./test/e2e/k8s-values.yaml | sed -z 's/\n/\\n/g')
           kubectl create namespace ${CLUSTER_NAMESPACE}

.github/workflows/golangci-lint.yaml

@@ -27,15 +27,11 @@ jobs:
           go-version-file: "go.mod"
           cache: false
 
-      - name: Build logcheck plugin
-        run: go build -o "tools/logcheck.so" -mod=vendor -buildmode=plugin sigs.k8s.io/logtools/logcheck/plugin
-        env:
-          GOWORK: off
+      - name: Install golangci-lint
+        run: go install github.com/golangci/golangci-lint/cmd/[email protected]
 
-      - name: Build golangci-lint
-        run: go build -o "tools/golangci-lint" -mod=vendor ./vendor/github.com/golangci/golangci-lint/cmd/golangci-lint
+      - name: Build custom golangci-lint
+        run: golangci-lint custom
 
       - name: Run golangci-lint
-        run: tools/golangci-lint run --out-format=github-actions ./...
-        env:
-          LOGCHECK_CONFIG: hack/logcheck.conf
+        run: ./custom-gcl run

.gitignore

@@ -35,3 +35,4 @@ devvalues.yaml
 kubeconfig.yaml
 
 /tools
+custom-gcl

.golangci.yaml

@@ -7,6 +7,7 @@ linters:
     - asasalint
     - asciicheck
     - bidichk
+    - copyloopvar
     - decorder
     - dupl
     - durationcheck
@@ -15,7 +16,6 @@ linters:
     - errname
     - errorlint
     - exhaustive
-    - exportloopref
     - ginkgolinter
     - gocheckcompilerdirectives
     - gocritic
@@ -57,7 +57,7 @@ linters:
 linters-settings:
   custom:
     logcheck:
-      path: tools/logcheck.so
+      type: "module"
       description: structured logging checker
       original-url: sigs.k8s.io/logtools/logcheck
 

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.22 as builder
+FROM golang:1.23 as builder
 
 ARG TARGETOS
 ARG TARGETARCH

README.md

@@ -8,7 +8,7 @@ This is a [Cluster API](https://cluster-api.sigs.k8s.io/introduction.html) provi
 # Installation instructions
 
 Prerequisites:
-- [clusterctl](https://cluster-api.sigs.k8s.io/user/quick-start.html#install-clusterctl) (v1.7.4+)
+- [clusterctl](https://cluster-api.sigs.k8s.io/user/quick-start.html#install-clusterctl) (v1.7.8+)
 - [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/)
 - A Kubernetes cluster where you will have cluster-admin permissions
 - Optional, depending on how you expose the vcluster instance - [vcluster CLI](https://www.vcluster.com/docs/getting-started/setup)
@@ -111,7 +111,7 @@ spec:
       #
       # Please refer to the vcluster Releases page for the list of the available versions:
       # https://github.com/loft-sh/vcluster/releases
-      version: ${CHART_VERSION:=0.20.0}
+      version: ${CHART_VERSION:=0.21.0}
 
   # controlPlaneEndpoint represents the endpoint used to communicate with the control plane.
   # You may leave this field empty, and then CAPVC will try to fill in this information based
@@ -165,7 +165,7 @@ In the example commands below, the VCLUSTER_YAML variable will be populated with
 ```shell
 export CLUSTER_NAME=test
 export CLUSTER_NAMESPACE=test
-export CHART_VERSION=0.20.0
+export CHART_VERSION=0.21.0
 export CHART_NAME=vcluster
 export VCLUSTER_YAML=$(cat devvalues.yaml | awk '{printf "%s\\n", $0}')
 kubectl create namespace ${CLUSTER_NAMESPACE}
@@ -187,7 +187,7 @@ You can specify a custom version of the vCluster Helm chart by setting the CHART
 Example:
 
 ```shell
-export CHART_VERSION=0.20.0
+export CHART_VERSION=0.21.0
 ```
 
 ## Specifying custom values for virtual clusters

docs/quick-start.md

@@ -3,7 +3,7 @@ In this guide we will deploy Nginx in a kind cluster and verify connectivity wit
 
 ## Prerequisites
 Ensure that you have the following installed:
-- [clusterctl](https://cluster-api.sigs.k8s.io/user/quick-start.html#install-clusterctl) v1.7.4 or greater
+- [clusterctl](https://cluster-api.sigs.k8s.io/user/quick-start.html#install-clusterctl) v1.7.8 or greater
 - [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/)
 - [kind](https://kind.sigs.k8s.io/)
 - [vcluster CLI](https://www.vcluster.com/docs/getting-started/setup)