Skip to content

Commit 9655f93

Browse files
committed
Align frr-k8s manifests with frrk8sconfiguration
Signed-off-by: Ori Braunshtein <obraunsh@redhat.com>
1 parent 9fb15b5 commit 9655f93

File tree

2 files changed

+80
-5
lines changed

2 files changed

+80
-5
lines changed

bindata/network/frr-k8s/001-crd.yaml

Lines changed: 72 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.17.3
77
name: frrconfigurations.frrk8s.metallb.io
88
spec:
99
group: frrk8s.metallb.io
@@ -185,8 +185,10 @@ spec:
185185
disableMP:
186186
default: false
187187
description: |-
188-
To set if we want to disable MP BGP that will separate IPv4 and IPv6 route exchanges into distinct BGP sessions.
189-
Deprecated: DisableMP is deprecated in favor of dualStackAddressFamily.
188+
DisableMP is no longer used and has no effect.
189+
Use DualStackAddressFamily instead to enable the neighbor for both IPv4 and IPv6 address families.
190+
191+
Deprecated: This field is ignored. Use DualStackAddressFamily instead.
190192
type: boolean
191193
dualStackAddressFamily:
192194
default: false
@@ -490,7 +492,72 @@ apiVersion: apiextensions.k8s.io/v1
490492
kind: CustomResourceDefinition
491493
metadata:
492494
annotations:
493-
controller-gen.kubebuilder.io/version: v0.14.0
495+
controller-gen.kubebuilder.io/version: v0.17.3
496+
name: frrk8sconfigurations.frrk8s.metallb.io
497+
spec:
498+
group: frrk8s.metallb.io
499+
names:
500+
kind: FRRK8sConfiguration
501+
listKind: FRRK8sConfigurationList
502+
plural: frrk8sconfigurations
503+
singular: frrk8sconfiguration
504+
scope: Namespaced
505+
versions:
506+
- name: v1beta1
507+
schema:
508+
openAPIV3Schema:
509+
description: |-
510+
FRRK8sConfiguration holds the FRR Operator configuration with global
511+
settings for the K8s and FRR.
512+
properties:
513+
apiVersion:
514+
description: |-
515+
APIVersion defines the versioned schema of this representation of an object.
516+
Servers should convert recognized schemas to the latest internal value, and
517+
may reject unrecognized values.
518+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
519+
type: string
520+
kind:
521+
description: |-
522+
Kind is a string value representing the REST resource this object represents.
523+
Servers may infer this from the endpoint the client submits requests to.
524+
Cannot be updated.
525+
In CamelCase.
526+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
527+
type: string
528+
metadata:
529+
type: object
530+
spec:
531+
description: FRRK8sConfigurationSpec defines the desired state of FRRK8sConfiguration.
532+
properties:
533+
logLevel:
534+
description: |-
535+
LogLevel sets the logging verbosity for the FRR-K8s components at runtime.
536+
When configured, this value overrides the defaults established by the --log-level CLI flag.
537+
Valid values are: all, debug, info, warn, error, none.
538+
enum:
539+
- all
540+
- debug
541+
- info
542+
- warn
543+
- error
544+
- none
545+
type: string
546+
type: object
547+
status:
548+
description: FRRK8sConfigurationStatus defines the observed state of FRRK8sConfiguration.
549+
type: object
550+
type: object
551+
served: true
552+
storage: true
553+
subresources:
554+
status: {}
555+
---
556+
apiVersion: apiextensions.k8s.io/v1
557+
kind: CustomResourceDefinition
558+
metadata:
559+
annotations:
560+
controller-gen.kubebuilder.io/version: v0.17.3
494561
name: frrnodestates.frrk8s.metallb.io
495562
spec:
496563
group: frrk8s.metallb.io
@@ -555,7 +622,7 @@ apiVersion: apiextensions.k8s.io/v1
555622
kind: CustomResourceDefinition
556623
metadata:
557624
annotations:
558-
controller-gen.kubebuilder.io/version: v0.14.0
625+
controller-gen.kubebuilder.io/version: v0.17.3
559626
name: bgpsessionstates.frrk8s.metallb.io
560627
spec:
561628
group: frrk8s.metallb.io

bindata/network/frr-k8s/002-rbac.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,14 @@ rules:
124124
- get
125125
- patch
126126
- update
127+
- apiGroups:
128+
- frrk8s.metallb.io
129+
resources:
130+
- frrk8sconfigurations
131+
verbs:
132+
- get
133+
- list
134+
- watch
127135
- apiGroups:
128136
- authentication.k8s.io
129137
resources:

0 commit comments

Comments
 (0)