From db796b4368bb75f1d95fa3a12c2164c1242716b2 Mon Sep 17 00:00:00 2001 From: hzma Date: Wed, 16 Nov 2022 13:40:21 +0800 Subject: [PATCH] sync crd yamls (#2040) --- dist/images/install.sh | 10 --- yamls/crd.yaml | 139 +++++++++++++++++++++++++++++++++++++++++ yamls/ovn-dpdk.yaml | 6 +- yamls/ovn-ha.yaml | 6 +- yamls/ovn.yaml | 4 +- 5 files changed, 152 insertions(+), 13 deletions(-) diff --git a/dist/images/install.sh b/dist/images/install.sh index 1ac93c66873..44ba4714274 100755 --- a/dist/images/install.sh +++ b/dist/images/install.sh @@ -1872,16 +1872,6 @@ rules: - leases verbs: - "*" - - apiGroups: - - "k8s.cni.cncf.io" - resources: - - network-attachment-definitions - verbs: - - create - - delete - - get - - list - - update - apiGroups: - "kubevirt.io" resources: diff --git a/yamls/crd.yaml b/yamls/crd.yaml index da30a33c4e1..33b8bb5ccaf 100644 --- a/yamls/crd.yaml +++ b/yamls/crd.yaml @@ -1,5 +1,144 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition +metadata: + name: vpc-dnses.kubeovn.io +spec: + group: kubeovn.io + names: + plural: vpc-dnses + singular: vpc-dns + shortNames: + - vpc-dns + kind: VpcDns + listKind: VpcDnsList + scope: Cluster + versions: + - additionalPrinterColumns: + - jsonPath: .status.active + name: Active + type: boolean + - jsonPath: .spec.vpc + name: Vpc + type: string + - jsonPath: .spec.subnet + name: Subnet + type: string + name: v1 + served: true + storage: true + subresources: + status: {} + schema: + openAPIV3Schema: + type: object + properties: + spec: + type: object + properties: + vpc: + type: string + subnet: + type: string + status: + type: object + properties: + active: + type: boolean + conditions: + type: array + items: + type: object + properties: + type: + type: string + status: + type: string + reason: + type: string + message: + type: string + lastUpdateTime: + type: string + lastTransitionTime: + type: string +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + name: switch-lb-rules.kubeovn.io +spec: + group: kubeovn.io + names: + plural: switch-lb-rules + singular: switch-lb-rule + shortNames: + - slr + kind: SwitchLBRule + listKind: SwitchLBRuleList + scope: Cluster + versions: + - additionalPrinterColumns: + - jsonPath: .spec.vip + name: vip + type: string + - jsonPath: .status.ports + name: port(s) + type: string + - jsonPath: .status.service + name: service + type: string + - jsonPath: .metadata.creationTimestamp + name: age + type: date + name: v1 + served: true + storage: true + subresources: + status: {} + schema: + openAPIV3Schema: + type: object + properties: + spec: + type: object + properties: + namespace: + type: string + vip: + type: string + sessionAffinity: + type: string + ports: + items: + properties: + name: + type: string + port: + type: integer + minimum: 1 + maximum: 65535 + protocol: + type: string + targetPort: + type: integer + minimum: 1 + maximum: 65535 + type: object + type: array + selector: + items: + type: string + type: array + status: + type: object + properties: + ports: + type: string + service: + type: string +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition metadata: name: iptables-eips.kubeovn.io spec: diff --git a/yamls/ovn-dpdk.yaml b/yamls/ovn-dpdk.yaml index a92c7f388f3..e5ef2623b3e 100644 --- a/yamls/ovn-dpdk.yaml +++ b/yamls/ovn-dpdk.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: ovn - namespace: kube-system + namespace: kube-system --- apiVersion: rbac.authorization.k8s.io/v1 @@ -38,6 +38,10 @@ rules: - iptables-fip-rules/status - iptables-dnat-rules/status - iptables-snat-rules/status + - switch-lb-rules + - switch-lb-rules/status + - vpc-dnses + - vpc-dnses/status verbs: - "*" - apiGroups: diff --git a/yamls/ovn-ha.yaml b/yamls/ovn-ha.yaml index 9801ebfc93f..72cc373e186 100644 --- a/yamls/ovn-ha.yaml +++ b/yamls/ovn-ha.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: ovn - namespace: kube-system + namespace: kube-system --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole @@ -37,6 +37,10 @@ rules: - iptables-fip-rules/status - iptables-dnat-rules/status - iptables-snat-rules/status + - switch-lb-rules + - switch-lb-rules/status + - vpc-dnses + - vpc-dnses/status verbs: - "*" - apiGroups: diff --git a/yamls/ovn.yaml b/yamls/ovn.yaml index 22f5b07af97..6919e8754bd 100644 --- a/yamls/ovn.yaml +++ b/yamls/ovn.yaml @@ -39,6 +39,8 @@ rules: - iptables-snat-rules/status - switch-lb-rules - switch-lb-rules/status + - vpc-dnses + - vpc-dnses/status verbs: - "*" - apiGroups: @@ -332,7 +334,7 @@ kind: DaemonSet apiVersion: apps/v1 metadata: name: ovs-ovn - namespace: kube-system + namespace: kube-system annotations: kubernetes.io/description: | This daemon set launches the openvswitch daemon.