Merge pull request #2480 from sbueringer/pr-minor-fixups

🌱 Minor cleanups in Makefile, metadata.yaml and .golangci.yml

.golangci.yml

@@ -123,10 +123,6 @@ linters-settings:
       - pkg: sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1
         alias: controlplanev1
       # CAPI
-      - pkg: sigs.k8s.io/cluster-api/api/v1alpha3
-        alias: clusterv1alpha3
-      - pkg: sigs.k8s.io/cluster-api/api/v1alpha4
-        alias: clusterv1alpha4
       - pkg: sigs.k8s.io/cluster-api/api/v1beta1
         alias: clusterv1
       # CAPI exp
@@ -182,10 +178,8 @@ issues:
   # changes in PRs and avoid nitpicking.
   exclude-use-default: false
   exclude-rules:
-  # Specific exclude rules for deprecated fields that are still part of the codebase. These
+  # Specific exclude rules for deprecated items that are still part of the codebase. These
   # should be removed as the referenced deprecated item is removed from the project.
-  # Specific exclude rules for deprecated packages that are still part of the codebase. These
-  # should be removed as the referenced deprecated packages are removed from the project.
   - linters:
     - staticcheck
     text: "SA1019: .* is deprecated: This package will be removed in one of the next releases."
@@ -259,4 +253,4 @@ issues:
   - linters:
     - stylecheck
     text: "ST1016: methods on the same type should have the same receiver name"
-    path: ^apis\/.*\/.*conversion.*\.go$
+    path: ^apis\/.*\/.*conversion.*\.go$

Makefile

@@ -333,7 +333,6 @@ apidiff: $(GO_APIDIFF) ## Check for API differences
 	$(GO_APIDIFF) $(APIDIFF_OLD_COMMIT) --print-compatible
 
 ALL_VERIFY_CHECKS = licenses boilerplate shellcheck modules gen doctoc flavors import-restrictions
-ALL_VERIFY_CHECKS = licenses boilerplate shellcheck modules gen doctoc flavors import-restrictions
 
 .PHONY: verify
 verify: $(addprefix verify-,$(ALL_VERIFY_CHECKS)) ## Run all verify-* targets

metadata.yaml

@@ -6,6 +6,9 @@
 apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
 kind: Metadata
 releaseSeries:
+  - major: 1
+    minor: 0
+    contract: v1beta1
   - major: 1
     minor: 1
     contract: v1beta1

test/helpers/webhook.go

@@ -117,7 +117,7 @@ func (t *TestEnvironment) WaitForWebhooks() {
 			continue
 		}
 		if err := conn.Close(); err != nil {
-			klog.V(2).Info("Webhook port could not be closed. Continuing with tests...")
+			klog.V(2).Info("Connection to webhook port could not be closed. Continuing with tests...")
 		}
 		klog.V(2).Info("Webhook port is now open. Continuing with tests...")
 		return