Skip to content

Commit

Permalink
Fix clusterSelector field name in v1beta1
Browse files Browse the repository at this point in the history
  • Loading branch information
mgianluc committed Jun 19, 2024
1 parent 86c3893 commit 1fc7f94
Show file tree
Hide file tree
Showing 8 changed files with 257 additions and 257 deletions.
2 changes: 1 addition & 1 deletion api/v1beta1/clusterhealthcheck_type.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ type NotificationSummary struct {
type ClusterHealthCheckSpec struct {
// Selector identifies clusters to associate to.
// +optional
ClusterSelector Selector `json:"selector,omitempty"`
ClusterSelector Selector `json:"clusterSelector,omitempty"`

// LivenessChecks is a list of source of liveness checks to evaluate.
// Anytime one of those changes, notifications will be sent
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/rolerequest_type.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const (
type RoleRequestSpec struct {
// Selector identifies clusters to associate to.
// +optional
ClusterSelector Selector `json:"selector,omitempty"`
ClusterSelector Selector `json:"clusterSelector,omitempty"`

// RoleRefs references all the Secret/ConfigMaps containing kubernetes
// Roles/ClusterRoles that need to be deployed in the matching clusters.
Expand Down
92 changes: 46 additions & 46 deletions config/crd/bases/lib.projectsveltos.io_clusterhealthchecks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,52 @@ spec:
spec:
description: ClusterHealthCheckSpec defines the desired state of ClusterHealthCheck
properties:
clusterSelector:
description: Selector identifies clusters to associate to.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
items:
description: |-
A label selector requirement is a selector that contains values, a key, and an operator that
relates the key and values.
properties:
key:
description: key is the label key that the selector applies
to.
type: string
operator:
description: |-
operator represents a key's relationship to a set of values.
Valid operators are In, NotIn, Exists and DoesNotExist.
type: string
values:
description: |-
values is an array of string values. If the operator is In or NotIn,
the values array must be non-empty. If the operator is Exists or DoesNotExist,
the values array must be empty. This array is replaced during a strategic
merge patch.
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
description: |-
matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
map is equivalent to an element of matchExpressions, whose key field is "key", the
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
livenessChecks:
description: |-
LivenessChecks is a list of source of liveness checks to evaluate.
Expand Down Expand Up @@ -575,52 +621,6 @@ spec:
- type
type: object
type: array
selector:
description: Selector identifies clusters to associate to.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
items:
description: |-
A label selector requirement is a selector that contains values, a key, and an operator that
relates the key and values.
properties:
key:
description: key is the label key that the selector applies
to.
type: string
operator:
description: |-
operator represents a key's relationship to a set of values.
Valid operators are In, NotIn, Exists and DoesNotExist.
type: string
values:
description: |-
values is an array of string values. If the operator is In or NotIn,
the values array must be non-empty. If the operator is Exists or DoesNotExist,
the values array must be empty. This array is replaced during a strategic
merge patch.
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
description: |-
matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
map is equivalent to an element of matchExpressions, whose key field is "key", the
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
required:
- livenessChecks
- notifications
Expand Down
78 changes: 39 additions & 39 deletions config/crd/bases/lib.projectsveltos.io_rolerequests.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,45 +276,7 @@ spec:
spec:
description: RoleRequestSpec defines the desired state of RoleRequest
properties:
expirationSeconds:
description: |-
ExpirationSeconds is the requested duration of validity of the TokenRequest
associated to ServiceAccount. If not specified, default value is used
format: int64
type: integer
roleRefs:
description: |-
RoleRefs references all the Secret/ConfigMaps containing kubernetes
Roles/ClusterRoles that need to be deployed in the matching clusters.
items:
description: |-
PolicyRef specifies a resource containing one or more policy
to deploy in matching Clusters.
properties:
kind:
description: 'Kind of the resource. Supported kinds are: Secrets
and ConfigMaps.'
enum:
- Secret
- ConfigMap
type: string
name:
description: Name of the referenced resource.
minLength: 1
type: string
namespace:
description: |-
Namespace of the referenced resource.
Namespace can be left empty. In such a case, namespace will
be implicit set to cluster's namespace.
type: string
required:
- kind
- name
- namespace
type: object
type: array
selector:
clusterSelector:
description: Selector identifies clusters to associate to.
properties:
matchExpressions:
Expand Down Expand Up @@ -360,6 +322,44 @@ spec:
type: object
type: object
x-kubernetes-map-type: atomic
expirationSeconds:
description: |-
ExpirationSeconds is the requested duration of validity of the TokenRequest
associated to ServiceAccount. If not specified, default value is used
format: int64
type: integer
roleRefs:
description: |-
RoleRefs references all the Secret/ConfigMaps containing kubernetes
Roles/ClusterRoles that need to be deployed in the matching clusters.
items:
description: |-
PolicyRef specifies a resource containing one or more policy
to deploy in matching Clusters.
properties:
kind:
description: 'Kind of the resource. Supported kinds are: Secrets
and ConfigMaps.'
enum:
- Secret
- ConfigMap
type: string
name:
description: Name of the referenced resource.
minLength: 1
type: string
namespace:
description: |-
Namespace of the referenced resource.
Namespace can be left empty. In such a case, namespace will
be implicit set to cluster's namespace.
type: string
required:
- kind
- name
- namespace
type: object
type: array
serviceAccountName:
description: |-
ServiceAccountName is the name of the ServiceAccount representing a tenant admin for which
Expand Down
92 changes: 46 additions & 46 deletions lib/crd/clusterhealthchecks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,52 @@ spec:
spec:
description: ClusterHealthCheckSpec defines the desired state of ClusterHealthCheck
properties:
clusterSelector:
description: Selector identifies clusters to associate to.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
items:
description: |-
A label selector requirement is a selector that contains values, a key, and an operator that
relates the key and values.
properties:
key:
description: key is the label key that the selector applies
to.
type: string
operator:
description: |-
operator represents a key's relationship to a set of values.
Valid operators are In, NotIn, Exists and DoesNotExist.
type: string
values:
description: |-
values is an array of string values. If the operator is In or NotIn,
the values array must be non-empty. If the operator is Exists or DoesNotExist,
the values array must be empty. This array is replaced during a strategic
merge patch.
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
description: |-
matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
map is equivalent to an element of matchExpressions, whose key field is "key", the
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
livenessChecks:
description: |-
LivenessChecks is a list of source of liveness checks to evaluate.
Expand Down Expand Up @@ -604,52 +650,6 @@ spec:
- type
type: object
type: array
selector:
description: Selector identifies clusters to associate to.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements.
The requirements are ANDed.
items:
description: |-
A label selector requirement is a selector that contains values, a key, and an operator that
relates the key and values.
properties:
key:
description: key is the label key that the selector applies
to.
type: string
operator:
description: |-
operator represents a key's relationship to a set of values.
Valid operators are In, NotIn, Exists and DoesNotExist.
type: string
values:
description: |-
values is an array of string values. If the operator is In or NotIn,
the values array must be non-empty. If the operator is Exists or DoesNotExist,
the values array must be empty. This array is replaced during a strategic
merge patch.
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- key
- operator
type: object
type: array
x-kubernetes-list-type: atomic
matchLabels:
additionalProperties:
type: string
description: |-
matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
map is equivalent to an element of matchExpressions, whose key field is "key", the
operator is "In", and the values array contains only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
required:
- livenessChecks
- notifications
Expand Down
Loading

0 comments on commit 1fc7f94

Please sign in to comment.