Changes required to fix validation failures when installing our CRDs …

…via clusterctl (#291) Co-authored-by: Jerry Jackson <jerry@weave.works>
weaveworks · Aug 13, 2020 · 4e38067 · 4e38067
1 parent 4f52b4a
commit 4e38067
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -82,10 +82,10 @@ pkg/apis/wksprovider/controller/manifests/manifests_vfsdata.go: $(MANIFESTS)
 	go generate ./pkg/apis/wksprovider/controller/manifests
 
 CRDS=$(shell find config/crd -name '*.yaml' -print)
-pkg/apis/wksprovider/machine/os/crds_vfsdata.go: $(CRDS)
+pkg/apis/wksprovider/machine/crds_vfsdata.go: $(CRDS)
 	go generate ./pkg/apis/wksprovider/machine/crds
 
-generated: pkg/addons/assets/assets_vfsdata.go pkg/apis/wksprovider/controller/manifests/manifests_vfsdata.go pkg/apis/wksprovider/machine/scripts/scripts_vfsdata.go pkg/apis/wksprovider/machine/os/crds_vfsdata.go
+generated: pkg/addons/assets/assets_vfsdata.go pkg/apis/wksprovider/controller/manifests/manifests_vfsdata.go pkg/apis/wksprovider/machine/scripts/scripts_vfsdata.go pkg/apis/wksprovider/machine/crds_vfsdata.go
 
 cmd/wksctl/wksctl: $(DEPS) generated
 cmd/wksctl/wksctl: cmd/wksctl/*.go

diff --git a/config/crd/cluster.x-k8s.io_clusters.yaml b/config/crd/cluster.x-k8s.io_clusters.yaml
@@ -8,6 +8,7 @@ metadata:
   creationTimestamp: null
   name: clusters.cluster.x-k8s.io
 spec:
+  preserveUnknownFields: false
   additionalPrinterColumns:
   - JSONPath: .status.phase
     description: Cluster status such as Pending/Provisioning/Provisioned/Deleting/Failed

diff --git a/config/crd/cluster.x-k8s.io_machinedeployments.yaml b/config/crd/cluster.x-k8s.io_machinedeployments.yaml
@@ -8,6 +8,7 @@ metadata:
   creationTimestamp: null
   name: machinedeployments.cluster.x-k8s.io
 spec:
+  preserveUnknownFields: false
   additionalPrinterColumns:
   - JSONPath: .status.phase
     description: MachineDeployment status such as ScalingUp/ScalingDown/Running/Failed/Unknown
@@ -149,6 +150,7 @@ spec:
                     = RollingUpdate.
                   properties:
                     maxSurge:
+                      x-kubernetes-int-or-string: true
                       anyOf:
                       - type: integer
                       - type: string
@@ -165,6 +167,7 @@ spec:
                         number of machines running at any time during the update is
                         at most 130% of desired machines.'
                     maxUnavailable:
+                      x-kubernetes-int-or-string: true
                       anyOf:
                       - type: integer
                       - type: string

diff --git a/config/crd/cluster.x-k8s.io_machinehealthchecks.yaml b/config/crd/cluster.x-k8s.io_machinehealthchecks.yaml
@@ -8,6 +8,7 @@ metadata:
   creationTimestamp: null
   name: machinehealthchecks.cluster.x-k8s.io
 spec:
+  preserveUnknownFields: false
   additionalPrinterColumns:
   - JSONPath: .spec.maxUnhealthy
     description: Maximum number of unhealthy machines allowed
@@ -60,6 +61,7 @@ spec:
               minLength: 1
               type: string
             maxUnhealthy:
+              x-kubernetes-int-or-string: true
               anyOf:
               - type: integer
               - type: string

diff --git a/config/crd/cluster.x-k8s.io_machines.yaml b/config/crd/cluster.x-k8s.io_machines.yaml
@@ -8,6 +8,7 @@ metadata:
   creationTimestamp: null
   name: machines.cluster.x-k8s.io
 spec:
+  preserveUnknownFields: false
   additionalPrinterColumns:
   - JSONPath: .spec.providerID
     description: Provider ID

diff --git a/config/crd/cluster.x-k8s.io_machinesets.yaml b/config/crd/cluster.x-k8s.io_machinesets.yaml
@@ -8,6 +8,7 @@ metadata:
   creationTimestamp: null
   name: machinesets.cluster.x-k8s.io
 spec:
+  preserveUnknownFields: false
   additionalPrinterColumns:
   - JSONPath: .status.replicas
     description: Total number of non-terminated machines targeted by this machineset