Replace yamllint action with make targets, add kyaml mode

.custom-gcl.yaml

@@ -1,3 +1,4 @@
+---
 version: v2.9.0
 name: golangci-lint-kube-api-linter
 destination: ./bin

.github/workflows/lint.yml

@@ -38,9 +38,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y yamllint
-      - uses: ibiqlik/action-yamllint@2576378a8e339169678f9939646ee3ee325e845c # v3.1.1
-        with:
-          format: github
+      - run: make yamllint
 
   actionlint:
     name: actionlint

.golangci-kal.yml

@@ -1,3 +1,4 @@
+---
 version: "2"
 run:
   go: "1.25"

.golangci.yml

@@ -1,3 +1,4 @@
+---
 version: "2"
 run:
   allow-parallel-runners: true
@@ -62,9 +63,11 @@ linters:
         text: 'G108: Profiling endpoint is automatically exposed on /debug/pprof'
       - linters:
           - revive
+        # yamllint disable-line rule:line-length
         text: 'exported: exported method .*\.(Reconcile|SetupWithManager|SetupWebhookWithManager) should have comment or be unexported'
       - linters:
           - errcheck
+        # yamllint disable-line rule:line-length
         text: Error return value of .((os\.)?std(out|err)\..*|.*Close|.*Flush|os\.Remove(All)?|.*print(f|ln)?|os\.(Un)?Setenv). is not checked
       - linters:
           - revive

.mockery.yaml

@@ -1,3 +1,4 @@
+---
 quiet: false
 disable-version-string: true
 with-expecter: true

.yamlfmt

@@ -1,17 +1,14 @@
-include:
-- metadata.yaml
-- .github
-- config/default
-- config/manager
-- config/samples
-- config/webhook
-- examples
 exclude:
-- .github/workflows
+# generated files
+- config/crd
+- config/certmanager
+- config/prometheus
+- config/rbac
+- out
 formatter:
   include_document_start: true
   indent: 2
   indentless_arrays: true
   max_line_length: 120
   retain_line_breaks: true
-  type: basic
+  type: kyaml

.yamllint

@@ -27,15 +27,12 @@ ignore:
 - config/certmanager
 - config/prometheus
 - config/rbac
-- config/manager
-- config/default
-- test/e2e
 - out
-- .*.yaml
-- .*.yml
-# these are clusterctl templates, not yaml
+# clusterctl templates use envsubst syntax that isn't valid yaml
+# TODO: find a way to lint these (preprocess with envsubst + dummy values?)
 - templates
+- test/e2e
 # conversion tool testdata contains envsubst templates
 - pkg/convert/testdata
-# github actions checked by actionlint
+# github actions have no document-start markers
 - .github/workflows

Makefile

@@ -82,8 +82,12 @@ mockgen: ## Generate mocks.
 
 .PHONY: yamlfmt
 yamlfmt: ## Run yamlfmt against yaml.
-	go tool yamlfmt -dry -quiet
-	go tool yamlfmt
+	go tool yamlfmt -verbose
+
+.PHONY: yamllint
+yamllint: ## Lint YAML files with yamllint and yamlfmt.
+	yamllint $(if $(GITHUB_ACTIONS),-f github) .
+	go tool yamlfmt -lint -quiet
 
 .PHONY: tidy
 tidy: ## Run go mod tidy to ensure modules are up to date

config/default/webhookcainjection_patch.yaml

@@ -4,16 +4,16 @@
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
- labels:
-   app.kubernetes.io/name: mutatingwebhookconfiguration
-   app.kubernetes.io/instance: mutating-webhook-configuration
-   app.kubernetes.io/component: webhook
-   app.kubernetes.io/created-by: cluster-api-provider-proxmox
-   app.kubernetes.io/part-of: cluster-api-provider-proxmox
-   app.kubernetes.io/managed-by: kustomize
- name: mutating-webhook-configuration
- annotations:
-   cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME
+  labels:
+    app.kubernetes.io/name: mutatingwebhookconfiguration
+    app.kubernetes.io/instance: mutating-webhook-configuration
+    app.kubernetes.io/component: webhook
+    app.kubernetes.io/created-by: cluster-api-provider-proxmox
+    app.kubernetes.io/part-of: cluster-api-provider-proxmox
+    app.kubernetes.io/managed-by: kustomize
+  name: mutating-webhook-configuration
+  annotations:
+    cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME
 ---
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration

config/manager/kustomization.yaml

@@ -1,3 +1,4 @@
+---
 resources:
 - manager.yaml
 apiVersion: kustomize.config.k8s.io/v1beta1

examples/cluster-calico.yaml

@@ -101,27 +101,27 @@ spec:
         sshAuthorizedKeys:
         - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJPK5kBd7cxXAHZ6UbeE+ysOlSjOFare3fCCZJ3xtXt1 capmox@k8s.io
         virtualIPNetworkInterface: ""
-#---
-#apiVersion: ipam.cluster.x-k8s.io/v1alpha2
-#kind: GlobalInClusterIPPool
-#metadata:
-#  name: shared-inclusteripv4pool
-#spec:
-#  addresses:
-#    - 10.10.11.1
-#    - 10.10.11.2
-#    - 10.10.11.3
-#  prefix: 24
-#  gateway: 10.10.11.254
-#---
-#apiVersion: ipam.cluster.x-k8s.io/v1alpha2
-#kind: GlobalInClusterIPPool
-#metadata:
-#  name: shared-inclusteripv6pool
-#spec:
-#  addresses:
-#    - 2001:db8::10
-#    - 2001:db8::11
-#    - 2001:db8::12
-#  prefix: 64
-#  gateway: "2001:db8::1"
+# ---
+# apiVersion: ipam.cluster.x-k8s.io/v1alpha2
+# kind: GlobalInClusterIPPool
+# metadata:
+#   name: shared-inclusteripv4pool
+# spec:
+#   addresses:
+#     - 10.10.11.1
+#     - 10.10.11.2
+#     - 10.10.11.3
+#   prefix: 24
+#   gateway: 10.10.11.254
+# ---
+# apiVersion: ipam.cluster.x-k8s.io/v1alpha2
+# kind: GlobalInClusterIPPool
+# metadata:
+#   name: shared-inclusteripv6pool
+# spec:
+#   addresses:
+#     - 2001:db8::10
+#     - 2001:db8::11
+#     - 2001:db8::12
+#   prefix: 64
+#   gateway: "2001:db8::1"

examples/cluster-cilium.yaml

@@ -101,27 +101,27 @@ spec:
         sshAuthorizedKeys:
         - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJPK5kBd7cxXAHZ6UbeE+ysOlSjOFare3fCCZJ3xtXt1 capmox@k8s.io
         virtualIPNetworkInterface: ""
-#---
-#apiVersion: ipam.cluster.x-k8s.io/v1alpha2
-#kind: GlobalInClusterIPPool
-#metadata:
-#  name: shared-inclusteripv4pool
-#spec:
-#  addresses:
-#    - 10.10.11.1
-#    - 10.10.11.2
-#    - 10.10.11.3
-#  prefix: 24
-#  gateway: 10.10.11.254
-#---
-#apiVersion: ipam.cluster.x-k8s.io/v1alpha2
-#kind: GlobalInClusterIPPool
-#metadata:
-#  name: shared-inclusteripv6pool
-#spec:
-#  addresses:
-#    - 2001:db8::10
-#    - 2001:db8::11
-#    - 2001:db8::12
-#  prefix: 64
-#  gateway: "2001:db8::1"
+# ---
+# apiVersion: ipam.cluster.x-k8s.io/v1alpha2
+# kind: GlobalInClusterIPPool
+# metadata:
+#   name: shared-inclusteripv4pool
+# spec:
+#   addresses:
+#     - 10.10.11.1
+#     - 10.10.11.2
+#     - 10.10.11.3
+#   prefix: 24
+#   gateway: 10.10.11.254
+# ---
+# apiVersion: ipam.cluster.x-k8s.io/v1alpha2
+# kind: GlobalInClusterIPPool
+# metadata:
+#   name: shared-inclusteripv6pool
+# spec:
+#   addresses:
+#     - 2001:db8::10
+#     - 2001:db8::11
+#     - 2001:db8::12
+#   prefix: 64
+#   gateway: "2001:db8::1"

examples/cluster.yaml

@@ -101,27 +101,27 @@ spec:
         sshAuthorizedKeys:
         - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJPK5kBd7cxXAHZ6UbeE+ysOlSjOFare3fCCZJ3xtXt1 capmox@k8s.io
         virtualIPNetworkInterface: ""
-#---
-#apiVersion: ipam.cluster.x-k8s.io/v1alpha2
-#kind: GlobalInClusterIPPool
-#metadata:
-#  name: shared-inclusteripv4pool
-#spec:
-#  addresses:
-#    - 10.10.11.1
-#    - 10.10.11.2
-#    - 10.10.11.3
-#  prefix: 24
-#  gateway: 10.10.11.254
-#---
-#apiVersion: ipam.cluster.x-k8s.io/v1alpha2
-#kind: GlobalInClusterIPPool
-#metadata:
-#  name: shared-inclusteripv6pool
-#spec:
-#  addresses:
-#    - 2001:db8::10
-#    - 2001:db8::11
-#    - 2001:db8::12
-#  prefix: 64
-#  gateway: "2001:db8::1"
+# ---
+# apiVersion: ipam.cluster.x-k8s.io/v1alpha2
+# kind: GlobalInClusterIPPool
+# metadata:
+#   name: shared-inclusteripv4pool
+# spec:
+#   addresses:
+#     - 10.10.11.1
+#     - 10.10.11.2
+#     - 10.10.11.3
+#   prefix: 24
+#   gateway: 10.10.11.254
+# ---
+# apiVersion: ipam.cluster.x-k8s.io/v1alpha2
+# kind: GlobalInClusterIPPool
+# metadata:
+#   name: shared-inclusteripv6pool
+# spec:
+#   addresses:
+#     - 2001:db8::10
+#     - 2001:db8::11
+#     - 2001:db8::12
+#   prefix: 64
+#   gateway: "2001:db8::1"