make crds apimachinery

kubernetes · Feb 8, 2024 · d6a8d80 · d6a8d80
1 parent 46b06d2
commit d6a8d80
Show file tree

Hide file tree

Showing 6 changed files with 177 additions and 1 deletion.
diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml
@@ -1561,11 +1561,20 @@ spec:
                     - type: string
                     pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                     x-kubernetes-int-or-string: true
+                  disruption:
+                    properties:
+                      consolidateAfter:
+                        type: string
+                      consolidationPolicy:
+                        type: string
+                      expireAfter:
+                        type: string
+                    type: object
                   enabled:
                     type: boolean
                   image:
                     type: string
-                  logEncoding:
+                  logFormat:
                     type: string
                   logLevel:
                     type: string

diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go
diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
diff --git a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go
diff --git a/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go
diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go