Skip to content

Commit b449107

Browse files
committed
feature: externalIngress needs to be notified that we do a cluster migration, too
Signed-off-by: Sandor Szücs <sandor.szuecs@zalando.de>
1 parent 3ccf529 commit b449107

File tree

4 files changed

+37
-27
lines changed

4 files changed

+37
-27
lines changed

docs/stack_crd.yaml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,22 @@ spec:
475475
- type: integer
476476
- type: string
477477
x-kubernetes-int-or-string: true
478+
metadata:
479+
description: |-
480+
EmbeddedObjectMetaWithAnnotations defines the metadata which can be attached
481+
to a resource. It's a slimmed down version of metav1.ObjectMeta only
482+
containing annotations.
483+
properties:
484+
annotations:
485+
additionalProperties:
486+
type: string
487+
description: |-
488+
Annotations is an unstructured key value map stored with a resource that may be
489+
set by external tools to store and retrieve arbitrary metadata. They are not
490+
queryable and should be preserved when modifying objects.
491+
More info: http://kubernetes.io/docs/user-guide/annotations
492+
type: object
493+
type: object
478494
required:
479495
- backendPort
480496
type: object
@@ -1096,11 +1112,6 @@ spec:
10961112
type: object
10971113
x-kubernetes-map-type: atomic
10981114
namespaces:
1099-
description: |-
1100-
namespaces specifies a static list of namespace names that the term applies to.
1101-
The term is applied to the union of the namespaces listed in this field
1102-
and the ones selected by namespaceSelector.
1103-
null or empty namespaces list and null namespaceSelector means "this pod's namespace".
11041115
items:
11051116
type: string
11061117
type: array
@@ -6625,12 +6636,6 @@ spec:
66256636
properties:
66266637
name:
66276638
default: ""
6628-
description: |-
6629-
Name of the referent.
6630-
This field is effectively required, but due to backwards compatibility is
6631-
allowed to be empty. Instances of this type with an empty value here are
6632-
almost certainly wrong.
6633-
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
66346639
type: string
66356640
type: object
66366641
x-kubernetes-map-type: atomic

docs/stackset_crd.yaml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,22 @@ spec:
6767
- type: integer
6868
- type: string
6969
x-kubernetes-int-or-string: true
70+
metadata:
71+
description: |-
72+
EmbeddedObjectMetaWithAnnotations defines the metadata which can be attached
73+
to a resource. It's a slimmed down version of metav1.ObjectMeta only
74+
containing annotations.
75+
properties:
76+
annotations:
77+
additionalProperties:
78+
type: string
79+
description: |-
80+
Annotations is an unstructured key value map stored with a resource that may be
81+
set by external tools to store and retrieve arbitrary metadata. They are not
82+
queryable and should be preserved when modifying objects.
83+
More info: http://kubernetes.io/docs/user-guide/annotations
84+
type: object
85+
type: object
7086
required:
7187
- backendPort
7288
type: object
@@ -3582,12 +3598,6 @@ spec:
35823598
Must be set if and only if type is "Localhost".
35833599
type: string
35843600
type:
3585-
description: |-
3586-
type indicates which kind of AppArmor profile will be applied.
3587-
Valid options are:
3588-
Localhost - a profile pre-loaded on the node.
3589-
RuntimeDefault - the container runtime's default profile.
3590-
Unconfined - no AppArmor enforcement.
35913601
type: string
35923602
required:
35933603
- type
@@ -3694,13 +3704,6 @@ spec:
36943704
localhostProfile:
36953705
type: string
36963706
type:
3697-
description: |-
3698-
type indicates which kind of seccomp profile will be applied.
3699-
Valid options are:
3700-
3701-
Localhost - a profile defined in a file on the node should be used.
3702-
RuntimeDefault - the container runtime default profile should be used.
3703-
Unconfined - no profile should be applied.
37043707
type: string
37053708
required:
37063709
- type

pkg/apis/zalando.org/v1/types.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ func (s *StackSetIngressSpec) GetAnnotations() map[string]string {
124124
// backendport for ingress managed outside of stackset.
125125
// +k8s:deepcopy-gen=true
126126
type StackSetExternalIngressSpec struct {
127-
BackendPort intstr.IntOrString `json:"backendPort"`
127+
EmbeddedObjectMetaWithAnnotations `json:"metadata,omitempty"`
128+
BackendPort intstr.IntOrString `json:"backendPort"`
128129
}
129130

130131
// RouteGroupSpec defines the specification for defining a RouteGroup attached

pkg/apis/zalando.org/v1/zz_generated.deepcopy.go

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)