Merge branch 'main' into tests/add-more-domain-account-tests

Author: Joshua Reed

OWNERS

@@ -1,3 +1,4 @@
 approvers:
   - rohityadavcloud
   - davidjumani
+  - maxdrib

PROJECT

@@ -1,6 +1,6 @@
 domain: cluster.x-k8s.io
 projectName: cluster-api-provider-capc
-repo: github.com/aws/cluster-api-provider-cloudstack
+repo: sigs.k8s.io/cluster-api-provider-cloudstack
 resources:
 - api:
     crdVersion: v1
@@ -9,7 +9,7 @@ resources:
   domain: cluster.x-k8s.io
   group: infrastructure
   kind: CloudStackCluster
-  path: github.com/aws/cluster-api-provider-cloudstack/api/v1beta1
+  path: sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta1
   version: v1beta1
   webhooks:
     defaulting: true
@@ -22,7 +22,7 @@ resources:
   domain: cluster.x-k8s.io
   group: infrastructure
   kind: CloudStackMachine
-  path: github.com/aws/cluster-api-provider-cloudstack/api/v1beta1
+  path: sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta1
   version: v1beta1
   webhooks:
     defaulting: true
@@ -35,7 +35,7 @@ resources:
   domain: cluster.x-k8s.io
   group: infrastructure
   kind: CloudStackMachineTemplate
-  path: github.com/aws/cluster-api-provider-cloudstack/api/v1beta1
+  path: sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta1
   version: v1beta1
   webhooks:
     defaulting: true
@@ -48,7 +48,7 @@ resources:
   domain: cluster.x-k8s.io
   group: infrastructure
   kind: CloudStackIsolatedNetwork
-  path: github.com/aws/cluster-api-provider-cloudstack/api/v1beta1
+  path: sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta1
   version: v1beta1
 - api:
     crdVersion: v1
@@ -57,7 +57,7 @@ resources:
   domain: cluster.x-k8s.io
   group: infrastructure
   kind: CloudStackZone
-  path: github.com/aws/cluster-api-provider-cloudstack/api/v1beta1
+  path: sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta1
   version: v1beta1
 - api:
     crdVersion: v1
@@ -66,7 +66,7 @@ resources:
   domain: cluster.x-k8s.io
   group: infrastructure
   kind: CloudStackAffinityGroup
-  path: github.com/aws/cluster-api-provider-cloudstack/api/v1beta1
+  path: sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta1
   version: v1beta1
 - api:
     crdVersion: v1
@@ -75,6 +75,6 @@ resources:
   domain: cluster.x-k8s.io
   group: infrastructure
   kind: CloudStackMachineStateChecker
-  path: github.com/aws/cluster-api-provider-cloudstack/api/v1beta1
+  path: sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta1
   version: v1beta1
 version: "3"

README.md

@@ -68,11 +68,11 @@ This provider's versions are able to work on the following versions of Apache Cl
 
 ## Operating system images
 
-Note: Cluster API Provider Apache CloudStack relies on a few prerequisites which have to be already
+Note: Cluster API Provider CloudStack relies on a few prerequisites which have to be already
 installed in the used operating system images, e.g. a container runtime, kubelet, kubeadm, etc.
 Reference images can be found in [kubernetes-sigs/image-builder][image-builder].
 
-Prebuilt images can be found [here](prebuilt-images)
+Prebuilt images can be found [here][prebuilt-images]
 
 ------
 ## Getting involved and contributing
@@ -86,7 +86,7 @@ involved:
 
 ## Code of conduct
 
-Participation in the Kubernetes community is governed by the [Kubernetes Code of Conduct](code-of-conduct.md).
+Participation in the Kubernetes community is governed by the [Kubernetes Code of Conduct][code-of-conduct].
 
 ## Github issues
 
@@ -123,6 +123,7 @@ Thank you to all contributors and a special thanks to our current maintainers &
 | --------------------------------------------------------- | ------------------------------------------------------ |
 | [@rohityadavcloud](https://github.com/rohityadavcloud)    | [@rohityadavcloud](https://github.com/rohityadavcloud) |
 | [@davidjumani](https://github.com/davidjumani)            | [@davidjumani](https://github.com/davidjumani)         |
+| [@maxdrib](https://github.com/maxdrib)                    | [@maxdrib](https://github.com/maxdrib)                 |
 
 All the CAPC contributors:
 
@@ -135,11 +136,12 @@ All the CAPC contributors:
 
 [capi-quick-start]: https://cluster-api.sigs.k8s.io/user/quick-start.html
 [cluster_api]: https://sigs.k8s.io/cluster-api
+[code-of-conduct]: https://kubernetes.io/community/code-of-conduct/
 [getting_started]: https://cluster-api-cloudstack.sigs.k8s.io/getting-started.html
-[image-builder]: https://sigs.k8s.io/image-builder/tree/master/images/capi
+[image-builder]: https://github.com/kubernetes-sigs/image-builder/tree/master/images/capi
 [kops]: https://github.com/kubernetes/kops
 [kubicorn]: http://kubicorn.io/
 [prebuilt-images]: http://packages.shapeblue.com/cluster-api-provider-cloudstack/images/
 [slack]: https://kubernetes.slack.com/messages/cluster-api-cloudstack
-[new_bug_issue]: https://sigs.k8s.io/cluster-api-provider-cloudstack/issues/new
-[new_feature_issue]: https://sigs.k8s.io/cluster-api-provider-cloudstack/issues/new
+[new_bug_issue]: https://github.com/kubernetes-sigs/cluster-api-provider-cloudstack/issues/new
+[new_feature_issue]: https://github.com/kubernetes-sigs/cluster-api-provider-cloudstack/issues/new

test/unit/cloud/affinity_groups_test.go renamed to affinity_groups_test.go

@@ -20,10 +20,10 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/aws/cluster-api-provider-cloudstack/pkg/webhookutil"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation/field"
+	"sigs.k8s.io/cluster-api-provider-cloudstack/pkg/webhookutil"
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"

api/v1beta1/cloudstackcluster_webhook.go

@@ -20,10 +20,10 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/aws/cluster-api-provider-cloudstack/pkg/webhookutil"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation/field"
+	"sigs.k8s.io/cluster-api-provider-cloudstack/pkg/webhookutil"
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"

api/v1beta1/cloudstackmachine_webhook.go

@@ -21,10 +21,10 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/aws/cluster-api-provider-cloudstack/pkg/webhookutil"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation/field"
+	"sigs.k8s.io/cluster-api-provider-cloudstack/pkg/webhookutil"
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"

api/v1beta1/cloudstackmachinetemplate_webhook.go

@@ -117,8 +117,8 @@ spec:
                 description: CloudStack disk offering to use.
                 properties:
                   customSizeInGB:
-                    description: disk size if disk offering is custom disk (need to
-                      specify disk size by users)
+                    description: Desired disk size. Used if disk offering is customizable
+                      as indicated by the ACS field 'Custom Disk Size'.
                     format: int64
                     type: integer
                   device:

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

@@ -104,8 +104,9 @@ spec:
                         description: CloudStack disk offering to use.
                         properties:
                           customSizeInGB:
-                            description: disk size if disk offering is custom disk
-                              (need to specify disk size by users)
+                            description: Desired disk size. Used if disk offering
+                              is customizable as indicated by the ACS field 'Custom
+                              Disk Size'.
                             format: int64
                             type: integer
                           device:

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

@@ -22,9 +22,9 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
-	infrav1 "github.com/aws/cluster-api-provider-cloudstack/api/v1beta1"
-	csCtrlrUtils "github.com/aws/cluster-api-provider-cloudstack/controllers/utils"
-	"github.com/aws/cluster-api-provider-cloudstack/pkg/cloud"
+	infrav1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta1"
+	csCtrlrUtils "sigs.k8s.io/cluster-api-provider-cloudstack/controllers/utils"
+	"sigs.k8s.io/cluster-api-provider-cloudstack/pkg/cloud"
 )
 
 //+kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=cloudstackaffinitygroups,verbs=get;list;watch;create;update;patch;delete