Skip to content

Commit

Permalink
UPSTREAM: <carry>: Update bundle manifests after rebase
Browse files Browse the repository at this point in the history 
Signed-off-by: Christoph Stäbler <cstabler@redhat.com>
(cherry picked from commit 5ec7109)
(cherry picked from commit f1c24ac)
(cherry picked from commit ca9fd31)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit dd7c668)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 9bd1ed6)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 3a1b138)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit afc966e)
Signed-off-by: Mat Kowalski <mko@redhat.com>
  • Loading branch information
@creydr @mkowalski
creydr authored and mkowalski committed Jun 21, 2023
1 parent f24a70e commit 190f76a
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 31 deletions.
18 changes: 16 additions & 2 deletions manifests/4.12/manifests/kubernetes-nmstate-operator.clusterserviceversion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,19 @@ spec:
app: kubernetes-nmstate-operator
name: kubernetes-nmstate-operator
spec:
affinity:
nodeAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- preference:
matchExpressions:
- key: node-role.kubernetes.io/control-plane
operator: Exists
weight: 10
- preference:
matchExpressions:
- key: node-role.kubernetes.io/master
operator: Exists
weight: 1
containers:
- args:
- --zap-time-encoding=iso8601
Expand Down Expand Up @@ -221,15 +234,16 @@ spec:
capabilities:
drop:
- ALL
nodeSelector:
node-role.kubernetes.io/master: ""
priorityClassName: system-cluster-critical
securityContext:
runAsNonRoot: true
seccompProfile:
type: RuntimeDefault
serviceAccountName: nmstate-operator
tolerations:
- effect: NoSchedule
key: node-role.kubernetes.io/control-plane
operator: Exists
- effect: NoSchedule
key: node-role.kubernetes.io/master
operator: Exists
Expand Down
42 changes: 13 additions & 29 deletions manifests/4.12/manifests/nmstate.io_nmstates.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
name: nmstates.nmstate.io
spec:
Expand Down Expand Up @@ -324,9 +324,7 @@ spec:
field and the ones listed in the namespaces field.
null selector and null or empty namespaces list
means "this pod's namespace". An empty selector
({}) matches all namespaces. This field is beta-level
and is only honored when PodAffinityNamespaceSelector
feature is enabled.
({}) matches all namespaces.
properties:
matchExpressions:
description: matchExpressions is a list of label
Expand Down Expand Up @@ -381,7 +379,7 @@ spec:
term is applied to the union of the namespaces
listed in this field and the ones selected by
namespaceSelector. null or empty namespaces list
and null namespaceSelector means "this pod's namespace"
and null namespaceSelector means "this pod's namespace".
items:
type: string
type: array
Expand Down Expand Up @@ -480,8 +478,6 @@ spec:
the ones listed in the namespaces field. null selector
and null or empty namespaces list means "this pod's
namespace". An empty selector ({}) matches all namespaces.
This field is beta-level and is only honored when
PodAffinityNamespaceSelector feature is enabled.
properties:
matchExpressions:
description: matchExpressions is a list of label
Expand Down Expand Up @@ -532,7 +528,7 @@ spec:
to the union of the namespaces listed in this field
and the ones selected by namespaceSelector. null or
empty namespaces list and null namespaceSelector means
"this pod's namespace"
"this pod's namespace".
items:
type: string
type: array
Expand Down Expand Up @@ -633,9 +629,7 @@ spec:
field and the ones listed in the namespaces field.
null selector and null or empty namespaces list
means "this pod's namespace". An empty selector
({}) matches all namespaces. This field is beta-level
and is only honored when PodAffinityNamespaceSelector
feature is enabled.
({}) matches all namespaces.
properties:
matchExpressions:
description: matchExpressions is a list of label
Expand Down Expand Up @@ -690,7 +684,7 @@ spec:
term is applied to the union of the namespaces
listed in this field and the ones selected by
namespaceSelector. null or empty namespaces list
and null namespaceSelector means "this pod's namespace"
and null namespaceSelector means "this pod's namespace".
items:
type: string
type: array
Expand Down Expand Up @@ -789,8 +783,6 @@ spec:
the ones listed in the namespaces field. null selector
and null or empty namespaces list means "this pod's
namespace". An empty selector ({}) matches all namespaces.
This field is beta-level and is only honored when
PodAffinityNamespaceSelector feature is enabled.
properties:
matchExpressions:
description: matchExpressions is a list of label
Expand Down Expand Up @@ -841,7 +833,7 @@ spec:
to the union of the namespaces listed in this field
and the ones selected by namespaceSelector. null or
empty namespaces list and null namespaceSelector means
"this pod's namespace"
"this pod's namespace".
items:
type: string
type: array
Expand Down Expand Up @@ -1150,9 +1142,7 @@ spec:
field and the ones listed in the namespaces field.
null selector and null or empty namespaces list
means "this pod's namespace". An empty selector
({}) matches all namespaces. This field is beta-level
and is only honored when PodAffinityNamespaceSelector
feature is enabled.
({}) matches all namespaces.
properties:
matchExpressions:
description: matchExpressions is a list of label
Expand Down Expand Up @@ -1207,7 +1197,7 @@ spec:
term is applied to the union of the namespaces
listed in this field and the ones selected by
namespaceSelector. null or empty namespaces list
and null namespaceSelector means "this pod's namespace"
and null namespaceSelector means "this pod's namespace".
items:
type: string
type: array
Expand Down Expand Up @@ -1306,8 +1296,6 @@ spec:
the ones listed in the namespaces field. null selector
and null or empty namespaces list means "this pod's
namespace". An empty selector ({}) matches all namespaces.
This field is beta-level and is only honored when
PodAffinityNamespaceSelector feature is enabled.
properties:
matchExpressions:
description: matchExpressions is a list of label
Expand Down Expand Up @@ -1358,7 +1346,7 @@ spec:
to the union of the namespaces listed in this field
and the ones selected by namespaceSelector. null or
empty namespaces list and null namespaceSelector means
"this pod's namespace"
"this pod's namespace".
items:
type: string
type: array
Expand Down Expand Up @@ -1459,9 +1447,7 @@ spec:
field and the ones listed in the namespaces field.
null selector and null or empty namespaces list
means "this pod's namespace". An empty selector
({}) matches all namespaces. This field is beta-level
and is only honored when PodAffinityNamespaceSelector
feature is enabled.
({}) matches all namespaces.
properties:
matchExpressions:
description: matchExpressions is a list of label
Expand Down Expand Up @@ -1516,7 +1502,7 @@ spec:
term is applied to the union of the namespaces
listed in this field and the ones selected by
namespaceSelector. null or empty namespaces list
and null namespaceSelector means "this pod's namespace"
and null namespaceSelector means "this pod's namespace".
items:
type: string
type: array
Expand Down Expand Up @@ -1615,8 +1601,6 @@ spec:
the ones listed in the namespaces field. null selector
and null or empty namespaces list means "this pod's
namespace". An empty selector ({}) matches all namespaces.
This field is beta-level and is only honored when
PodAffinityNamespaceSelector feature is enabled.
properties:
matchExpressions:
description: matchExpressions is a list of label
Expand Down Expand Up @@ -1667,7 +1651,7 @@ spec:
to the union of the namespaces listed in this field
and the ones selected by namespaceSelector. null or
empty namespaces list and null namespaceSelector means
"this pod's namespace"
"this pod's namespace".
items:
type: string
type: array
Expand Down

0 comments on commit 190f76a

Please sign in to comment.