Skip to content

Commit

Permalink
fix manifest yamls
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhangzujian
zhangzujian committed Apr 20, 2023
1 parent 1d6a0fe commit b05aac3
Show file tree
Hide file tree
Showing 7 changed files with 460 additions and 80 deletions.
2 changes: 1 addition & 1 deletion dist/images/install.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3820,7 +3820,7 @@ metadata:
namespace: kube-system
annotations:
kubernetes.io/description: |
This daemon set launches the openvswitch daemon.
This daemon set launches the pinger daemon.
spec:
selector:
matchLabels:
Expand Down
34 changes: 27 additions & 7 deletions yamls/crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1092,24 +1092,30 @@ spec:
subresources:
status: {}
additionalPrinterColumns:
- jsonPath: .status.vpc
name: Vpc
- jsonPath: .spec.ovnEip
name: Eip
type: string
- jsonPath: .status.protocol
name: Protocol
type: string
- jsonPath: .status.v4Eip
name: V4Eip
type: string
- jsonPath: .status.v4Ip
name: V4Ip
type: string
- jsonPath: .status.ready
name: Ready
type: boolean
- jsonPath: .spec.ipType
name: IpType
- jsonPath: .status.internalPort
name: InternalPort
type: string
- jsonPath: .status.externalPort
name: ExternalPort
type: string
- jsonPath: .spec.ipName
name: IpName
type: string
- jsonPath: .status.ready
name: Ready
type: boolean
schema:
openAPIV3Schema:
type: object
Expand All @@ -1127,6 +1133,14 @@ spec:
type: string
vpc:
type: string
externalPort:
type: string
internalPort:
type: string
protocol:
type: string
ipName:
type: string
conditions:
type: array
items:
Expand All @@ -1153,6 +1167,12 @@ spec:
type: string
ipName:
type: string
externalPort:
type: string
internalPort:
type: string
protocol:
type: string
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down
127 changes: 114 additions & 13 deletions yamls/kube-ovn-dual-stack.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
kind: ConfigMap
apiVersion: v1
metadata:
name: ovn-vpc-nat-config
namespace: kube-system
annotations:
kubernetes.io/description: |
kube-ovn vpc-nat common config
data:
image: kubeovn/vpc-nat-gateway:v1.12.0
---
kind: ConfigMap
apiVersion: v1
metadata:
name: ovn-vpc-nat-gw-config
namespace: kube-system
data:
enable-vpc-nat-gw: "false"
---
kind: Deployment
apiVersion: apps/v1
Expand Down Expand Up @@ -41,25 +59,37 @@ spec:
hostNetwork: true
containers:
- name: kube-ovn-controller
image: "kubeovn/kube-ovn:v1.10.0"
image: "kubeovn/kube-ovn:v1.12.0"
imagePullPolicy: IfNotPresent
args:
- /kube-ovn/start-controller.sh
- --default-cidr=10.16.0.0/16,fd00:10:16::/64
- --default-gateway=10.16.0.1,fd00:10:16::1
- --default-gateway-check=true
- --default-logical-gateway=false
- --default-u2o-interconnection=false
- --default-exclude-ips=
- --node-switch-cidr=100.64.0.0/16,fd00:100:64::/64
- --service-cluster-ip-range=10.96.0.0/12,fd00:10:96::/112
- --network-type=geneve
- --default-interface-name=
- --default-exchange-link-name=false
- --default-vlan-id=100
- --ls-dnat-mod-dl-dst=true
- --pod-nic-type=veth-pair
- --enable-lb=true
- --enable-np=true
- --enable-eip-snat=true
- --enable-external-vpc=true
- --logtostderr=false
- --alsologtostderr=true
- --gc-interval=360
- --inspect-interval=20
- --log_file=/var/log/kube-ovn/kube-ovn-controller.log
- --log_file_max_size=0
- --enable-lb-svc=false
- --keep-vm-ip=true
- --pod-default-fip-type=
env:
- name: ENABLE_SSL
value: "false"
Expand All @@ -79,9 +109,13 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIPs
- name: ENABLE_BIND_LOCAL_IP
value: "true"
volumeMounts:
- mountPath: /etc/localtime
name: localtime
- mountPath: /var/log/kube-ovn
name: kube-ovn-log
- mountPath: /var/run/tls
name: kube-ovn-tls
readinessProbe:
Expand Down Expand Up @@ -111,6 +145,9 @@ spec:
- name: localtime
hostPath:
path: /etc/localtime
- name: kube-ovn-log
hostPath:
path: /var/log/kube-ovn
- name: kube-ovn-tls
secret:
optional: true
Expand Down Expand Up @@ -149,7 +186,7 @@ spec:
hostPID: true
initContainers:
- name: install-cni
image: "kubeovn/kube-ovn:v1.10.0"
image: "kubeovn/kube-ovn:v1.12.0"
imagePullPolicy: IfNotPresent
command: ["/kube-ovn/install-cni.sh"]
securityContext:
Expand All @@ -158,9 +195,11 @@ spec:
volumeMounts:
- mountPath: /opt/cni/bin
name: cni-bin
- mountPath: /usr/local/bin
name: local-bin
containers:
- name: cni-server
image: "kubeovn/kube-ovn:v1.10.0"
image: "kubeovn/kube-ovn:v1.12.0"
imagePullPolicy: IfNotPresent
command:
- bash
Expand All @@ -170,8 +209,14 @@ spec:
- --encap-checksum=true
- --service-cluster-ip-range=10.96.0.0/12,fd00:10:96::/112
- --iface=
- --dpdk-tunnel-iface=br-phy
- --network-type=geneve
- --default-interface-name=
- --cni-conf-name=01-kube-ovn.conflist
- --logtostderr=false
- --alsologtostderr=true
- --log_file=/var/log/kube-ovn/kube-ovn-cni.log
- --log_file_max_size=0
securityContext:
runAsUser: 0
privileged: true
Expand All @@ -186,27 +231,49 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: MODULES
value: kube_ovn_fastpath.ko
- name: RPMS
value: openvswitch-kmod
- name: POD_IPS
valueFrom:
fieldRef:
fieldPath: status.podIPs
- name: ENABLE_BIND_LOCAL_IP
value: "true"
- name: DBUS_SYSTEM_BUS_ADDRESS
value: "unix:path=/host/var/run/dbus/system_bus_socket"
volumeMounts:
- name: host-modules
mountPath: /lib/modules
readOnly: true
- name: shared-dir
mountPath: /var/lib/kubelet/pods
- mountPath: /etc/openvswitch
name: systemid
- mountPath: /etc/cni/net.d
name: cni-conf
- mountPath: /run/openvswitch
name: host-run-ovs
mountPropagation: HostToContainer
- mountPath: /run/ovn
name: host-run-ovn
- mountPath: /host/var/run/dbus
name: host-dbus
mountPropagation: HostToContainer
- mountPath: /var/run/netns
name: host-ns
mountPropagation: HostToContainer
- mountPath: /var/log/kube-ovn
name: kube-ovn-log
- mountPath: /var/log/openvswitch
name: host-log-ovs
- mountPath: /var/log/ovn
name: host-log-ovn
- mountPath: /etc/localtime
name: localtime
- mountPath: /tmp
name: tmp
livenessProbe:
failureThreshold: 3
initialDelaySeconds: 30
Expand All @@ -217,16 +284,15 @@ spec:
timeoutSeconds: 3
readinessProbe:
failureThreshold: 3
initialDelaySeconds: 30
periodSeconds: 7
successThreshold: 1
tcpSocket:
port: 10665
timeoutSeconds: 3
resources:
requests:
cpu: 200m
memory: 200Mi
cpu: 100m
memory: 100Mi
limits:
cpu: 1000m
memory: 1Gi
Expand All @@ -236,6 +302,9 @@ spec:
- name: host-modules
hostPath:
path: /lib/modules
- name: shared-dir
hostPath:
path: /var/lib/kubelet/pods
- name: systemid
hostPath:
path: /etc/origin/openvswitch
Expand All @@ -254,9 +323,27 @@ spec:
- name: host-ns
hostPath:
path: /var/run/netns
- name: host-dbus
hostPath:
path: /var/run/dbus
- name: host-log-ovs
hostPath:
path: /var/log/openvswitch
- name: kube-ovn-log
hostPath:
path: /var/log/kube-ovn
- name: host-log-ovn
hostPath:
path: /var/log/ovn
- name: localtime
hostPath:
path: /etc/localtime
- name: tmp
hostPath:
path: /tmp
- name: local-bin
hostPath:
path: /usr/local/bin

---
kind: DaemonSet
Expand Down Expand Up @@ -285,11 +372,16 @@ spec:
hostPID: true
containers:
- name: pinger
image: "kubeovn/kube-ovn:v1.10.0"
image: "kubeovn/kube-ovn:v1.12.0"
command:
- /kube-ovn/kube-ovn-pinger
args:
- --external-address=114.114.114.114,2400:3200::1
- --external-dns=alauda.cn
- --logtostderr=false
- --alsologtostderr=true
- --log_file=/var/log/kube-ovn/kube-ovn-pinger.log
- --log_file_max_size=0
imagePullPolicy: IfNotPresent
securityContext:
runAsUser: 0
Expand Down Expand Up @@ -332,14 +424,16 @@ spec:
name: host-log-ovs
- mountPath: /var/log/ovn
name: host-log-ovn
- mountPath: /var/log/kube-ovn
name: kube-ovn-log
- mountPath: /etc/localtime
name: localtime
- mountPath: /var/run/tls
name: kube-ovn-tls
resources:
requests:
cpu: 100m
memory: 200Mi
memory: 100Mi
limits:
cpu: 200m
memory: 400Mi
Expand All @@ -364,6 +458,9 @@ spec:
- name: host-log-ovs
hostPath:
path: /var/log/openvswitch
- name: kube-ovn-log
hostPath:
path: /var/log/kube-ovn
- name: host-log-ovn
hostPath:
path: /var/log/ovn
Expand Down Expand Up @@ -412,12 +509,12 @@ spec:
matchLabels:
app: kube-ovn-monitor
topologyKey: kubernetes.io/hostname
priorityClassName: system-node-critical
priorityClassName: system-cluster-critical
serviceAccountName: ovn
hostNetwork: true
containers:
- name: kube-ovn-monitor
image: "kubeovn/kube-ovn:v1.10.0"
image: "kubeovn/kube-ovn:v1.12.0"
imagePullPolicy: IfNotPresent
command: ["/kube-ovn/start-ovn-monitor.sh"]
args:
Expand All @@ -439,6 +536,8 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIPs
- name: ENABLE_BIND_LOCAL_IP
value: "true"
resources:
requests:
cpu: 200m
Expand Down Expand Up @@ -522,12 +621,14 @@ metadata:
labels:
app: kube-ovn-monitor
spec:
ipFamilyPolicy: PreferDualStack
selector:
app: kube-ovn-monitor
ports:
- name: metrics
port: 10661
type: ClusterIP
ipFamilyPolicy: PreferDualStack
selector:
app: kube-ovn-monitor
sessionAffinity: None
---
kind: Service
apiVersion: v1
Expand Down
Loading

0 comments on commit b05aac3

Please sign in to comment.