bump dependenices and update k8s registry in provider.yaml (#775)

vmware-tanzu · Feb 24, 2023 · 6177c7d · 6177c7d
1 parent 74c4588
commit 6177c7d
Show file tree

Hide file tree

Showing 12 changed files with 728 additions and 1,002 deletions.
diff --git a/Makefile b/Makefile
@@ -13,7 +13,6 @@ IMG ?= ${STAGING_REGISTRY}/${IMAGE_NAME}:${TAG}
 BYOH_BASE_IMG = byoh/node:e2e
 BYOH_BASE_IMG_DEV = byoh/node:dev
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
-CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"
 
 REPO_ROOT := $(shell pwd)
 GINKGO_FOCUS  ?=
@@ -74,8 +73,17 @@ help: ## Display this help.
 
 ##@ Development
 
-manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+manifests: controller-gen yq ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
+	$(CONTROLLER_GEN) crd:crdVersions=v1 rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+	$(YQ) -i eval 'del(.metadata.creationTimestamp)' config/crd/bases/infrastructure.cluster.x-k8s.io_bootstrapkubeconfigs.yaml
+	$(YQ) -i eval 'del(.metadata.creationTimestamp)' config/crd/bases/infrastructure.cluster.x-k8s.io_byoclusters.yaml
+	$(YQ) -i eval 'del(.metadata.creationTimestamp)' config/crd/bases/infrastructure.cluster.x-k8s.io_byoclustertemplates.yaml
+	$(YQ) -i eval 'del(.metadata.creationTimestamp)' config/crd/bases/infrastructure.cluster.x-k8s.io_byohosts.yaml
+	$(YQ) -i eval 'del(.metadata.creationTimestamp)' config/crd/bases/infrastructure.cluster.x-k8s.io_byomachines.yaml
+	$(YQ) -i eval 'del(.metadata.creationTimestamp)' config/crd/bases/infrastructure.cluster.x-k8s.io_byomachinetemplates.yaml
+	$(YQ) -i eval 'del(.metadata.creationTimestamp)' config/crd/bases/infrastructure.cluster.x-k8s.io_k8sinstallerconfigs.yaml
+	$(YQ) -i eval 'del(.metadata.creationTimestamp)' config/crd/bases/infrastructure.cluster.x-k8s.io_k8sinstallerconfigtemplates.yaml
+
 
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
@@ -196,12 +204,16 @@ publish-infra-yaml:kustomize # Generate infrastructure-components.yaml for the p
 
 CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
 controller-gen: ## Download controller-gen locally if necessary.
-	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.1)
+	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.10.0)
 
 KUSTOMIZE = $(shell pwd)/bin/kustomize
 kustomize: ## Download kustomize locally if necessary.
 	$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected])
 
+YQ = $(shell pwd)/bin/yq
+yq: ## Download kustomize locally if necessary.
+	$(call go-get-tool,$(YQ),github.com/mikefarah/yq/[email protected])
+
 host-agent-binaries: ## Builds the binaries for the host-agent
 	RELEASE_BINARY=./byoh-hostagent GOOS=linux GOARCH=amd64 GOLDFLAGS="$(LDFLAGS) $(STATIC)" \
 	HOST_AGENT_DIR=./$(HOST_AGENT_DIR) $(MAKE) host-agent-binary

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_bootstrapkubeconfigs.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_bootstrapkubeconfigs.yaml
@@ -1,11 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.1
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.10.0
   name: bootstrapkubeconfigs.infrastructure.cluster.x-k8s.io
 spec:
   group: infrastructure.cluster.x-k8s.io
@@ -16,59 +14,45 @@ spec:
     singular: bootstrapkubeconfig
   scope: Namespaced
   versions:
-  - name: v1beta1
-    schema:
-      openAPIV3Schema:
-        description: BootstrapKubeconfig is the Schema for the bootstrapkubeconfigs
-          API
-        properties:
-          apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: BootstrapKubeconfigSpec defines the desired state of BootstrapKubeconfig
-            properties:
-              apiserver:
-                description: APIServer is the address of the kubernetes cluster (https://hostname:port).
-                type: string
-              certificate-authority-data:
-                description: CertificateAuthorityData contains PEM-encoded certificate
-                  authority certificates.
-                type: string
-              insecure-skip-tls-verify:
-                default: false
-                description: InsecureSkipTLSVerify skips the validity check for the
-                  server's certificate. This will make your HTTPS connections insecure.
-                type: boolean
-            required:
-            - apiserver
-            - certificate-authority-data
-            type: object
-          status:
-            description: BootstrapKubeconfigStatus defines the observed state of BootstrapKubeconfig
-            properties:
-              bootstrapKubeconfigData:
-                description: BootstrapKubeconfigData is an optional reference to a
-                  bootstrap kubeconfig info for starting the host registration process
-                type: string
-            type: object
-        type: object
-    served: true
-    storage: true
-    subresources:
-      status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
+    - name: v1beta1
+      schema:
+        openAPIV3Schema:
+          description: BootstrapKubeconfig is the Schema for the bootstrapkubeconfigs API
+          properties:
+            apiVersion:
+              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+              type: string
+            kind:
+              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: BootstrapKubeconfigSpec defines the desired state of BootstrapKubeconfig
+              properties:
+                apiserver:
+                  description: APIServer is the address of the kubernetes cluster (https://hostname:port).
+                  type: string
+                certificate-authority-data:
+                  description: CertificateAuthorityData contains PEM-encoded certificate authority certificates.
+                  type: string
+                insecure-skip-tls-verify:
+                  default: false
+                  description: InsecureSkipTLSVerify skips the validity check for the server's certificate. This will make your HTTPS connections insecure.
+                  type: boolean
+              required:
+                - apiserver
+                - certificate-authority-data
+              type: object
+            status:
+              description: BootstrapKubeconfigStatus defines the observed state of BootstrapKubeconfig
+              properties:
+                bootstrapKubeconfigData:
+                  description: BootstrapKubeconfigData is an optional reference to a bootstrap kubeconfig info for starting the host registration process
+                  type: string
+              type: object
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_byoclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_byoclusters.yaml
@@ -1,11 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.1
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.10.0
   name: byoclusters.infrastructure.cluster.x-k8s.io
 spec:
   group: infrastructure.cluster.x-k8s.io
@@ -14,130 +12,97 @@ spec:
     listKind: ByoClusterList
     plural: byoclusters
     shortNames:
-    - byoc
+      - byoc
     singular: byocluster
   scope: Namespaced
   versions:
-  - name: v1beta1
-    schema:
-      openAPIV3Schema:
-        description: ByoCluster is the Schema for the byoclusters API
-        properties:
-          apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: ByoClusterSpec defines the desired state of ByoCluster
-            properties:
-              bundleLookupBaseRegistry:
-                description: BundleLookupBaseRegistry is the base Registry URL that
-                  is used for pulling byoh bundle images, if not set, the default
-                  will be set to https://projects.registry.vmware.com/cluster_api_provider_bringyourownhost
-                type: string
-              controlPlaneEndpoint:
-                description: ControlPlaneEndpoint represents the endpoint used to
-                  communicate with the control plane.
-                properties:
-                  host:
-                    description: Host is the hostname on which the API server is serving.
-                    type: string
-                  port:
-                    description: Port is the port on which the API server is serving.
-                    format: int32
-                    type: integer
-                required:
-                - host
-                - port
-                type: object
-            type: object
-          status:
-            description: ByoClusterStatus defines the observed state of ByoCluster
-            properties:
-              conditions:
-                description: Conditions defines current service state of the ByoCluster.
-                items:
-                  description: Condition defines an observation of a Cluster API resource
-                    operational state.
+    - name: v1beta1
+      schema:
+        openAPIV3Schema:
+          description: ByoCluster is the Schema for the byoclusters API
+          properties:
+            apiVersion:
+              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+              type: string
+            kind:
+              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: ByoClusterSpec defines the desired state of ByoCluster
+              properties:
+                bundleLookupBaseRegistry:
+                  description: BundleLookupBaseRegistry is the base Registry URL that is used for pulling byoh bundle images, if not set, the default will be set to https://projects.registry.vmware.com/cluster_api_provider_bringyourownhost
+                  type: string
+                controlPlaneEndpoint:
+                  description: ControlPlaneEndpoint represents the endpoint used to communicate with the control plane.
                   properties:
-                    lastTransitionTime:
-                      description: Last time the condition transitioned from one status
-                        to another. This should be when the underlying condition changed.
-                        If that is not known, then using the time when the API field
-                        changed is acceptable.
-                      format: date-time
-                      type: string
-                    message:
-                      description: A human readable message indicating details about
-                        the transition. This field may be empty.
-                      type: string
-                    reason:
-                      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.
-                      type: string
-                    severity:
-                      description: Severity provides an explicit classification of
-                        Reason code, so the users or machines can immediately understand
-                        the current situation and act accordingly. The Severity field
-                        MUST be set only when Status=False.
-                      type: string
-                    status:
-                      description: Status of the condition, one of True, False, Unknown.
-                      type: string
-                    type:
-                      description: Type of condition in CamelCase or in foo.example.com/CamelCase.
-                        Many .condition.type values are consistent across resources
-                        like Available, but because arbitrary conditions can be useful
-                        (see .node.status.conditions), the ability to deconflict is
-                        important.
+                    host:
+                      description: Host is the hostname on which the API server is serving.
                       type: string
+                    port:
+                      description: Port is the port on which the API server is serving.
+                      format: int32
+                      type: integer
                   required:
-                  - lastTransitionTime
-                  - status
-                  - type
+                    - host
+                    - port
                   type: object
-                type: array
-              failureDomains:
-                additionalProperties:
-                  description: FailureDomainSpec is the Schema for Cluster API failure
-                    domains. It allows controllers to understand how many failure
-                    domains a cluster can optionally span across.
-                  properties:
-                    attributes:
-                      additionalProperties:
+              type: object
+            status:
+              description: ByoClusterStatus defines the observed state of ByoCluster
+              properties:
+                conditions:
+                  description: Conditions defines current service state of the ByoCluster.
+                  items:
+                    description: Condition defines an observation of a Cluster API resource operational state.
+                    properties:
+                      lastTransitionTime:
+                        description: Last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
+                        format: date-time
+                        type: string
+                      message:
+                        description: A human readable message indicating details about the transition. This field may be empty.
+                        type: string
+                      reason:
+                        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.
+                        type: string
+                      severity:
+                        description: Severity provides an explicit classification of Reason code, so the users or machines can immediately understand the current situation and act accordingly. The Severity field MUST be set only when Status=False.
+                        type: string
+                      status:
+                        description: Status of the condition, one of True, False, Unknown.
+                        type: string
+                      type:
+                        description: Type of condition in CamelCase or in foo.example.com/CamelCase. Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important.
                         type: string
-                      description: Attributes is a free form map of attributes an
-                        infrastructure provider might use or require.
-                      type: object
-                    controlPlane:
-                      description: ControlPlane determines if this failure domain
-                        is suitable for use by control plane machines.
-                      type: boolean
+                    required:
+                      - lastTransitionTime
+                      - status
+                      - type
+                    type: object
+                  type: array
+                failureDomains:
+                  additionalProperties:
+                    description: FailureDomainSpec is the Schema for Cluster API failure domains. It allows controllers to understand how many failure domains a cluster can optionally span across.
+                    properties:
+                      attributes:
+                        additionalProperties:
+                          type: string
+                        description: Attributes is a free form map of attributes an infrastructure provider might use or require.
+                        type: object
+                      controlPlane:
+                        description: ControlPlane determines if this failure domain is suitable for use by control plane machines.
+                        type: boolean
+                    type: object
+                  description: FailureDomains is a list of failure domain objects synced from the infrastructure provider.
                   type: object
-                description: FailureDomains is a list of failure domain objects synced
-                  from the infrastructure provider.
-                type: object
-              ready:
-                type: boolean
-            type: object
-        type: object
-    served: true
-    storage: true
-    subresources:
-      status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
+                ready:
+                  type: boolean
+              type: object
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}