diff options
Diffstat (limited to 'deploy/ovn4nfv-k8s-plugin.yaml')
-rw-r--r-- | deploy/ovn4nfv-k8s-plugin.yaml | 145 |
1 files changed, 128 insertions, 17 deletions
diff --git a/deploy/ovn4nfv-k8s-plugin.yaml b/deploy/ovn4nfv-k8s-plugin.yaml index 73d3ab3..ab69dd7 100644 --- a/deploy/ovn4nfv-k8s-plugin.yaml +++ b/deploy/ovn4nfv-k8s-plugin.yaml @@ -1,3 +1,94 @@ +--- + +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: networkchainings.k8s.plugin.opnfv.org +spec: + group: k8s.plugin.opnfv.org + names: + kind: NetworkChaining + listKind: NetworkChainingList + plural: networkchainings + singular: networkchaining + scope: Namespaced + subresources: + status: {} + validation: + openAPIV3Schema: + description: NetworkChaining is the Schema for the networkchainings 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/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/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: NetworkChainingSpec defines the desired state of NetworkChaining + properties: + chainType: + type: string + routingSpec: + properties: + leftNetwork: + items: + properties: + gatewayIp: + type: string + networkName: + type: string + required: + - gatewayIp + - networkName + type: object + type: array + namespace: + type: string + networkChain: + type: string + rightNetwork: + items: + properties: + gatewayIp: + type: string + networkName: + type: string + required: + - gatewayIp + - networkName + type: object + type: array + required: + - leftNetwork + - namespace + - networkChain + - rightNetwork + type: object + required: + - chainType + - routingSpec + type: object + status: + description: NetworkChainingStatus defines the observed state of NetworkChaining + properties: + state: + type: string + required: + - state + type: object + type: object + version: v1alpha1 + versions: + - name: v1alpha1 + served: true + storage: true --- @@ -380,10 +471,8 @@ metadata: name: ovn-controller-network namespace: kube-system data: - OVN_SUBNET: "10.244.64.0/18" - OVN_GATEWAYIP: "10.244.64.20/18" - OVN_EXCLUDEIPS: "10.244.64.0..10.244.64.16" - + OVN_SUBNET: "10.233.64.0/18" + OVN_GATEWAYIP: "10.233.64.1/18" --- @@ -419,7 +508,7 @@ spec: serviceAccountName: k8s-nfn-sa containers: - name: nfn-operator - image: integratedcloudnative/ovn4nfv-k8s-plugin:master + image: docker.io/integratedcloudnative/ovn4nfv-k8s-plugin:v2.0.0 command: ["/usr/local/bin/entrypoint", "operator"] imagePullPolicy: IfNotPresent envFrom: @@ -464,7 +553,7 @@ data: } --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: ovn4nfv-cni @@ -474,6 +563,9 @@ metadata: spec: updateStrategy: type: RollingUpdate + selector: + matchLabels: + app: ovn4nfv template: metadata: labels: @@ -488,16 +580,16 @@ spec: serviceAccountName: k8s-nfn-sa containers: - name: ovn4nfv - image: integratedcloudnative/ovn4nfv-k8s-plugin:master + image: docker.io/integratedcloudnative/ovn4nfv-k8s-plugin:v2.0.0 command: ["/usr/local/bin/entrypoint", "cni"] imagePullPolicy: IfNotPresent resources: requests: - cpu: "100m" - memory: "50Mi" + cpu: 100m + memory: 50Mi limits: - cpu: "100m" - memory: "50Mi" + cpu: 100m + memory: 50Mi securityContext: privileged: true volumeMounts: @@ -534,7 +626,7 @@ spec: - key: 00-network.conf path: 00-network.conf --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: nfn-agent @@ -542,6 +634,9 @@ metadata: labels: app: nfn-agent spec: + selector: + matchLabels: + app: nfn-agent updateStrategy: type: RollingUpdate template: @@ -559,15 +654,16 @@ spec: serviceAccountName: k8s-nfn-sa containers: - name: nfn-agent - image: integratedcloudnative/ovn4nfv-k8s-plugin:master + image: docker.io/integratedcloudnative/ovn4nfv-k8s-plugin:v2.0.0 command: ["/usr/local/bin/entrypoint", "agent"] + imagePullPolicy: IfNotPresent resources: requests: - cpu: "100m" - memory: "50Mi" + cpu: 100m + memory: 50Mi limits: - cpu: "100m" - memory: "50Mi" + cpu: 100m + memory: 50Mi env: - name: NFN_NODE_NAME valueFrom: @@ -586,6 +682,12 @@ spec: name: host-run-ovs - mountPath: /var/run/openvswitch name: host-var-run-ovs + - mountPath: /var/run + name: host-var-run + - mountPath: /host/proc + name: host-proc + - mountPath: /host/sys + name: host-sys - mountPath: /var/run/ovn4nfv-k8s-plugin name: host-var-cniserver-socket-dir volumes: @@ -601,3 +703,12 @@ spec: - name: host-var-cniserver-socket-dir hostPath: path: /var/run/ovn4nfv-k8s-plugin + - name: host-var-run + hostPath: + path: /var/run + - name: host-proc + hostPath: + path: /proc + - name: host-sys + hostPath: + path: /sys |