Skip to content

Commit

Permalink
Add support for route advertisements
Browse files Browse the repository at this point in the history 
Signed-off-by: Jaime Caamaño Ruiz <[email protected]>
  • Loading branch information
@jcaamano
jcaamano committed Sep 2, 2024
1 parent 5c37b84 commit 2550f00
Show file tree
Hide file tree
Showing 10 changed files with 472 additions and 12 deletions.
298 changes: 298 additions & 0 deletions bindata/network/ovn-kubernetes/common/001-crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3583,3 +3583,301 @@ spec:
subresources:
status: {}
{{- end }}
{{- if .OVN_ROUTE_ADVERTISEMENTS_ENABLE }}
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
name: routeadvertisements.k8s.ovn.org
spec:
group: k8s.ovn.org
names:
kind: RouteAdvertisements
listKind: RouteAdvertisementsList
plural: routeadvertisements
shortNames:
- ra
singular: routeadvertisements
scope: Cluster
versions:
- additionalPrinterColumns:
- jsonPath: .status.status
name: Status
type: string
name: v1
schema:
openAPIV3Schema:
description: RouteAdvertisements is the Schema for the routeadvertisements
API
properties:
apiVersion:
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
spec:
description: RouteAdvertisementsSpec defines the desired state of RouteAdvertisements
properties:
advertisements:
description: Advertisements determines what is advertised.
properties:
egressIP:
description: PodNetwork determines if the network EgressIPs should
be advertised.
type: boolean
podNetwork:
description: PodNetwork determines if the pod network routes should
be advertised.
type: boolean
type: object
x-kubernetes-validations:
- message: Either pod network or egress IPs should be advertised
rule: self.podNetwork || self.egressIP
frrConfigurationSelector:
description: |-
FrrConfigurationSelector determines which FRRConfiguration will the
OVN-Kubernetes driven FRRConfiguration be based on.
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
required:
- key
- operator
type: object
type: array
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
networkSelector:
description: |-
NetworkSelector determines which network routes should be advertised.
When omitted, the default cluster network routes are advertised.
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
required:
- key
- operator
type: object
type: array
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
nodeSelector:
description: NodeSelector limits the advertisements to selected nodes.
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
required:
- key
- operator
type: object
type: array
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
targetVRF:
description: TargetVRF determines which VRF the routes should be advertised
in.
type: string
type: object
status:
description: |-
RouteAdvertisementsStatus defines the observed state of RouteAdvertisements.
It should always be reconstructable from the state of the cluster and/or
outside world.
properties:
conditions:
description: |-
An array of condition objects indicating details about status of
RouteAdvertisements object.
items:
description: "Condition contains details for one aspect of the current
state of this API Resource.\n---\nThis struct is intended for
direct use as an array at the field path .status.conditions. For
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
observations of a foo's current state.\n\t // Known .status.conditions.type
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
\ // other fields\n\t}"
properties:
lastTransitionTime:
description: |-
lastTransitionTime is the last time the condition transitioned from one status to another.
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
format: date-time
type: string
message:
description: |-
message is a human readable message indicating details about the transition.
This may be an empty string.
maxLength: 32768
type: string
observedGeneration:
description: |-
observedGeneration represents the .metadata.generation that the condition was set based upon.
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
with respect to the current state of the instance.
format: int64
minimum: 0
type: integer
reason:
description: |-
reason contains a programmatic identifier indicating the reason for the condition's last transition.
Producers of specific condition types may define expected values and meanings for this field,
and whether the values are considered a guaranteed API.
The value should be a CamelCase string.
This field may not be empty.
maxLength: 1024
minLength: 1
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
type: string
status:
description: status of the condition, one of True, False, Unknown.
enum:
- "True"
- "False"
- Unknown
type: string
type:
description: |-
type of condition in CamelCase or in foo.example.com/CamelCase.
---
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
useful (see .node.status.conditions), the ability to deconflict is important.
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
required:
- lastTransitionTime
- message
- reason
- status
- type
type: object
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
status:
description: |-
A concise indication of whether the RouteAdvertisements resource is
applied with success.
type: string
type: object
type: object
served: true
storage: true
subresources:
status: {}
{{- end }}
10 changes: 10 additions & 0 deletions bindata/network/ovn-kubernetes/common/002-rbac-node.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,16 @@ rules:
- get
- list
- watch
{{- if .OVN_ROUTE_ADVERTISEMENTS_ENABLE }}
- apiGroups:
- k8s.ovn.org
resources:
- routeadvertisements
verbs:
- list
- get
- watch
{{- end}}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
Expand Down
35 changes: 35 additions & 0 deletions bindata/network/ovn-kubernetes/common/004-rbac-control-plane.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,41 @@ rules:
- create
- delete
{{- end}}
{{- if .OVN_ROUTE_ADVERTISEMENTS_ENABLE }}
- apiGroups:
- k8s.ovn.org
resources:
- routeadvertisements
verbs:
- list
- get
- watch
- apiGroups:
- k8s.ovn.org
resources:
- routeadvertisements/status
verbs:
- patch
- update
- apiGroups:
- frrk8s.metallb.io
resources:
- frrconfigurations
verbs:
- list
- get
- watch
- create
- delete
- update
- patch
- apiGroups:
- k8s.cni.cncf.io
resources:
- network-attachment-definitions
verbs:
- patch
{{- end}}

---
apiVersion: rbac.authorization.k8s.io/v1
Expand Down
6 changes: 6 additions & 0 deletions bindata/network/ovn-kubernetes/common/008-script-lib.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,11 @@ data:
multi_network_enabled_flag="--enable-multi-network"
network_segmentation_enabled_flag="--enable-network-segmentation"
fi

route_advertisements_enable_flag=
if [[ "{{.OVN_ROUTE_ADVERTISEMENTS_ENABLE}}" == "true" ]]; then
route_advertisements_enable_flag="--enable-route-advertisements"
fi

multi_network_policy_enabled_flag=
if [[ "{{.OVN_MULTI_NETWORK_POLICY_ENABLE}}" == "true" ]]; then
Expand Down Expand Up @@ -631,6 +636,7 @@ data:
${export_network_flows_flags} \
${multi_network_enabled_flag} \
${network_segmentation_enabled_flag} \
${route_advertisements_enable_flag} \
${multi_network_policy_enabled_flag} \
${admin_network_policy_enabled_flag} \
${dns_name_resolver_enabled_flag} \
Expand Down
Loading

0 comments on commit 2550f00

Please sign in to comment.