Merging.

Author: Joshua Reed

.github/workflows/go-coverage.yml

@@ -0,0 +1,23 @@
+name: Test coverage
+on:
+  push:
+    tags:
+      - v*
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-go@v2
+        with:
+          go-version: 1.17.8
+      - name: Run go test with coverage
+        run: COVER_PROFILE=coverage.txt make test
+      - name: Codecov upload
+        uses: codecov/[email protected]
+        with:
+          files: ./cover.out

.golangci.yml

@@ -17,12 +17,16 @@ linters-settings:
       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.
+  gocyclo:
+    min-complexity: 15
 
 linters:
   enable:
     - gosec
     - goheader
     - revive
+    - gocyclo
+    - misspell
 
 run:
   issues-exit-code: 1

ATTRIBUTION.txt

@@ -2,7 +2,7 @@
 ** cloud.google.com/go/compute/metadata; version v0.93.3 --
 https://github.com/googleapis/google-cloud-go
 
-** github.com/apache/cloudstack-go/v2/cloudstack; version v2.11.1-0.20211020121644-369057554f66 --
+** github.com/apache/cloudstack-go/v2/cloudstack; version v2.13.0 --
 https://github.com/apache/cloudstack-go/v2
 
 ** github.com/Azure/go-autorest/autorest; version v0.11.18 --
@@ -29,7 +29,7 @@ https://github.com/coredns/corefile-migration
 ** github.com/docker/distribution; version v2.7.1+incompatible --
 https://github.com/distribution/distribution
 
-** github.com/go-logr/logr; version v0.4.0 --
+** github.com/go-logr/logr; version v1.2.3 --
 https://github.com/go-logr/logr
 
 ** github.com/golang/groupcache/lru; version v0.0.0-20210331224755-41bb18bfe9da --
@@ -50,7 +50,7 @@ https://github.com/matttproud/golang_protobuf_extensions
 ** github.com/modern-go/concurrent; version v0.0.0-20180306012644-bacd9c7ef1dd --
 https://github.com/modern-go/concurrent
 
-** github.com/modern-go/reflect2; version v1.0.1 --
+** github.com/modern-go/reflect2; version v1.0.2 --
 https://github.com/modern-go/reflect2
 
 ** github.com/opencontainers/go-digest; version v1.0.0 --
@@ -62,7 +62,7 @@ https://github.com/prometheus/client_golang
 ** github.com/prometheus/client_model/go; version v0.2.0 --
 https://github.com/prometheus/client_model
 
-** github.com/prometheus/common; version v0.26.0 --
+** github.com/prometheus/common; version v0.28.0 --
 https://github.com/prometheus/common
 
 ** github.com/prometheus/procfs; version v0.6.0 --
@@ -77,31 +77,28 @@ https://gopkg.in/ini.v1
 ** gopkg.in/yaml.v2; version v2.4.0 --
 https://gopkg.in/yaml.v2
 
-** k8s.io/api; version v0.22.2 --
+** k8s.io/api; version v0.23.0 --
 https://github.com/kubernetes/api
 
-** k8s.io/apiextensions-apiserver/pkg/apis/apiextensions; version v0.22.2 --
+** k8s.io/apiextensions-apiserver/pkg/apis/apiextensions; version v0.23.0 --
 https://github.com/kubernetes/apiextensions-apiserver
 
-** k8s.io/apimachinery/pkg; version v0.22.2 --
+** k8s.io/apimachinery/pkg; version v0.23.0 --
 https://github.com/kubernetes/apimachinery
 
-** k8s.io/client-go; version v0.22.2 --
+** k8s.io/client-go; version v0.23.0 --
 https://github.com/kubernetes/client-go
 
 ** k8s.io/cluster-bootstrap/token; version v0.22.2 --
 https://github.com/kubernetes/cluster-bootstrap
 
-** k8s.io/component-base; version v0.22.2 --
+** k8s.io/component-base; version v0.23.0 --
 https://github.com/kubernetes/component-base
 
-** k8s.io/klog; version v1.0.0 --
+** k8s.io/klog/v2; version v2.30.0 --
 https://github.com/kubernetes/klog
 
-** k8s.io/klog/v2; version v2.9.0 --
-https://github.com/kubernetes/klog
-
-** k8s.io/kube-openapi/pkg/util/proto; version v0.0.0-20210421082810-95288971da7e --
+** k8s.io/kube-openapi/pkg; version v0.0.0-20211115234752-e816edb12b65 --
 https://github.com/kubernetes/kube-openapi
 
 ** k8s.io/utils; version v0.0.0-20210930125809-cb0fa318a74b --
@@ -113,10 +110,13 @@ https://github.com/kubernetes-sigs/cluster-api
 ** sigs.k8s.io/cluster-api; version v1.0.0 --
 https://github.com/kubernetes-sigs/cluster-api
 
-** sigs.k8s.io/controller-runtime; version v0.10.2 --
+** sigs.k8s.io/controller-runtime; version v0.11.1 --
 https://github.com/kubernetes-sigs/controller-runtime
 
-** sigs.k8s.io/structured-merge-diff/v4; version v4.1.2 --
+** sigs.k8s.io/json; version v0.0.0-20211020170558-c049b76a60c6 --
+https://github.com/kubernetes-sigs/json
+
+** sigs.k8s.io/structured-merge-diff/v4; version v4.2.0 --
 https://github.com/kubernetes-sigs/structured-merge-diff
 
 
@@ -425,7 +425,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ------
 
-** github.com/evanphx/json-patch; version v4.11.0+incompatible --
+** github.com/evanphx/json-patch; version v4.12.0+incompatible --
 https://github.com/evanphx/json-patch
 
 Copyright (c) 2014, Evan Phoenix
@@ -665,7 +665,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ------
 
-** github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg; version v0.26.0 --
+** github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg; version v0.28.0 --
 https://github.com/prometheus/common
 
 Copyright (c) 2011, Open Knowledge Foundation Ltd.
@@ -738,31 +738,31 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ** golang.org/go; version go1.16 --
 https://github.com/golang/go
 
-** golang.org/x/crypto/pkcs12; version v0.0.0-20210817164053-32db794688a5 --
+** golang.org/x/crypto/pkcs12; version v0.0.0-20210921155107-089bfa567519 --
 https://go.googlesource.com/crypto
 
-** golang.org/x/net; version v0.0.0-20210520170846-37e1c6afe023 --
+** golang.org/x/net; version v0.0.0-20220225172249-27dd8689420f --
 https://go.googlesource.com/net
 
 ** golang.org/x/oauth2; version v0.0.0-20210819190943-2bc19b11175f --
 https://go.googlesource.com/oauth2
 
-** golang.org/x/sys; version v0.0.0-20210823070655-63515b42dcdf --
+** golang.org/x/sys; version v0.0.0-20220319134239-a9b59b0215f8 --
 https://go.googlesource.com/sys
 
-** golang.org/x/term; version v0.0.0-20210220032956-6a3ed077a48d --
+** golang.org/x/term; version v0.0.0-20210927222741-03fcf44c2211 --
 https://go.googlesource.com/term
 
-** golang.org/x/text; version v0.3.6 --
+** golang.org/x/text; version v0.3.7 --
 https://go.googlesource.com/text
 
 ** golang.org/x/time/rate; version v0.0.0-20210723032227-1f47c861a9ac --
 https://go.googlesource.com/time
 
-** k8s.io/apimachinery/third_party/forked/golang; version v0.22.2 --
+** k8s.io/apimachinery/third_party/forked/golang; version v0.23.0 --
 https://github.com/kubernetes/apimachinery
 
-** k8s.io/client-go/third_party/forked/golang/template; version v0.22.2 --
+** k8s.io/client-go/third_party/forked/golang/template; version v0.23.0 --
 https://github.com/kubernetes/client-go
 
 Copyright (c) 2009 The Go Authors. All rights reserved.
@@ -862,6 +862,39 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ------
 
+** k8s.io/utils/internal/third_party/forked/golang/net; version v0.0.0-20210930125809-cb0fa318a74b --
+https://github.com/kubernetes/utils
+
+Copyright (c) 2012 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+------
+
 ** github.com/davecgh/go-spew/spew; version v1.1.1 --
 https://github.com/davecgh/go-spew
 
@@ -903,11 +936,11 @@ Copyright (c) 2012 Dave Grijalva
 https://github.com/gobuffalo/flect
 Copyright (c) 2019 Mark Bates
 
-** github.com/json-iterator/go; version v1.1.11 --
+** github.com/json-iterator/go; version v1.1.12 --
 https://github.com/json-iterator/go
 Copyright (c) 2016 json-iterator
 
-** github.com/onsi/gomega; version v1.17.0 --
+** github.com/onsi/gomega; version v1.19.0 --
 https://github.com/onsi/gomega
 Copyright (c) 2013-2014 Onsi Fakhouri
 

Makefile

@@ -114,10 +114,11 @@ vet: ## Run go vet on the whole project.
 	go vet ./...
 
 .PHONY: lint
-lint: bin/golangci-lint generate-mocks ## Run linting for the project.
+lint: bin/golangci-lint bin/staticcheck generate-mocks ## Run linting for the project.
 	go fmt ./...
 	go vet ./...
 	golangci-lint run -v --timeout 360s ./...
+	staticcheck ./...
 	@ # The below string of commands checks that ginkgo isn't present in the controllers.
 	@(grep ginkgo ${PROJECT_DIR}/controllers/cloudstack*_controller.go && \
 		echo "Remove ginkgo from controllers. This is probably an artifact of testing." \
@@ -137,13 +138,20 @@ undeploy: bin/kustomize ## Undeploy controller from the K8s cluster specified in
 ##@ Binaries
 
 .PHONY: binaries
-binaries: bin/controller-gen bin/kustomize bin/ginkgo bin/golangci-lint bin/mockgen bin/kubectl ## Locally install all needed bins.
+binaries: bin/controller-gen bin/kustomize bin/ginkgo bin/golangci-lint bin/staticcheck bin/mockgen bin/kubectl ## Locally install all needed bins.
 bin/controller-gen: ## Install controller-gen to bin.
 	GOBIN=$(PROJECT_DIR)/bin go install sigs.k8s.io/controller-tools/cmd/[email protected]
 bin/golangci-lint: ## Install golangci-lint to bin.
-	GOBIN=$(PROJECT_DIR)/bin go install github.com/golangci/golangci-lint/cmd/[email protected]
-bin/ginkgo: ## Install ginkgo to bin.
+	GOBIN=$(PROJECT_DIR)/bin go install github.com/golangci/golangci-lint/cmd/[email protected]
+bin/staticcheck: ## Install staticcheck to bin.
+	GOBIN=$(PROJECT_DIR)/bin go install honnef.co/go/tools/cmd/[email protected]
+bin/ginkgo: bin/ginkgo_v1 bin/ginkgo_v2 ## Install ginkgo to bin.
+bin/ginkgo_v2: 
+	GOBIN=$(PROJECT_DIR)/bin go install github.com/onsi/ginkgo/v2/[email protected]
+	mv $(PROJECT_DIR)/bin/ginkgo $(PROJECT_DIR)/bin/ginkgo_v2
+bin/ginkgo_v1:
 	GOBIN=$(PROJECT_DIR)/bin go install github.com/onsi/ginkgo/[email protected]
+	mv $(PROJECT_DIR)/bin/ginkgo $(PROJECT_DIR)/bin/ginkgo_v1
 bin/mockgen:
 	GOBIN=$(PROJECT_DIR)/bin go install github.com/golang/mock/[email protected]
 bin/kustomize: ## Install kustomize to bin.
@@ -171,7 +179,7 @@ export KUBEBUILDER_ASSETS=$(PROJECT_DIR)/bin
 test: generate-mocks lint bin/ginkgo bin/kubectl bin/kube-apiserver bin/etcd ## Run tests. At the moment this is only unit tests.
 	@./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.
-	@cd ./test/unit && ginkgo -v ./... -coverprofile cover.out; EXIT_STATUS=$$?;\
+	@cd ./test/unit && ginkgo_v2 -v ./... -coverprofile cover.out; EXIT_STATUS=$$?;\
 		cd ../../ && ./hack/testing_ginkgo_recover_statements.sh --remove; exit $$EXIT_STATUS
 
 .PHONY: generate-mocks
@@ -204,13 +212,13 @@ e2e-cluster-templates: $(CLUSTER_TEMPLATES_OUTPUT_FILES) ## Generate cluster tem
 cluster-template%yaml: bin/kustomize $(CLUSTER_TEMPLATES_INPUT_FILES)
 	kustomize build --load-restrictor LoadRestrictionsNone $(basename $@) > $@
 
-e2e-essentials: bin/ginkgo e2e-cluster-templates kind-cluster ## Fulfill essential tasks for e2e testing.
+e2e-essentials: bin/ginkgo_v1 e2e-cluster-templates kind-cluster ## Fulfill essential tasks for e2e testing.
 	IMG=$(IMG_LOCAL) make manifests docker-build docker-push
 
 JOB ?= .*
 run-e2e: e2e-essentials ## Run e2e testing. JOB is an optional REGEXP to select certainn test cases to run. e.g. JOB=PR-Blocking, JOB=Conformance
 	cd test/e2e && \
-	ginkgo -v -trace -tags=e2e -focus=$(JOB) -skip=Conformance -nodes=1 --noColor=false ./... -- \
+	ginkgo_v1 -v -trace -tags=e2e -focus=$(JOB) -skip=Conformance -nodes=1 -noColor=false ./... -- \
 	    -e2e.artifacts-folder=${PROJECT_DIR}/_artifacts \
 	    -e2e.config=${PROJECT_DIR}/test/e2e/config/cloudstack.yaml \
 	    -e2e.skip-resource-cleanup=false -e2e.use-existing-cluster=true

api/v1beta1/cloudstackmachine_types.go

@@ -101,6 +101,9 @@ type CloudStackResourceIdentifier struct {
 
 type CloudStackResourceDiskOffering struct {
 	CloudStackResourceIdentifier `json:",inline"`
+	// Desired disk size. Used if disk offering is customizable as indicated by the ACS field 'Custom Disk Size'.
+	// +optional
+	CustomSize int64 `json:"customSizeInGB"`
 	// mount point the data disk uses to mount. The actual partition, mkfs and mount are done by cloud-init generated by kubeadmConfig.
 	MountPath string `json:"mountPath"`
 	// device name of data disk, for example /dev/vdb

api/v1beta1/cloudstackmachine_webhook.go

@@ -65,6 +65,9 @@ func (r *CloudStackMachine) ValidateCreate() error {
 
 	errorList = webhookutil.EnsureAtLeastOneFieldExists(r.Spec.Offering.ID, r.Spec.Offering.Name, "Offering", errorList)
 	errorList = webhookutil.EnsureAtLeastOneFieldExists(r.Spec.Template.ID, r.Spec.Template.Name, "Template", errorList)
+	if len(r.Spec.DiskOffering.ID) > 0 || len(r.Spec.DiskOffering.Name) > 0 {
+		errorList = webhookutil.EnsureIntFieldsAreNotNegative(r.Spec.DiskOffering.CustomSize, "customSizeInGB", errorList)
+	}
 
 	return webhookutil.AggregateObjErrors(r.GroupVersionKind().GroupKind(), r.Name, errorList)
 }
@@ -83,6 +86,7 @@ func (r *CloudStackMachine) ValidateUpdate(old runtime.Object) error {
 
 	errorList = webhookutil.EnsureBothFieldsAreEqual(r.Spec.Offering.ID, r.Spec.Offering.Name, oldSpec.Offering.ID, oldSpec.Offering.Name, "offering", errorList)
 	errorList = webhookutil.EnsureBothFieldsAreEqual(r.Spec.DiskOffering.ID, r.Spec.DiskOffering.Name, oldSpec.DiskOffering.ID, oldSpec.DiskOffering.Name, "diskOffering", errorList)
+	errorList = webhookutil.EnsureIntFieldsAreNotNegative(r.Spec.DiskOffering.CustomSize, "customSizeInGB", errorList)
 	errorList = webhookutil.EnsureStringFieldsAreEqual(r.Spec.DiskOffering.MountPath, oldSpec.DiskOffering.MountPath, "mountPath", errorList)
 	errorList = webhookutil.EnsureStringFieldsAreEqual(r.Spec.DiskOffering.Device, oldSpec.DiskOffering.Device, "device", errorList)
 	errorList = webhookutil.EnsureStringFieldsAreEqual(r.Spec.DiskOffering.Filesystem, oldSpec.DiskOffering.Filesystem, "filesystem", errorList)

config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackmachines.yaml

@@ -116,6 +116,11 @@ spec:
               diskOffering:
                 description: CloudStack disk offering to use.
                 properties:
+                  customSizeInGB:
+                    description: disk size if disk offering is custom disk (need to
+                      specify disk size by users)
+                    format: int64
+                    type: integer
                   device:
                     description: device name of data disk, for example /dev/vdb
                     type: string

config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackmachinestatecheckers.yaml

@@ -35,8 +35,7 @@ spec:
           metadata:
             type: object
           spec:
-            description: CloudStackMachineStateCheckerSpec defines the desired state
-              of CloudStackMachineStateChecker
+            description: CloudStackMachineStateCheckerSpec
             properties:
               instanceID:
                 description: CloudStack machine instance ID

config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackmachinetemplates.yaml

@@ -103,6 +103,11 @@ spec:
                       diskOffering:
                         description: CloudStack disk offering to use.
                         properties:
+                          customSizeInGB:
+                            description: disk size if disk offering is custom disk
+                              (need to specify disk size by users)
+                            format: int64
+                            type: integer
                           device:
                             description: device name of data disk, for example /dev/vdb
                             type: string

controllers/cloudstackaffinitygroup_controller.go

@@ -63,7 +63,7 @@ func (reconciler *CloudStackAffinityGroupReconciler) Reconcile(ctx context.Conte
 
 func (r *CloudStackAGReconciliationRunner) Reconcile() (ctrl.Result, error) {
 	controllerutil.AddFinalizer(r.ReconciliationSubject, infrav1.AffinityGroupFinalizer)
-	affinityGroup := &cloud.AffinityGroup{Name: r.ReconciliationSubject.Spec.Name, Type: "host affinity"}
+	affinityGroup := &cloud.AffinityGroup{Name: r.ReconciliationSubject.Spec.Name, Type: r.ReconciliationSubject.Spec.Type}
 	if err := r.CSUser.GetOrCreateAffinityGroup(affinityGroup); err != nil {
 		return ctrl.Result{}, err
 	}