feat: support CAPI v1alpha4

This PR will add all of the changes necessary for supporting CAPI
v1alpha4 resources.

Signed-off-by: Spencer Smith <[email protected]>
Co-authored-by: Andrey Smirnov <[email protected]>
Signed-off-by: Andrey Smirnov <[email protected]>

Author: rsmitty

.drone.yml

@@ -132,7 +132,7 @@ steps:
         - sha512
       draft: true
       files:
-        - _out/*
+        - _out/bootstrap-talos/*/*
       note: _out/RELEASE_NOTES.md
     when:
       event:
@@ -176,6 +176,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: 523acbd6b6e92b11249b0515fe28ef34dc1c3c926826e84ce9a1de3412a6a65e
+hmac: a7d3d09b2ec221337f14cde8f5f2a872a4c3500df09b7f27e6a169a4eb35944b
 
 ...

Dockerfile

@@ -71,12 +71,13 @@ ARG TAG
 RUN cd config/manager \
   && kustomize edit set image controller=${REGISTRY_AND_USERNAME}/${NAME}:${TAG} \
   && cd - \
-  && kustomize build config > /bootstrap-components.yaml \
+  && kustomize build config/default > /bootstrap-components.yaml \
   && cp config/metadata/metadata.yaml /metadata.yaml
 
 FROM scratch AS release
-COPY --from=release-build /bootstrap-components.yaml /bootstrap-components.yaml
-COPY --from=release-build /metadata.yaml /metadata.yaml
+ARG TAG
+COPY --from=release-build /bootstrap-components.yaml /bootstrap-talos/${TAG}/bootstrap-components.yaml
+COPY --from=release-build /metadata.yaml /bootstrap-talos/${TAG}/metadata.yaml
 
 FROM build AS binary
 ARG TARGETARCH

Makefile

@@ -13,8 +13,8 @@ PKGS ?= v0.8.0-alpha.0-3-gdb90f93
 TALOS_VERSION ?= v0.12.1
 K8S_VERSION ?= 1.21.4
 
-CONTROLLER_GEN_VERSION ?= v0.5.0
-CONVERSION_GEN_VERSION ?= v0.21.0
+CONTROLLER_GEN_VERSION ?= v0.6.2
+CONVERSION_GEN_VERSION ?= v0.21.3
 
 BUILD := docker buildx build
 PLATFORM ?= linux/amd64

config/crd/kustomization.yaml

@@ -3,6 +3,7 @@
 # It should be run by config/default
 commonLabels:
     cluster.x-k8s.io/v1alpha3: v1alpha3  
+    cluster.x-k8s.io/v1alpha4: v1alpha3  
 
 resources:
 - bases/bootstrap.cluster.x-k8s.io_talosconfigs.yaml

config/default/kustomization.yaml

@@ -1,8 +1,52 @@
 namespace: cabpt-system
 
+namePrefix: cabpt-
+
+# Labels to add to all resources and selectors.
+commonLabels:
+  cluster.x-k8s.io/provider: "bootstrap-talos"
+
 resources:
   - namespace.yaml
 
 bases:
+  - ../crd
+  - ../certmanager
+  - ../webhook
   - ../rbac
   - ../manager
+
+patchesStrategicMerge:
+  - manager_webhook_patch.yaml
+  - webhookcainjection_patch.yaml
+
+vars:
+  - name: CERTIFICATE_NAMESPACE # namespace of the certificate CR
+    objref:
+      kind: Certificate
+      group: cert-manager.io
+      version: v1alpha2
+      name: serving-cert # this name should match the one in certificate.yaml
+    fieldref:
+      fieldpath: metadata.namespace
+  - name: CERTIFICATE_NAME
+    objref:
+      kind: Certificate
+      group: cert-manager.io
+      version: v1alpha2
+      name: serving-cert # this name should match the one in certificate.yaml
+  - name: SERVICE_NAMESPACE # namespace of the service
+    objref:
+      kind: Service
+      version: v1
+      name: webhook-service
+    fieldref:
+      fieldpath: metadata.namespace
+  - name: SERVICE_NAME
+    objref:
+      kind: Service
+      version: v1
+      name: webhook-service
+
+configurations:
+  - kustomizeconfig.yaml

config/default/kustomizeconfig.yaml

@@ -0,0 +1,4 @@
+# This configuration is for teaching kustomize how to update name ref and var substitution
+varReference:
+  - kind: Deployment
+    path: spec/template/spec/volumes/secret/secretName

config/webhook/manager_webhook_patch.yaml renamed to config/default/manager_webhook_patch.yaml

@@ -8,9 +8,6 @@ spec:
     spec:
       containers:
         - name: manager
-          args:
-            - "--metrics-addr=127.0.0.1:8080"
-            - "--webhook-port=9443"
           ports:
             - containerPort: 9443
               name: webhook-server

config/default/webhookcainjection_patch.yaml

@@ -0,0 +1,7 @@
+---
+apiVersion: admissionregistration.k8s.io/v1
+kind: ValidatingWebhookConfiguration
+metadata:
+  name: validating-webhook-configuration
+  annotations:
+    cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)

config/kustomization.yaml

@@ -19,7 +19,7 @@ spec:
         - command:
             - /manager
           args:
-            - --metrics-addr=127.0.0.1:8080
+            - --metrics-bind-addr=127.0.0.1:8080
             - --enable-leader-election
             - "--feature-gates=MachinePool=${EXP_MACHINE_POOL:=false}"
           image: controller:latest