Merge pull request #273 from vignesh-goutham/v1beta3-main-sync

Sync main changes to v1beta3

Author: k8s-ci-robot

Makefile

@@ -149,7 +149,7 @@ DEEPCOPY_GEN_INPUTS=$(shell find ./api -name "*test*" -prune -o -name "*zz_gener
 .PHONY: generate-deepcopy
 generate-deepcopy: $(DEEPCOPY_GEN_TARGETS) ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
 api/%/zz_generated.deepcopy.go: $(CONTROLLER_GEN) $(DEEPCOPY_GEN_INPUTS)
-	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
+	CGO_ENABLED=0 $(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
 
 MANIFEST_GEN_INPUTS=$(shell find ./api ./controllers -type f -name "*test*" -prune -o -name "*zz_generated*" -prune -o -print)
 # Using a flag file here as config output is too complicated to be a target.
@@ -237,7 +237,7 @@ kind-cluster: cluster-api ## Create a kind cluster with a local Docker repositor
 	./cluster-api/hack/kind-install-for-capd.sh
 
 cluster-api: ## Clone cluster-api repository for tilt use.
-	git clone --branch v1.2.11 --depth 1 https://github.com/kubernetes-sigs/cluster-api.git
+	git clone --branch v1.2.12 --depth 1 https://github.com/kubernetes-sigs/cluster-api.git
 
 cluster-api/tilt-settings.json: hack/tilt-settings.json cluster-api
 	cp ./hack/tilt-settings.json cluster-api
@@ -263,13 +263,14 @@ config/.flag-test.mk: $(CONTROLLER_GEN) $(MANIFEST_GEN_INPUTS_TEST)
 	@touch config/.flag-test.mk
 
 .PHONY: test
-test: generate-deepcopy-test generate-manifest-test generate-mocks lint $(GINKGO_V2) $(KUBECTL) $(API_SERVER) $(ETCD) ## Run tests. At the moment this is only unit tests.
+test: ## Run tests.
+test: generate-deepcopy-test generate-manifest-test generate-mocks lint $(GINKGO_V2) $(KUBECTL) $(API_SERVER) $(ETCD)
 	@./hack/testing_ginkgo_recover_statements.sh --add # Add ginkgo.GinkgoRecover() statements to controllers.
 	@# The following is a slightly funky way to make sure the ginkgo statements are removed regardless the test results.
 	@$(GINKGO_V2) --label-filter="!integ" --cover -coverprofile cover.out --covermode=atomic -v ./api/... ./controllers/... ./pkg/...; EXIT_STATUS=$$?;\
 		./hack/testing_ginkgo_recover_statements.sh --remove; exit $$EXIT_STATUS
 
-CLUSTER_TEMPLATES_INPUT_FILES=$(shell find test/e2e/data/infrastructure-cloudstack/v1beta*/*/cluster-template* test/e2e/data/infrastructure-cloudstack/*/bases/* -type f)
+CLUSTER_TEMPLATES_INPUT_FILES=$(shell find test/e2e/data/infrastructure-cloudstack/v1beta*/cluster-template* test/e2e/data/infrastructure-cloudstack/*/bases/* -type f)
 CLUSTER_TEMPLATES_OUTPUT_FILES=$(shell find test/e2e/data/infrastructure-cloudstack -type d -name "cluster-template*" -exec echo {}.yaml \;)
 .PHONY: e2e-cluster-templates
 e2e-cluster-templates: $(CLUSTER_TEMPLATES_OUTPUT_FILES) ## Generate cluster template files for e2e testing.
@@ -288,7 +289,14 @@ run-e2e: e2e-essentials ## Run e2e testing. JOB is an optional REGEXP to select
 	    -e2e.artifacts-folder=${REPO_ROOT}/_artifacts \
 	    -e2e.config=${E2E_CONFIG} \
 	    -e2e.skip-resource-cleanup=false -e2e.use-existing-cluster=true
+	EXIT_STATUS=$$?
 	kind delete clusters capi-test
+	exit $$EXIT_STATUS
+
+run-e2e-smoke:
+	./hack/ensure-kind.sh
+	./hack/ensure-cloud-config-yaml.sh
+	JOB="\"CAPC E2E SMOKE TEST\"" $(MAKE) run-e2e
 
 ##@ Cleanup
 ## --------------------------------------
@@ -302,6 +310,7 @@ clean: ## Cleans up everything.
 	rm -rf $(TOOLS_BIN_DIR)
 	rm -rf cluster-api
 	rm -rf test/e2e/data/infrastructure-cloudstack/*/*yaml
+	rm -rf config/.flag.mk config/.flag-test.mk .dockerflag.mk
 
 ##@ Release
 ## --------------------------------------
@@ -336,7 +345,8 @@ release-alias-tag: # Adds the tag to the last build tag.
 	gcloud container images add-tag -q $(CONTROLLER_IMG):$(TAG) $(CONTROLLER_IMG):$(RELEASE_ALIAS_TAG)
 
 .PHONY: release-templates
-release-templates: $(RELEASE_DIR) ## Generate release templates
+release-templates: ## Generate release templates
+	@mkdir -p $(RELEASE_DIR)
 	cp templates/cluster-template*.yaml $(RELEASE_DIR)/
 
 .PHONY: upload-staging-artifacts

OWNERS

@@ -4,3 +4,5 @@ approvers:
   - jweite-amazon
   - dims
   - g-gaston
+  - chrisdoherty4
+  - weizhouapache

api/v1beta2/cloudstackmachine_types.go

@@ -92,6 +92,10 @@ type CloudStackMachineSpec struct {
 	UncompressedUserData *bool `json:"uncompressedUserData,omitempty"`
 }
 
+func (c *CloudStackMachine) CompressUserdata() bool {
+	return c.Spec.UncompressedUserData == nil || !*c.Spec.UncompressedUserData
+}
+
 type CloudStackResourceIdentifier struct {
 	// Cloudstack resource ID.
 	// +optional

api/v1beta2/cloudstackmachine_types_test.go

@@ -0,0 +1,67 @@
+/*
+Copyright 2022 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1beta2_test
+
+import (
+	"k8s.io/utils/pointer"
+	capcv1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta2"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("CloudStackMachineConfig_CompressUserdata", func() {
+	for _, tc := range []struct {
+		Name    string
+		Machine capcv1.CloudStackMachine
+		Expect  bool
+	}{
+		{
+			Name: "is true when uncompressed user data is nil",
+			Machine: capcv1.CloudStackMachine{
+				Spec: capcv1.CloudStackMachineSpec{
+					UncompressedUserData: nil,
+				},
+			},
+			Expect: true,
+		},
+		{
+			Name: "is false when uncompressed user data is true",
+			Machine: capcv1.CloudStackMachine{
+				Spec: capcv1.CloudStackMachineSpec{
+					UncompressedUserData: pointer.Bool(true),
+				},
+			},
+			Expect: false,
+		},
+		{
+			Name: "Is false when uncompressed user data is false",
+			Machine: capcv1.CloudStackMachine{
+				Spec: capcv1.CloudStackMachineSpec{
+					UncompressedUserData: pointer.Bool(false),
+				},
+			},
+			Expect: true,
+		},
+	} {
+		tc := tc
+		It(tc.Name, func() {
+			result := tc.Machine.CompressUserdata()
+			Expect(result).To(Equal(tc.Expect))
+		})
+	}
+})

docs/book/src/clustercloudstack/configuration.md

@@ -61,7 +61,8 @@ cmk list zones listall=true | jq '.zone[] | {name, id}'
 
 The network must be declared as an environment variable `CLOUDSTACK_NETWORK_NAME` and is a mandatory parameter.
 As of now, only isolated and shared networks are supported.
-If the specified network does not exist, a new isolated network will be created.
+
+If the specified network does not exist, a new isolated network will be created. The newly created network will have a default egress firewall policy that allows all TCP, UDP and ICMP traffic from the cluster to the outside world.
 
 The list of networks for the specific zone can be fetched using the cmk cli as follows :
 ```

docs/book/src/development/common.md

@@ -60,9 +60,16 @@
     clusterctl get kubeconfig capc-cluster > capc-cluster.kubeconfig
     ```
 
-6. Install calico on the workload cluster so that pods can see each other
+6. Install calico or weave net cni plugin on the workload cluster so that pods can see each other
     ```
-    KUBECONFIG=capc-cluster.kubeconfig kubectl apply -f https://projectcalico.docs.tigera.io/manifests/calico.yaml
+    KUBECONFIG=capc-cluster.kubeconfig kubectl apply -f https://raw.githubusercontent.com/projectcalico/calico/master/manifests/calico.yaml
+    
+    ```    
+     or
+    
+    ```
+    KUBECONFIG=capc-cluster.kubeconfig kubectl apply -f https://raw.githubusercontent.com/weaveworks/weave/master/prog/weave-kube/weave-daemonset-k8s-1.11.yaml
+    
     ```
 
 7. Verify the K8s cluster is fully up.  (It may take a minute for the nodes status to all reach *ready* state.)
@@ -87,7 +94,7 @@ KUBECONFIG=capc-cluster.kubeconfig kubectl logs test-thing
 ```
 
 ### kubectl/clusterctl Reference:
-- Pods in capc-cluster -- cluster running in Apache CloudStack
+- Pods in capc-cluster -- cluster running in Apache CloudStack with calico cni
 ```
 % KUBECONFIG=capc-cluster.kubeconfig kubectl get pods -A
 NAMESPACE     NAME                                                       READY   STATUS      RESTARTS   AGE
@@ -104,6 +111,23 @@ kube-system   kube-proxy-6g9zb                                           1/1
 kube-system   kube-proxy-7gjbv                                           1/1     Running     0          9m18s
 kube-system   kube-scheduler-capc-cluster-control-plane-tknwx            1/1     Running     0          9m21s
 ```
+- Pods in capc-cluster -- cluster running in Apache CloudStack with weave net cni
+
+```
+%KUBECONFIG=capc-cluster.kubeconfig kubectl get pods -A
+NAMESPACE     NAME                                                       READY   STATUS      RESTARTS       AGE
+default       test-thing                                                 0/1     Completed   0              38s
+kube-system   coredns-5d78c9869d-9xq2s                                   1/1     Running     0              21h
+kube-system   coredns-5d78c9869d-gphs2                                   1/1     Running     0              21h
+kube-system   etcd-capc-cluster-control-plane-49khm                      1/1     Running     0              21h
+kube-system   kube-apiserver-capc-cluster-control-plane-49khm            1/1     Running     0              21h
+kube-system   kube-controller-manager-capc-cluster-control-plane-49khm   1/1     Running     0              21h
+kube-system   kube-proxy-8lfnm                                           1/1     Running     0              21h
+kube-system   kube-proxy-brj78                                           1/1     Running     0              21h
+kube-system   kube-scheduler-capc-cluster-control-plane-49khm            1/1     Running     0              21h
+kube-system   weave-net-rqckr                                            2/2     Running     1 (3h8m ago)   3h8m
+kube-system   weave-net-rzms4                                            2/2     Running     1 (3h8m ago)   3h8m
+```
 
 - Pods in original kind cluster (also called bootstrap cluster, management cluster)
 ```
@@ -128,4 +152,4 @@ local-path-storage                  local-path-provisioner-547f784dff-f2g7r
 ```
 <!--
 // ANCHOR_END: common-development
--->
+-->

go.mod

@@ -21,8 +21,8 @@ require (
 	k8s.io/client-go v0.25.3
 	k8s.io/klog/v2 v2.80.1
 	k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2
-	sigs.k8s.io/cluster-api v1.2.11
-	sigs.k8s.io/controller-runtime v0.13.1
+	sigs.k8s.io/cluster-api v1.2.12
+	sigs.k8s.io/controller-runtime v0.12.3
 )
 
 require (
@@ -102,6 +102,6 @@ require (
 
 replace github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.0.0 // Indirect upgrade to address https://github.com/advisories/GHSA-w73w-5m7g-f7qc
 
-replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.2.11
+replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.2.12
 
-replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.2.11
+replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.2.12

go.sum

@@ -1047,10 +1047,10 @@ k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2/go.mod h1:OLgZIPagt7ERELqWJFomSt
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
-sigs.k8s.io/cluster-api v1.2.11 h1:rtx6fp05qESvtALUGIizUAci0kmiEoVBG786C05L1jU=
-sigs.k8s.io/cluster-api v1.2.11/go.mod h1:VB4qC2t1WjqzBtJvxx3VImb/hLpdXjiWxkdd7OX29mA=
-sigs.k8s.io/controller-runtime v0.13.1 h1:tUsRCSJVM1QQOOeViGeX3GMT3dQF1eePPw6sEE3xSlg=
-sigs.k8s.io/controller-runtime v0.13.1/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI=
+sigs.k8s.io/cluster-api v1.2.12 h1:/1iFgWUR3Z+KZU9B4PJegmlQQo6uzQXBZNgOk63SLu4=
+sigs.k8s.io/cluster-api v1.2.12/go.mod h1:9+fLUuyRsKediKJYrbsyFj6Bmk59oopXpzj3g6/REM8=
+sigs.k8s.io/controller-runtime v0.12.3 h1:FCM8xeY/FI8hoAfh/V4XbbYMY20gElh9yh+A98usMio=
+sigs.k8s.io/controller-runtime v0.12.3/go.mod h1:qKsk4WE6zW2Hfj0G4v10EnNB2jMG1C+NTb8h+DwCoU0=
 sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
 sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=

hack/ensure-cloud-config-yaml.sh

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+# Copyright 2019 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+# This ensures that cloud-config.yaml exists which is required for e2e smoke test
+if [ ! -f "cloud-config.yaml" ];then
+    echo "cloud-config.yaml is not found, creating"
+    cat >cloud-config.yaml <<EOF
+apiVersion: v1
+kind: Secret
+metadata:
+  name: secret1
+  namespace: default
+type: Opaque
+stringData:
+  api-key: XXXX
+  secret-key: XXXX
+  api-url: http://1.2.3.4:8080/client/api
+  verify-ssl: "false"
+EOF
+
+fi

hack/ensure-kind.sh

@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+
+# Copyright 2019 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+GOPATH_BIN="$(go env GOPATH)/bin/"
+MINIMUM_KIND_VERSION=v0.14.0
+GOARCH="$(go env GOARCH)"
+GOOS="$(go env GOOS)"
+
+# Ensure the kind tool exists and is a viable version, or installs it
+verify_kind_version() {
+
+  # If kind is not available on the path, get it
+  if ! [ -x "$(command -v kind)" ]; then
+    if [ "$GOOS" == "linux" ] || [ "$GOOS" == "darwin" ]; then
+      echo 'kind not found, installing'
+      if ! [ -d "${GOPATH_BIN}" ]; then
+        mkdir -p "${GOPATH_BIN}"
+      fi
+      curl -sLo "${GOPATH_BIN}/kind" "https://github.com/kubernetes-sigs/kind/releases/download/${MINIMUM_KIND_VERSION}/kind-${GOOS}-${GOARCH}"
+      chmod +x "${GOPATH_BIN}/kind"
+    else
+      echo "Missing required binary in path: kind"
+      return 2
+    fi
+  fi
+
+  local kind_version
+  kind_version="v$(kind version -q)"
+  if [[ "${MINIMUM_KIND_VERSION}" != $(echo -e "${MINIMUM_KIND_VERSION}\n${kind_version}" | sort -s -t. -k 1,1n -k 2,2n -k 3,3n | head -n1) ]]; then
+    cat <<EOF
+Detected kind version: ${kind_version}.
+Requires ${MINIMUM_KIND_VERSION} or greater.
+Please install ${MINIMUM_KIND_VERSION} or later.
+EOF
+    return 2
+  fi
+}
+
+verify_kind_version

pkg/cloud/helpers.go

@@ -18,7 +18,7 @@ package cloud
 
 import (
 	"bytes"
-	"compress/gzip"
+	cgzip "compress/gzip"
 )
 
 type set func(string)
@@ -43,13 +43,13 @@ func setIntIfPositive(num int64, setFn setInt) {
 	}
 }
 
-func CompressString(str string) (string, error) {
-	buf := &bytes.Buffer{}
-	gzipWriter := gzip.NewWriter(buf)
-	if _, err := gzipWriter.Write([]byte(str)); err != nil {
+func compress(str string) (string, error) {
+	var buf bytes.Buffer
+	w := cgzip.NewWriter(&buf)
+	if _, err := w.Write([]byte(str)); err != nil {
 		return "", err
 	}
-	if err := gzipWriter.Close(); err != nil {
+	if err := w.Close(); err != nil {
 		return "", err
 	}
 	return buf.String(), nil