Skip to content

Commit

Permalink
Fix crds to add defaults for k8s 1.18+ (kubeflow#1084)
Browse files Browse the repository at this point in the history 
PR kubeflow#1045 [1] appears to have accidentally reverted kubeflow#986 [2] which added
defaults to the protocol field to work with versions of k8s 1.18+

This PR also draws on kudobuilder/operators#297 [3]


[1] kubeflow#1045

[2] kubeflow#986

[3] kudobuilder/operators#297
  • Loading branch information
@jkleckner
jkleckner authored Nov 25, 2020
1 parent 92dadb7 commit 863bf2b
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 0 deletions.
6 changes: 6 additions & 0 deletions charts/spark-operator-chart/crds/sparkoperator.k8s.io_scheduledsparkapplications.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@

---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
Expand Down Expand Up @@ -793,6 +795,7 @@ spec:
type: string
required:
- containerPort
- protocol
type: object
type: array
x-kubernetes-list-map-keys:
Expand Down Expand Up @@ -1575,6 +1578,7 @@ spec:
type: string
required:
- containerPort
- protocol
type: object
type: array
x-kubernetes-list-map-keys:
Expand Down Expand Up @@ -2590,6 +2594,7 @@ spec:
type: string
required:
- containerPort
- protocol
type: object
type: array
x-kubernetes-list-map-keys:
Expand Down Expand Up @@ -3264,6 +3269,7 @@ spec:
type: string
required:
- containerPort
- protocol
type: object
type: array
x-kubernetes-list-map-keys:
Expand Down
6 changes: 6 additions & 0 deletions charts/spark-operator-chart/crds/sparkoperator.k8s.io_sparkapplications.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@

---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
Expand Down Expand Up @@ -779,6 +781,7 @@ spec:
type: string
required:
- containerPort
- protocol
type: object
type: array
x-kubernetes-list-map-keys:
Expand Down Expand Up @@ -1561,6 +1564,7 @@ spec:
type: string
required:
- containerPort
- protocol
type: object
type: array
x-kubernetes-list-map-keys:
Expand Down Expand Up @@ -2576,6 +2580,7 @@ spec:
type: string
required:
- containerPort
- protocol
type: object
type: array
x-kubernetes-list-map-keys:
Expand Down Expand Up @@ -3250,6 +3255,7 @@ spec:
type: string
required:
- containerPort
- protocol
type: object
type: array
x-kubernetes-list-map-keys:
Expand Down
4 changes: 4 additions & 0 deletions manifest/crds/sparkoperator.k8s.io_scheduledsparkapplications.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -795,6 +795,7 @@ spec:
type: string
required:
- containerPort
- protocol
type: object
type: array
x-kubernetes-list-map-keys:
Expand Down Expand Up @@ -1577,6 +1578,7 @@ spec:
type: string
required:
- containerPort
- protocol
type: object
type: array
x-kubernetes-list-map-keys:
Expand Down Expand Up @@ -2592,6 +2594,7 @@ spec:
type: string
required:
- containerPort
- protocol
type: object
type: array
x-kubernetes-list-map-keys:
Expand Down Expand Up @@ -3266,6 +3269,7 @@ spec:
type: string
required:
- containerPort
- protocol
type: object
type: array
x-kubernetes-list-map-keys:
Expand Down
4 changes: 4 additions & 0 deletions manifest/crds/sparkoperator.k8s.io_sparkapplications.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -781,6 +781,7 @@ spec:
type: string
required:
- containerPort
- protocol
type: object
type: array
x-kubernetes-list-map-keys:
Expand Down Expand Up @@ -1563,6 +1564,7 @@ spec:
type: string
required:
- containerPort
- protocol
type: object
type: array
x-kubernetes-list-map-keys:
Expand Down Expand Up @@ -2578,6 +2580,7 @@ spec:
type: string
required:
- containerPort
- protocol
type: object
type: array
x-kubernetes-list-map-keys:
Expand Down Expand Up @@ -3252,6 +3255,7 @@ spec:
type: string
required:
- containerPort
- protocol
type: object
type: array
x-kubernetes-list-map-keys:
Expand Down

0 comments on commit 863bf2b

Please sign in to comment.