Skip to content

Commit e0d1bae

Browse files
committed
adds additionalMetadataList support
Signed-off-by: Deofex <[email protected]>
1 parent 0a46fcb commit e0d1bae

13 files changed

+3046
-2158
lines changed

api/v1beta2/namespace_options.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ type NamespaceOptions struct {
1313
Quota *int32 `json:"quota,omitempty"`
1414
// Specifies additional labels and annotations the Capsule operator places on any Namespace resource in the Tenant. Optional.
1515
AdditionalMetadata *api.AdditionalMetadataSpec `json:"additionalMetadata,omitempty"`
16+
// Specifies additional labels and annotations the Capsule operator places on any Namespace resource in the Tenant via a list. Optional.
17+
AdditionalMetadataList []api.AdditionalMetadataSpec `json:"additionalMetadataList,omitempty"`
1618
// Define the labels that a Tenant Owner cannot set for their Namespace resources.
1719
ForbiddenLabels api.ForbiddenListSpec `json:"forbiddenLabels,omitempty"`
1820
// Define the annotations that a Tenant Owner cannot set for their Namespace resources.

api/v1beta2/zz_generated.deepcopy.go

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

charts/capsule/crds/capsule.clastix.io_globaltenantresources.yaml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,55 @@ spec:
6464
additionalProperties:
6565
type: string
6666
type: object
67+
namespaceSelector:
68+
description: |-
69+
A label selector is a label query over a set of resources. The result of matchLabels and
70+
matchExpressions are ANDed. An empty label selector matches all objects. A null
71+
label selector matches no objects.
72+
properties:
73+
matchExpressions:
74+
description: matchExpressions is a list of label selector
75+
requirements. The requirements are ANDed.
76+
items:
77+
description: |-
78+
A label selector requirement is a selector that contains values, a key, and an operator that
79+
relates the key and values.
80+
properties:
81+
key:
82+
description: key is the label key that the selector
83+
applies to.
84+
type: string
85+
operator:
86+
description: |-
87+
operator represents a key's relationship to a set of values.
88+
Valid operators are In, NotIn, Exists and DoesNotExist.
89+
type: string
90+
values:
91+
description: |-
92+
values is an array of string values. If the operator is In or NotIn,
93+
the values array must be non-empty. If the operator is Exists or DoesNotExist,
94+
the values array must be empty. This array is replaced during a strategic
95+
merge patch.
96+
items:
97+
type: string
98+
type: array
99+
x-kubernetes-list-type: atomic
100+
required:
101+
- key
102+
- operator
103+
type: object
104+
type: array
105+
x-kubernetes-list-type: atomic
106+
matchLabels:
107+
additionalProperties:
108+
type: string
109+
description: |-
110+
matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
111+
map is equivalent to an element of matchExpressions, whose key field is "key", the
112+
operator is "In", and the values array contains only "value". The requirements are ANDed.
113+
type: object
114+
type: object
115+
x-kubernetes-map-type: atomic
67116
type: object
68117
namespaceSelector:
69118
description: |-

charts/capsule/crds/capsule.clastix.io_tenantresources.yaml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,55 @@ spec:
6666
additionalProperties:
6767
type: string
6868
type: object
69+
namespaceSelector:
70+
description: |-
71+
A label selector is a label query over a set of resources. The result of matchLabels and
72+
matchExpressions are ANDed. An empty label selector matches all objects. A null
73+
label selector matches no objects.
74+
properties:
75+
matchExpressions:
76+
description: matchExpressions is a list of label selector
77+
requirements. The requirements are ANDed.
78+
items:
79+
description: |-
80+
A label selector requirement is a selector that contains values, a key, and an operator that
81+
relates the key and values.
82+
properties:
83+
key:
84+
description: key is the label key that the selector
85+
applies to.
86+
type: string
87+
operator:
88+
description: |-
89+
operator represents a key's relationship to a set of values.
90+
Valid operators are In, NotIn, Exists and DoesNotExist.
91+
type: string
92+
values:
93+
description: |-
94+
values is an array of string values. If the operator is In or NotIn,
95+
the values array must be non-empty. If the operator is Exists or DoesNotExist,
96+
the values array must be empty. This array is replaced during a strategic
97+
merge patch.
98+
items:
99+
type: string
100+
type: array
101+
x-kubernetes-list-type: atomic
102+
required:
103+
- key
104+
- operator
105+
type: object
106+
type: array
107+
x-kubernetes-list-type: atomic
108+
matchLabels:
109+
additionalProperties:
110+
type: string
111+
description: |-
112+
matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
113+
map is equivalent to an element of matchExpressions, whose key field is "key", the
114+
operator is "In", and the values array contains only "value". The requirements are ANDed.
115+
type: object
116+
type: object
117+
x-kubernetes-map-type: atomic
69118
type: object
70119
namespaceSelector:
71120
description: |-

0 commit comments

Comments
 (0)