diff --git a/Makefile b/Makefile index cf667d1dad..c3fa214356 100644 --- a/Makefile +++ b/Makefile @@ -113,7 +113,7 @@ SETUP_ENVTEST_BIN := setup-envtest SETUP_ENVTEST := $(abspath $(TOOLS_BIN_DIR)/$(SETUP_ENVTEST_BIN)-$(SETUP_ENVTEST_VER)) SETUP_ENVTEST_PKG := sigs.k8s.io/controller-runtime/tools/setup-envtest -CONTROLLER_GEN_VER := v0.15.0 +CONTROLLER_GEN_VER := v0.16.1 CONTROLLER_GEN_BIN := controller-gen CONTROLLER_GEN := $(abspath $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)) CONTROLLER_GEN_PKG := sigs.k8s.io/controller-tools/cmd/controller-gen @@ -123,7 +123,7 @@ GOTESTSUM_BIN := gotestsum GOTESTSUM := $(abspath $(TOOLS_BIN_DIR)/$(GOTESTSUM_BIN)-$(GOTESTSUM_VER)) GOTESTSUM_PKG := gotest.tools/gotestsum -CONVERSION_GEN_VER := v0.30.0 +CONVERSION_GEN_VER := v0.31.0 CONVERSION_GEN_BIN := conversion-gen # We are intentionally using the binary without version suffix, to avoid the version # in generated files. diff --git a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vsphereclusteridentities.yaml b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vsphereclusteridentities.yaml index e9d16fc577..331cbe4ebb 100644 --- a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vsphereclusteridentities.yaml +++ b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vsphereclusteridentities.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: vsphereclusteridentities.infrastructure.cluster.x-k8s.io spec: group: infrastructure.cluster.x-k8s.io @@ -23,7 +23,6 @@ spec: description: |- VSphereClusterIdentity defines the account to be used for reconciling clusters - Deprecated: This type will be removed in one of the next releases. properties: apiVersion: @@ -147,6 +146,7 @@ spec: can be useful (see .node.status.conditions), the ability to deconflict is important. type: string required: + - lastTransitionTime - status - type type: object @@ -166,7 +166,6 @@ spec: description: |- VSphereClusterIdentity defines the account to be used for reconciling clusters - Deprecated: This type will be removed in one of the next releases. properties: apiVersion: @@ -290,6 +289,7 @@ spec: can be useful (see .node.status.conditions), the ability to deconflict is important. type: string required: + - lastTransitionTime - status - type type: object @@ -414,7 +414,7 @@ spec: description: |- The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. - This field may not be empty. + This field may be empty. type: string severity: description: |- diff --git a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vsphereclusters.yaml b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vsphereclusters.yaml index f7cf5e40ca..2edeb6234d 100644 --- a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vsphereclusters.yaml +++ b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vsphereclusters.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: vsphereclusters.infrastructure.cluster.x-k8s.io spec: group: infrastructure.cluster.x-k8s.io @@ -41,7 +41,6 @@ spec: description: |- VSphereCluster is the Schema for the vsphereclusters API - Deprecated: This type will be removed in one of the next releases. properties: apiVersion: @@ -68,7 +67,6 @@ spec: description: |- CloudProviderConfiguration holds the cluster-wide configuration for the vSphere cloud provider. - Deprecated: will be removed in v1alpha4. properties: disk: @@ -307,7 +305,6 @@ spec: Insecure is a flag that controls whether to validate the vSphere server's certificate. - Deprecated: will be removed in v1alpha4. type: boolean loadBalancerRef: @@ -318,7 +315,6 @@ spec: will not be true until the referenced resource is Status.Ready and has a non-empty Status.Address value. - Deprecated: will be removed in v1alpha4. properties: apiVersion: @@ -333,7 +329,6 @@ spec: the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. - TODO: this design is not final and this field is subject to change in the future. type: string kind: description: |- @@ -414,6 +409,7 @@ spec: can be useful (see .node.status.conditions), the ability to deconflict is important. type: string required: + - lastTransitionTime - status - type type: object @@ -471,7 +467,6 @@ spec: description: |- VSphereCluster is the Schema for the vsphereclusters API - Deprecated: This type will be removed in one of the next releases. properties: apiVersion: @@ -580,6 +575,7 @@ spec: can be useful (see .node.status.conditions), the ability to deconflict is important. type: string required: + - lastTransitionTime - status - type type: object @@ -804,7 +800,7 @@ spec: description: |- The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. - This field may not be empty. + This field may be empty. type: string severity: description: |- diff --git a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vsphereclustertemplates.yaml b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vsphereclustertemplates.yaml index b5f3b23244..3c7ba70ae6 100644 --- a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vsphereclustertemplates.yaml +++ b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vsphereclustertemplates.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: vsphereclustertemplates.infrastructure.cluster.x-k8s.io spec: group: infrastructure.cluster.x-k8s.io @@ -23,7 +23,6 @@ spec: description: |- VSphereClusterTemplate is the Schema for the vsphereclustertemplates API - Deprecated: This type will be removed in one of the next releases. properties: apiVersion: diff --git a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheredeploymentzones.yaml b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheredeploymentzones.yaml index ee7bc2c4e3..cca61b0e23 100644 --- a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheredeploymentzones.yaml +++ b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheredeploymentzones.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: vspheredeploymentzones.infrastructure.cluster.x-k8s.io spec: group: infrastructure.cluster.x-k8s.io @@ -23,7 +23,6 @@ spec: description: |- VSphereDeploymentZone is the Schema for the vspheredeploymentzones API - Deprecated: This type will be removed in one of the next releases. properties: apiVersion: @@ -118,6 +117,7 @@ spec: can be useful (see .node.status.conditions), the ability to deconflict is important. type: string required: + - lastTransitionTime - status - type type: object @@ -140,7 +140,6 @@ spec: description: |- VSphereDeploymentZone is the Schema for the vspheredeploymentzones API - Deprecated: This type will be removed in one of the next releases. properties: apiVersion: @@ -235,6 +234,7 @@ spec: can be useful (see .node.status.conditions), the ability to deconflict is important. type: string required: + - lastTransitionTime - status - type type: object @@ -331,7 +331,7 @@ spec: description: |- The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. - This field may not be empty. + This field may be empty. type: string severity: description: |- diff --git a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspherefailuredomains.yaml b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspherefailuredomains.yaml index aecf61e6b7..e17d0a9fc9 100644 --- a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspherefailuredomains.yaml +++ b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspherefailuredomains.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: vspherefailuredomains.infrastructure.cluster.x-k8s.io spec: group: infrastructure.cluster.x-k8s.io @@ -23,7 +23,6 @@ spec: description: |- VSphereFailureDomain is the Schema for the vspherefailuredomains API - Deprecated: This type will be removed in one of the next releases. properties: apiVersion: @@ -155,7 +154,6 @@ spec: description: |- VSphereFailureDomain is the Schema for the vspherefailuredomains API - Deprecated: This type will be removed in one of the next releases. properties: apiVersion: @@ -313,7 +311,6 @@ spec: description: |- AutoConfigure tags the Type which is specified in the Topology - Deprecated: This field is going to be removed in a future release. type: boolean name: @@ -381,7 +378,6 @@ spec: description: |- AutoConfigure tags the Type which is specified in the Topology - Deprecated: This field is going to be removed in a future release. type: boolean name: diff --git a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachines.yaml b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachines.yaml index 3f9b8fb56c..7df465ec52 100644 --- a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachines.yaml +++ b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachines.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: vspheremachines.infrastructure.cluster.x-k8s.io spec: group: infrastructure.cluster.x-k8s.io @@ -45,7 +45,6 @@ spec: description: |- VSphereMachine is the Schema for the vspheremachines API - Deprecated: This type will be removed in one of the next releases. properties: apiVersion: @@ -127,7 +126,6 @@ spec: devices: description: |- Devices is the list of network devices used by the virtual machine. - TODO(akutz) Make sure at least one network matches the ClusterSpec.CloudProviderConfiguration.Network.Name items: description: |- @@ -381,6 +379,7 @@ spec: can be useful (see .node.status.conditions), the ability to deconflict is important. type: string required: + - lastTransitionTime - status - type type: object @@ -391,7 +390,6 @@ spec: reconciling the Machine and will contain a more verbose string suitable for logging and human consumption. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is @@ -401,7 +399,6 @@ spec: spec, values that are unsupported by the controller, or the responsible controller itself being critically misconfigured. - Any transient errors that occur during the reconciliation of Machines can be added as events to the Machine object and/or logged in the controller's output. @@ -412,7 +409,6 @@ spec: reconciling the Machine and will contain a succinct value suitable for machine interpretation. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is @@ -422,7 +418,6 @@ spec: spec, values that are unsupported by the controller, or the responsible controller itself being critically misconfigured. - Any transient errors that occur during the reconciliation of Machines can be added as events to the Machine object and/or logged in the controller's output. @@ -494,7 +489,6 @@ spec: description: |- VSphereMachine is the Schema for the vspheremachines API - Deprecated: This type will be removed in one of the next releases. properties: apiVersion: @@ -576,7 +570,6 @@ spec: devices: description: |- Devices is the list of network devices used by the virtual machine. - TODO(akutz) Make sure at least one network matches the ClusterSpec.CloudProviderConfiguration.Network.Name items: description: |- @@ -830,6 +823,7 @@ spec: can be useful (see .node.status.conditions), the ability to deconflict is important. type: string required: + - lastTransitionTime - status - type type: object @@ -840,7 +834,6 @@ spec: reconciling the Machine and will contain a more verbose string suitable for logging and human consumption. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is @@ -850,7 +843,6 @@ spec: spec, values that are unsupported by the controller, or the responsible controller itself being critically misconfigured. - Any transient errors that occur during the reconciliation of Machines can be added as events to the Machine object and/or logged in the controller's output. @@ -861,7 +853,6 @@ spec: reconciling the Machine and will contain a succinct value suitable for machine interpretation. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is @@ -871,7 +862,6 @@ spec: spec, values that are unsupported by the controller, or the responsible controller itself being critically misconfigured. - Any transient errors that occur during the reconciliation of Machines can be added as events to the Machine object and/or logged in the controller's output. @@ -1022,10 +1012,8 @@ spec: The VM will be powered off forcibly after the timeout if the VM is still up and running when the PowerOffMode is set to trySoft. - This parameter only applies when the PowerOffMode is set to trySoft. - If omitted, the timeout defaults to 5 minutes. type: string hardwareVersion: @@ -1049,7 +1037,6 @@ spec: devices: description: |- Devices is the list of network devices used by the virtual machine. - TODO(akutz) Make sure at least one network matches the ClusterSpec.CloudProviderConfiguration.Network.Name items: description: |- @@ -1304,7 +1291,6 @@ spec: PreferredAPIServeCIDR is the preferred CIDR for the Kubernetes API server endpoint on this machine - Deprecated: This field is going to be removed in a future release. type: string routes: @@ -1398,7 +1384,6 @@ spec: description: |- PowerOffMode describes the desired behavior when powering off a VM. - There are three, supported power off modes: hard, soft, and trySoft. The first mode, hard, is the equivalent of a physical system's power cord being ripped from the wall. The soft mode @@ -1407,7 +1392,6 @@ spec: a graceful shutdown, and if that fails or the VM is not in a powered off state after reaching the GuestSoftPowerOffTimeout, the VM is halted. - If omitted, the mode defaults to hard. enum: - hard @@ -1507,7 +1491,7 @@ spec: description: |- The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. - This field may not be empty. + This field may be empty. type: string severity: description: |- @@ -1536,7 +1520,6 @@ spec: reconciling the Machine and will contain a more verbose string suitable for logging and human consumption. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is @@ -1546,7 +1529,6 @@ spec: spec, values that are unsupported by the controller, or the responsible controller itself being critically misconfigured. - Any transient errors that occur during the reconciliation of Machines can be added as events to the Machine object and/or logged in the controller's output. @@ -1557,7 +1539,6 @@ spec: reconciling the Machine and will contain a succinct value suitable for machine interpretation. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is @@ -1567,7 +1548,6 @@ spec: spec, values that are unsupported by the controller, or the responsible controller itself being critically misconfigured. - Any transient errors that occur during the reconciliation of Machines can be added as events to the Machine object and/or logged in the controller's output. diff --git a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachinetemplates.yaml b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachinetemplates.yaml index 9d72178886..3c6e2bb987 100644 --- a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachinetemplates.yaml +++ b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspheremachinetemplates.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: vspheremachinetemplates.infrastructure.cluster.x-k8s.io spec: group: infrastructure.cluster.x-k8s.io @@ -23,7 +23,6 @@ spec: description: |- VSphereMachineTemplate is the Schema for the vspheremachinetemplates API - Deprecated: This type will be removed in one of the next releases. properties: apiVersion: @@ -74,17 +73,14 @@ spec: and may be truncated by the length of the suffix required to make the value unique on the server. - If this field is specified and the generated name exists, the server will NOT return a 409 - instead, it will either return 201 Created or 500 with Reason ServerTimeout indicating a unique name could not be found in the time allotted, and the client should retry (optionally after the time indicated in the Retry-After header). - Applied only if Name is not specified. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency - Deprecated: This field has no function and is going to be removed in a next release. type: string labels: @@ -105,7 +101,6 @@ spec: Cannot be updated. More info: http://kubernetes.io/docs/user-guide/identifiers#names - Deprecated: This field has no function and is going to be removed in a next release. type: string namespace: @@ -115,12 +110,10 @@ spec: Not all objects are required to be scoped to a namespace - the value of this field for those objects will be empty. - Must be a DNS_LABEL. Cannot be updated. More info: http://kubernetes.io/docs/user-guide/namespaces - Deprecated: This field has no function and is going to be removed in a next release. type: string ownerReferences: @@ -130,7 +123,6 @@ spec: then an entry in this list will point to this controller, with the controller field set to true. There cannot be more than one managing controller. - Deprecated: This field has no function and is going to be removed in a next release. items: description: |- @@ -243,7 +235,6 @@ spec: devices: description: |- Devices is the list of network devices used by the virtual machine. - TODO(akutz) Make sure at least one network matches the ClusterSpec.CloudProviderConfiguration.Network.Name items: description: |- @@ -454,7 +445,6 @@ spec: description: |- VSphereMachineTemplate is the Schema for the vspheremachinetemplates API - Deprecated: This type will be removed in one of the next releases. properties: apiVersion: @@ -568,7 +558,6 @@ spec: devices: description: |- Devices is the list of network devices used by the virtual machine. - TODO(akutz) Make sure at least one network matches the ClusterSpec.CloudProviderConfiguration.Network.Name items: description: |- @@ -891,10 +880,8 @@ spec: The VM will be powered off forcibly after the timeout if the VM is still up and running when the PowerOffMode is set to trySoft. - This parameter only applies when the PowerOffMode is set to trySoft. - If omitted, the timeout defaults to 5 minutes. type: string hardwareVersion: @@ -918,7 +905,6 @@ spec: devices: description: |- Devices is the list of network devices used by the virtual machine. - TODO(akutz) Make sure at least one network matches the ClusterSpec.CloudProviderConfiguration.Network.Name items: description: |- @@ -1176,7 +1162,6 @@ spec: PreferredAPIServeCIDR is the preferred CIDR for the Kubernetes API server endpoint on this machine - Deprecated: This field is going to be removed in a future release. type: string routes: @@ -1273,7 +1258,6 @@ spec: description: |- PowerOffMode describes the desired behavior when powering off a VM. - There are three, supported power off modes: hard, soft, and trySoft. The first mode, hard, is the equivalent of a physical system's power cord being ripped from the wall. The soft mode @@ -1282,7 +1266,6 @@ spec: a graceful shutdown, and if that fails or the VM is not in a powered off state after reaching the GuestSoftPowerOffTimeout, the VM is halted. - If omitted, the mode defaults to hard. enum: - hard diff --git a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspherevms.yaml b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspherevms.yaml index f7c8474262..7f49a2c531 100644 --- a/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspherevms.yaml +++ b/config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspherevms.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: vspherevms.infrastructure.cluster.x-k8s.io spec: group: infrastructure.cluster.x-k8s.io @@ -23,7 +23,6 @@ spec: description: |- VSphereVM is the Schema for the vspherevms API - Deprecated: This type will be removed in one of the next releases. properties: apiVersion: @@ -72,7 +71,6 @@ spec: the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. - TODO: this design is not final and this field is subject to change in the future. type: string kind: description: |- @@ -155,7 +153,6 @@ spec: devices: description: |- Devices is the list of network devices used by the virtual machine. - TODO(akutz) Make sure at least one network matches the ClusterSpec.CloudProviderConfiguration.Network.Name items: description: |- @@ -401,6 +398,7 @@ spec: can be useful (see .node.status.conditions), the ability to deconflict is important. type: string required: + - lastTransitionTime - status - type type: object @@ -411,13 +409,11 @@ spec: reconciling the vspherevm and will contain a more verbose string suitable for logging and human consumption. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is fundamentally wrong with the vm. - Any transient errors that occur during the reconciliation of vspherevms can be added as events to the vspherevm object and/or logged in the controller's output. @@ -428,13 +424,11 @@ spec: reconciling the vspherevm and will contain a succinct value suitable for vm interpretation. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is fundamentally wrong with the vm. - Any transient errors that occur during the reconciliation of vspherevms can be added as events to the vspherevm object and/or logged in the controller's output. @@ -502,7 +496,6 @@ spec: description: |- VSphereVM is the Schema for the vspherevms API - Deprecated: This type will be removed in one of the next releases. properties: apiVersion: @@ -551,7 +544,6 @@ spec: the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. - TODO: this design is not final and this field is subject to change in the future. type: string kind: description: |- @@ -634,7 +626,6 @@ spec: devices: description: |- Devices is the list of network devices used by the virtual machine. - TODO(akutz) Make sure at least one network matches the ClusterSpec.CloudProviderConfiguration.Network.Name items: description: |- @@ -880,6 +871,7 @@ spec: can be useful (see .node.status.conditions), the ability to deconflict is important. type: string required: + - lastTransitionTime - status - type type: object @@ -890,13 +882,11 @@ spec: reconciling the vspherevm and will contain a more verbose string suitable for logging and human consumption. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is fundamentally wrong with the vm. - Any transient errors that occur during the reconciliation of vspherevms can be added as events to the vspherevm object and/or logged in the controller's output. @@ -907,13 +897,11 @@ spec: reconciling the vspherevm and will contain a succinct value suitable for vm interpretation. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is fundamentally wrong with the vm. - Any transient errors that occur during the reconciliation of vspherevms can be added as events to the vspherevm object and/or logged in the controller's output. @@ -1034,7 +1022,6 @@ spec: the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. - TODO: this design is not final and this field is subject to change in the future. type: string kind: description: |- @@ -1110,10 +1097,8 @@ spec: The VM will be powered off forcibly after the timeout if the VM is still up and running when the PowerOffMode is set to trySoft. - This parameter only applies when the PowerOffMode is set to trySoft. - If omitted, the timeout defaults to 5 minutes. type: string hardwareVersion: @@ -1137,7 +1122,6 @@ spec: devices: description: |- Devices is the list of network devices used by the virtual machine. - TODO(akutz) Make sure at least one network matches the ClusterSpec.CloudProviderConfiguration.Network.Name items: description: |- @@ -1392,7 +1376,6 @@ spec: PreferredAPIServeCIDR is the preferred CIDR for the Kubernetes API server endpoint on this machine - Deprecated: This field is going to be removed in a future release. type: string routes: @@ -1486,7 +1469,6 @@ spec: description: |- PowerOffMode describes the desired behavior when powering off a VM. - There are three, supported power off modes: hard, soft, and trySoft. The first mode, hard, is the equivalent of a physical system's power cord being ripped from the wall. The soft mode @@ -1495,7 +1477,6 @@ spec: a graceful shutdown, and if that fails or the VM is not in a powered off state after reaching the GuestSoftPowerOffTimeout, the VM is halted. - If omitted, the mode defaults to hard. enum: - hard @@ -1587,7 +1568,7 @@ spec: description: |- The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. - This field may not be empty. + This field may be empty. type: string severity: description: |- @@ -1616,13 +1597,11 @@ spec: reconciling the vspherevm and will contain a more verbose string suitable for logging and human consumption. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is fundamentally wrong with the vm. - Any transient errors that occur during the reconciliation of vspherevms can be added as events to the vspherevm object and/or logged in the controller's output. @@ -1633,13 +1612,11 @@ spec: reconciling the vspherevm and will contain a succinct value suitable for vm interpretation. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is fundamentally wrong with the vm. - Any transient errors that occur during the reconciliation of vspherevms can be added as events to the vspherevm object and/or logged in the controller's output. diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 6d5635b0aa..9393b57275 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -4,20 +4,13 @@ kind: ClusterRole metadata: name: manager-role rules: -- apiGroups: - - "" - resources: - - configmaps - verbs: - - get - - list - - watch - apiGroups: - "" resources: - configmaps - events - nodes + - serviceaccounts verbs: - create - delete @@ -30,21 +23,11 @@ rules: - "" resources: - configmaps/status + - persistentvolumeclaims/status verbs: - get - patch - update -- apiGroups: - - "" - resources: - - events - verbs: - - create - - get - - list - - patch - - update - - watch - apiGroups: - "" resources: @@ -56,32 +39,13 @@ rules: - list - update - watch -- apiGroups: - - "" - resources: - - persistentvolumeclaims/status - verbs: - - get - - patch - - update - apiGroups: - "" resources: - secrets + - services/status verbs: - get -- apiGroups: - - "" - resources: - - serviceaccounts - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - apiGroups: - "" resources: @@ -90,12 +54,6 @@ rules: - get - list - watch -- apiGroups: - - "" - resources: - - services/status - verbs: - - get - apiGroups: - authentication.k8s.io resources: @@ -113,22 +71,8 @@ rules: resources: - clusters - clusters/status - verbs: - - get - - list - - watch -- apiGroups: - - cluster.x-k8s.io - resources: - - machinedeployments - verbs: - - get - - list - - watch -- apiGroups: - - cluster.x-k8s.io - resources: - machinedeployments + - machines/status - machinesets verbs: - get @@ -143,14 +87,6 @@ rules: - list - patch - watch -- apiGroups: - - cluster.x-k8s.io - resources: - - machines/status - verbs: - - get - - list - - watch - apiGroups: - controlplane.cluster.x-k8s.io resources: @@ -204,78 +140,11 @@ rules: - infrastructure.cluster.x-k8s.io resources: - vsphereclusteridentities - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - - vsphereclusteridentities/status - verbs: - - get - - patch - - update -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - vsphereclusters - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - - vsphereclusters/status - verbs: - - get - - patch - - update -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - vspheredeploymentzones - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - - vspheredeploymentzones/status - verbs: - - get - - patch - - update -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - vspherefailuredomains - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - vspheremachines + - vspherevms verbs: - create - delete @@ -287,7 +156,11 @@ rules: - apiGroups: - infrastructure.cluster.x-k8s.io resources: + - vsphereclusteridentities/status + - vsphereclusters/status + - vspheredeploymentzones/status - vspheremachines/status + - vspherevms/status verbs: - get - patch @@ -300,26 +173,6 @@ rules: - get - list - watch -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - - vspherevms - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - - vspherevms/status - verbs: - - get - - patch - - update - apiGroups: - ipam.cluster.x-k8s.io resources: @@ -364,21 +217,7 @@ rules: - topology.tanzu.vmware.com resources: - availabilityzones - verbs: - - get - - list - - watch -- apiGroups: - - topology.tanzu.vmware.com - resources: - availabilityzones/status - verbs: - - get - - list - - watch -- apiGroups: - - topology.tanzu.vmware.com - resources: - zones verbs: - get @@ -397,42 +236,9 @@ rules: resources: - virtualmachineimages - virtualmachineimages/status - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - vmoperator.vmware.com - resources: - virtualmachines - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - vmoperator.vmware.com - resources: - virtualmachineservices - virtualmachineservices/status - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - vmoperator.vmware.com - resources: - virtualmachinesetresourcepolicies - virtualmachinesetresourcepolicies/status verbs: @@ -468,26 +274,9 @@ rules: - vmware.infrastructure.cluster.x-k8s.io resources: - providerserviceaccounts/status - verbs: - - get - - patch - - update -- apiGroups: - - vmware.infrastructure.cluster.x-k8s.io - resources: - - vsphereclusters - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - vmware.infrastructure.cluster.x-k8s.io - resources: - vsphereclusters/status + - vspheremachines/status + - vspheremachinetemplates/status verbs: - get - patch @@ -495,38 +284,9 @@ rules: - apiGroups: - vmware.infrastructure.cluster.x-k8s.io resources: + - vsphereclusters - vsphereclustertemplates - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - vmware.infrastructure.cluster.x-k8s.io - resources: - vspheremachines - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - vmware.infrastructure.cluster.x-k8s.io - resources: - - vspheremachines/status - verbs: - - get - - patch - - update -- apiGroups: - - vmware.infrastructure.cluster.x-k8s.io - resources: - vspheremachinetemplates verbs: - create @@ -536,11 +296,3 @@ rules: - patch - update - watch -- apiGroups: - - vmware.infrastructure.cluster.x-k8s.io - resources: - - vspheremachinetemplates/status - verbs: - - get - - patch - - update diff --git a/config/supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_providerserviceaccounts.yaml b/config/supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_providerserviceaccounts.yaml index 355fedf895..1a0e365eec 100644 --- a/config/supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_providerserviceaccounts.yaml +++ b/config/supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_providerserviceaccounts.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: providerserviceaccounts.vmware.infrastructure.cluster.x-k8s.io spec: group: vmware.infrastructure.cluster.x-k8s.io @@ -71,7 +71,6 @@ spec: the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. - TODO: this design is not final and this field is subject to change in the future. type: string kind: description: |- diff --git a/config/supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_vsphereclusters.yaml b/config/supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_vsphereclusters.yaml index 58f832a3af..a125e5614d 100644 --- a/config/supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_vsphereclusters.yaml +++ b/config/supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_vsphereclusters.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: vsphereclusters.vmware.infrastructure.cluster.x-k8s.io spec: group: vmware.infrastructure.cluster.x-k8s.io @@ -81,7 +81,7 @@ spec: description: |- The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. - This field may not be empty. + This field may be empty. type: string severity: description: |- diff --git a/config/supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_vsphereclustertemplates.yaml b/config/supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_vsphereclustertemplates.yaml index 5b343e358b..abeca51362 100644 --- a/config/supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_vsphereclustertemplates.yaml +++ b/config/supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_vsphereclustertemplates.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: vsphereclustertemplates.vmware.infrastructure.cluster.x-k8s.io spec: group: vmware.infrastructure.cluster.x-k8s.io diff --git a/config/supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_vspheremachines.yaml b/config/supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_vspheremachines.yaml index fdc2b81ee7..ae2bb83aa1 100644 --- a/config/supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_vspheremachines.yaml +++ b/config/supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_vspheremachines.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: vspheremachines.vmware.infrastructure.cluster.x-k8s.io spec: group: vmware.infrastructure.cluster.x-k8s.io @@ -103,7 +103,6 @@ spec: description: |- PowerOffMode describes the desired behavior when powering off a VM. - There are three, supported power off modes: hard, soft, and trySoft. The first mode, hard, is the equivalent of a physical system's power cord being ripped from the wall. The soft mode @@ -112,7 +111,6 @@ spec: a graceful shutdown, and if that fails or the VM is not in a powered off state after reaching 5 minutes timeout, the VM is halted. - If omitted, the mode defaults to hard. enum: - hard @@ -203,7 +201,7 @@ spec: description: |- The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. - This field may not be empty. + This field may be empty. type: string severity: description: |- @@ -232,7 +230,6 @@ spec: reconciling the Machine and will contain a more verbose string suitable for logging and human consumption. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is @@ -242,7 +239,6 @@ spec: spec, values that are unsupported by the controller, or the responsible controller itself being critically misconfigured. - Any transient errors that occur during the reconciliation of Machines can be added as events to the Machine object and/or logged in the controller's output. @@ -253,7 +249,6 @@ spec: reconciling the Machine and will contain a succinct value suitable for machine interpretation. - This field should not be set for transitive errors that a controller faces that are expected to be fixed automatically over time (like service outages), but instead indicate that something is @@ -263,7 +258,6 @@ spec: spec, values that are unsupported by the controller, or the responsible controller itself being critically misconfigured. - Any transient errors that occur during the reconciliation of Machines can be added as events to the Machine object and/or logged in the controller's output. diff --git a/config/supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_vspheremachinetemplates.yaml b/config/supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_vspheremachinetemplates.yaml index f2c8d4f433..941c97d4df 100644 --- a/config/supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_vspheremachinetemplates.yaml +++ b/config/supervisor/crd/bases/vmware.infrastructure.cluster.x-k8s.io_vspheremachinetemplates.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: vspheremachinetemplates.vmware.infrastructure.cluster.x-k8s.io spec: group: vmware.infrastructure.cluster.x-k8s.io @@ -99,7 +99,6 @@ spec: description: |- PowerOffMode describes the desired behavior when powering off a VM. - There are three, supported power off modes: hard, soft, and trySoft. The first mode, hard, is the equivalent of a physical system's power cord being ripped from the wall. The soft mode @@ -108,7 +107,6 @@ spec: a graceful shutdown, and if that fails or the VM is not in a powered off state after reaching 5 minutes timeout, the VM is halted. - If omitted, the mode defaults to hard. enum: - hard diff --git a/test/infrastructure/net-operator/config/rbac/role.yaml b/test/infrastructure/net-operator/config/rbac/role.yaml index 881758e75d..4e161ec111 100644 --- a/test/infrastructure/net-operator/config/rbac/role.yaml +++ b/test/infrastructure/net-operator/config/rbac/role.yaml @@ -8,14 +8,6 @@ rules: - "" resources: - configmaps - verbs: - - create - - get - - list - - watch -- apiGroups: - - "" - resources: - secrets verbs: - create diff --git a/test/infrastructure/vcsim/config/crd/bases/vcsim.infrastructure.cluster.x-k8s.io_controlplaneendpoints.yaml b/test/infrastructure/vcsim/config/crd/bases/vcsim.infrastructure.cluster.x-k8s.io_controlplaneendpoints.yaml index f18247aeb8..a72fa84af7 100644 --- a/test/infrastructure/vcsim/config/crd/bases/vcsim.infrastructure.cluster.x-k8s.io_controlplaneendpoints.yaml +++ b/test/infrastructure/vcsim/config/crd/bases/vcsim.infrastructure.cluster.x-k8s.io_controlplaneendpoints.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: controlplaneendpoints.vcsim.infrastructure.cluster.x-k8s.io spec: group: vcsim.infrastructure.cluster.x-k8s.io diff --git a/test/infrastructure/vcsim/config/crd/bases/vcsim.infrastructure.cluster.x-k8s.io_envvars.yaml b/test/infrastructure/vcsim/config/crd/bases/vcsim.infrastructure.cluster.x-k8s.io_envvars.yaml index 9efa44345f..c3d775ec03 100644 --- a/test/infrastructure/vcsim/config/crd/bases/vcsim.infrastructure.cluster.x-k8s.io_envvars.yaml +++ b/test/infrastructure/vcsim/config/crd/bases/vcsim.infrastructure.cluster.x-k8s.io_envvars.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: envvars.vcsim.infrastructure.cluster.x-k8s.io spec: group: vcsim.infrastructure.cluster.x-k8s.io diff --git a/test/infrastructure/vcsim/config/crd/bases/vcsim.infrastructure.cluster.x-k8s.io_vcentersimulators.yaml b/test/infrastructure/vcsim/config/crd/bases/vcsim.infrastructure.cluster.x-k8s.io_vcentersimulators.yaml index 2e7d44385f..b326741ca9 100644 --- a/test/infrastructure/vcsim/config/crd/bases/vcsim.infrastructure.cluster.x-k8s.io_vcentersimulators.yaml +++ b/test/infrastructure/vcsim/config/crd/bases/vcsim.infrastructure.cluster.x-k8s.io_vcentersimulators.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: vcentersimulators.vcsim.infrastructure.cluster.x-k8s.io spec: group: vcsim.infrastructure.cluster.x-k8s.io @@ -86,7 +86,6 @@ spec: For example: /DC0/host/DC0_C0/Resources/DC0_C0_RP1 Name prefix: RP, vcsim flag: -pool Default: 0 - TODO: model pool selection for each cluster; for now ResourcePool named "Resources" will be always used but ideally we should use RPx as per documentation above. format: int32 type: integer diff --git a/test/infrastructure/vcsim/config/crd/bases/vcsim.infrastructure.cluster.x-k8s.io_vmoperatordependencies.yaml b/test/infrastructure/vcsim/config/crd/bases/vcsim.infrastructure.cluster.x-k8s.io_vmoperatordependencies.yaml index b5c2d44b2d..50a35bd6eb 100644 --- a/test/infrastructure/vcsim/config/crd/bases/vcsim.infrastructure.cluster.x-k8s.io_vmoperatordependencies.yaml +++ b/test/infrastructure/vcsim/config/crd/bases/vcsim.infrastructure.cluster.x-k8s.io_vmoperatordependencies.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: vmoperatordependencies.vcsim.infrastructure.cluster.x-k8s.io spec: group: vcsim.infrastructure.cluster.x-k8s.io diff --git a/test/infrastructure/vcsim/config/rbac/role.yaml b/test/infrastructure/vcsim/config/rbac/role.yaml index 568e138551..0c345386f3 100644 --- a/test/infrastructure/vcsim/config/rbac/role.yaml +++ b/test/infrastructure/vcsim/config/rbac/role.yaml @@ -8,23 +8,8 @@ rules: - "" resources: - configmaps - verbs: - - create - - get - - list - - watch -- apiGroups: - - "" - resources: - - namespaces - verbs: - - get - - list - - watch -- apiGroups: - - "" - resources: - resourcequotas + - secrets verbs: - create - get @@ -33,9 +18,8 @@ rules: - apiGroups: - "" resources: - - secrets + - namespaces verbs: - - create - get - list - watch @@ -55,13 +39,6 @@ rules: - cluster.x-k8s.io resources: - clusters - verbs: - - get - - list - - watch -- apiGroups: - - cluster.x-k8s.io - resources: - machines verbs: - get @@ -71,21 +48,7 @@ rules: - infrastructure.cluster.x-k8s.io resources: - vsphereclusteridentities - verbs: - - get - - list - - watch -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - vsphereclusters - verbs: - - get - - list - - watch -- apiGroups: - - infrastructure.cluster.x-k8s.io - resources: - vspheremachines verbs: - get @@ -125,56 +88,8 @@ rules: - vcsim.infrastructure.cluster.x-k8s.io resources: - controlplaneendpoints - verbs: - - get - - list - - patch - - watch -- apiGroups: - - vcsim.infrastructure.cluster.x-k8s.io - resources: - - controlplaneendpoints/status - verbs: - - get - - patch - - update -- apiGroups: - - vcsim.infrastructure.cluster.x-k8s.io - resources: - envvars - verbs: - - get - - list - - patch - - watch -- apiGroups: - - vcsim.infrastructure.cluster.x-k8s.io - resources: - - envvars/status - verbs: - - get - - patch - - update -- apiGroups: - - vcsim.infrastructure.cluster.x-k8s.io - resources: - vcentersimulators - verbs: - - get - - list - - patch - - watch -- apiGroups: - - vcsim.infrastructure.cluster.x-k8s.io - resources: - - vcentersimulators/status - verbs: - - get - - patch - - update -- apiGroups: - - vcsim.infrastructure.cluster.x-k8s.io - resources: - vmoperatordependencies verbs: - get @@ -184,6 +99,9 @@ rules: - apiGroups: - vcsim.infrastructure.cluster.x-k8s.io resources: + - controlplaneendpoints/status + - envvars/status + - vcentersimulators/status - vmoperatordependencies/status verbs: - get @@ -193,14 +111,6 @@ rules: - vmoperator.vmware.com resources: - virtualmachineclasses - verbs: - - create - - get - - list - - watch -- apiGroups: - - vmoperator.vmware.com - resources: - virtualmachineimages verbs: - create @@ -230,13 +140,6 @@ rules: - vmware.infrastructure.cluster.x-k8s.io resources: - vsphereclusters - verbs: - - get - - list - - watch -- apiGroups: - - vmware.infrastructure.cluster.x-k8s.io - resources: - vspheremachines verbs: - get