Update deprecated api (#6245)

16ec5939 · Florian Ruynat · GitHub · b064274e · 16ec5939 · 16ec5939
Unverified Commit 16ec5939 authored 4 years ago by Florian Ruynat Committed by GitHub 4 years ago
--- a/roles/kubernetes-apps/csi_driver/aws_ebs/templates/aws-ebs-csi-driver.yml.j2
+++ b/roles/kubernetes-apps/csi_driver/aws_ebs/templates/aws-ebs-csi-driver.yml.j2
 ---
-apiVersion: storage.k8s.io/v1beta1
+apiVersion: storage.k8s.io/v1
 kind: CSIDriver
 metadata:
  name: ebs.csi.aws.com

--- a/roles/kubernetes-apps/csi_driver/azuredisk/templates/azure-csi-azuredisk-driver.yml.j2
+++ b/roles/kubernetes-apps/csi_driver/azuredisk/templates/azure-csi-azuredisk-driver.yml.j2
 ---
-apiVersion: storage.k8s.io/v1beta1
+apiVersion: storage.k8s.io/v1
 kind: CSIDriver
 metadata:
  name: disk.csi.azure.com

--- a/roles/kubernetes-apps/csi_driver/azuredisk/templates/azure-csi-node-info-crd.yml.j2
+++ b/roles/kubernetes-apps/csi_driver/azuredisk/templates/azure-csi-node-info-crd.yml.j2
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  creationTimestamp: null
  name: csinodeinfos.csi.storage.k8s.io
 spec:
  group: csi.storage.k8s.io
+  scope: Cluster
  names:
    kind: CSINodeInfo
    plural: csinodeinfos
-  scope: Cluster
+  versions:
-  validation:
+  - name: v1alpha1
-    openAPIV3Schema:
+    served: true
-      properties:
+    storage: true
-        csiDrivers:
+    schema:
-          description: List of CSI drivers running on the node and their properties.
+      openAPIV3Schema:
-          items:
+        type: object
-            properties:
+        properties:
-              driver:
+          csiDrivers:
-                description: The CSI driver that this object refers to.
+            description: List of CSI drivers running on the node and their properties.
-                type: string
+            items:
-              nodeID:
+              properties:
-                description: The node from the driver point of view.
+                driver:
-                type: string
+                  description: The CSI driver that this object refers to.
-              topologyKeys:
+                  type: string
-                description: List of keys supported by the driver.
+                nodeID:
-                items:
+                  description: The node from the driver point of view.
                  type: string
-                type: array
+                topologyKeys:
-          type: array
+                  description: List of keys supported by the driver.
-  version: v1alpha1
+                  items:
+                    type: string
+                  type: array
+            type: array
 status:
  acceptedNames:
    kind: ""

--- a/roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-driver.yml.j2
+++ b/roles/kubernetes-apps/csi_driver/cinder/templates/cinder-csi-driver.yml.j2
-apiVersion: storage.k8s.io/v1beta1
+apiVersion: storage.k8s.io/v1
 kind: CSIDriver
 metadata:
  name: cinder.csi.openstack.org

--- a/roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-controller-ss.yml.j2
+++ b/roles/kubernetes-apps/csi_driver/vsphere/templates/vsphere-csi-controller-ss.yml.j2
@@ -119,7 +119,7 @@ spec:
            path: /var/lib/csi/sockets/pluginproxy/csi.vsphere.vmware.com
            type: DirectoryOrCreate
 ---
-apiVersion: storage.k8s.io/v1beta1
+apiVersion: storage.k8s.io/v1
 kind: CSIDriver
 metadata:
  name: csi.vsphere.vmware.com

--- a/roles/kubernetes-apps/ingress_controller/cert_manager/templates/crd-certificate.yml.j2
+++ b/roles/kubernetes-apps/ingress_controller/cert_manager/templates/crd-certificate.yml.j2
--- a/roles/kubernetes-apps/ingress_controller/cert_manager/templates/crd-clusterissuer.yml.j2
+++ b/roles/kubernetes-apps/ingress_controller/cert_manager/templates/crd-clusterissuer.yml.j2
--- a/roles/kubernetes-apps/ingress_controller/cert_manager/templates/crd-issuer.yml.j2
+++ b/roles/kubernetes-apps/ingress_controller/cert_manager/templates/crd-issuer.yml.j2
--- a/roles/kubernetes-apps/metrics_server/templates/metrics-apiservice.yaml.j2
+++ b/roles/kubernetes-apps/metrics_server/templates/metrics-apiservice.yaml.j2
-apiVersion: apiregistration.k8s.io/v1beta1
+apiVersion: apiregistration.k8s.io/v1
 kind: APIService
 metadata:
  name: v1beta1.metrics.k8s.io

--- a/roles/network_plugin/calico/templates/kdd-crds.yml.j2
+++ b/roles/network_plugin/calico/templates/kdd-crds.yml.j2
--- a/roles/network_plugin/kube-ovn/templates/cni-kube-ovn-crd.yml.j2
+++ b/roles/network_plugin/kube-ovn/templates/cni-kube-ovn-crd.yml.j2
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  name: ips.kubeovn.io
 spec:
  group: kubeovn.io
-  version: v1
+  versions:
+    - name: v1
+      served: true
+      storage: true
+      additionalPrinterColumns:
+      - name: Provider
+        type: string
+        jsonPath: .spec.provider
+      - name: IP
+        type: string
+        jsonPath: .spec.ipAddress
+      - name: Mac
+        type: string
+        jsonPath: .spec.macAddress
+      - name: Node
+        type: string
+        jsonPath: .spec.nodeName
+      - name: Subnet
+        type: string
+        jsonPath: .spec.subnet
+      schema:
+        openAPIV3Schema:
+          type: object
+          properties:
+            spec:
+              type: object
+              properties:
+                podName:
+                  type: string
+                namespace:
+                  type: string
+                subnet:
+                  type: string
+                attachSubnets:
+                  type: array
+                  items:
+                    type: string
+                nodeName:
+                  type: string
+                ipAddress:
+                  type: string
+                attachIps:
+                  type: array
+                  items:
+                    type: string
+                macAddress:
+                  type: string
+                attachMacs:
+                  type: array
+                  items:
+                    type: string
+                containerID:
+                  type: string
  scope: Cluster
  names:
    plural: ips
@@ -12,27 +64,111 @@ spec:
    kind: IP
    shortNames:
      - ip
-  additionalPrinterColumns:
-    - name: IP
-      type: string
-      JSONPath: .spec.ipAddress
-    - name: Mac
-      type: string
-      JSONPath: .spec.macAddress
-    - name: Node
-      type: string
-      JSONPath: .spec.nodeName
-    - name: Subnet
-      type: string
-      JSONPath: .spec.subnet
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  name: subnets.kubeovn.io
 spec:
  group: kubeovn.io
-  version: v1
+  versions:
+    - name: v1
+      served: true
+      storage: true
+      subresources:
+        status: {}
+      additionalPrinterColumns:
+      - name: Protocol
+        type: string
+        jsonPath: .spec.protocol
+      - name: CIDR
+        type: string
+        jsonPath: .spec.cidrBlock
+      - name: Private
+        type: boolean
+        jsonPath: .spec.private
+      - name: NAT
+        type: boolean
+        jsonPath: .spec.natOutgoing
+      - name: Default
+        type: boolean
+        jsonPath: .spec.default
+      - name: GatewayType
+        type: string
+        jsonPath: .spec.gatewayType
+      - name: Used
+        type: number
+        jsonPath: .status.usingIPs
+      - name: Available
+        type: number
+        jsonPath: .status.availableIPs
+      schema:
+        openAPIV3Schema:
+          type: object
+          properties:
+            status:
+              type: object
+              properties:
+                availableIPs:
+                  type: number
+                usingIPs:
+                  type: number
+                activateGateway:
+                  type: string
+                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
+            spec:
+              type: object
+              properties:
+                default:
+                  type: boolean
+                protocol:
+                  type: string
+                cidrBlock:
+                  type: string
+                namespaces:
+                  type: array
+                  items:
+                    type: string
+                gateway:
+                  type: string
+                provider:
+                  type: string
+                excludeIps:
+                  type: array
+                  items:
+                    type: string
+                gatewayType:
+                  type: string
+                allowSubnets:
+                  type: array
+                  items:
+                    type: string
+                gatewayNode:
+                  type: string
+                natOutgoing:
+                  type: boolean
+                private:
+                  type: boolean
+                vlan:
+                  type: string
+                underlayGateway:
+                  type: boolean
  scope: Cluster
  names:
    plural: subnets
@@ -40,54 +176,42 @@ spec:
    kind: Subnet
    shortNames:
      - subnet
-  subresources:
-    status: {}
-  additionalPrinterColumns:
-    - name: Provider
-      type: string
-      JSONPath: .spec.provider
-    - name: Protocol
-      type: string
-      JSONPath: .spec.protocol
-    - name: CIDR
-      type: string
-      JSONPath: .spec.cidrBlock
-    - name: Private
-      type: boolean
-      JSONPath: .spec.private
-    - name: NAT
-      type: boolean
-      JSONPath: .spec.natOutgoing
-    - name: Default
-      type: boolean
-      JSONPath: .spec.default
-    - name: GatewayType
-      type: string
-      JSONPath: .spec.gatewayType
-    - name: Used
-      type: number
-      JSONPath: .status.usingIPs
-    - name: Available
-      type: number
-      JSONPath: .status.availableIPs
-  validation:
-    openAPIV3Schema:
-      properties:
-        spec:
-          required: ["cidrBlock"]
-          properties:
-            cidrBlock:
-              type: "string"
-            gateway:
-              type: "string"
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  name: vlans.kubeovn.io
 spec:
  group: kubeovn.io
-  version: v1
+  versions:
+    - name: v1
+      served: true
+      storage: true
+      schema:
+        openAPIV3Schema:
+          type: object
+          properties:
+            spec:
+              type: object
+              properties:
+                vlanId:
+                  type: integer
+                providerInterfaceName:
+                  type: string
+                logicalInterfaceName:
+                  type: string
+                subnet:
+                  type: string
+      additionalPrinterColumns:
+      - name: VlanID
+        type: string
+        jsonPath: .spec.vlanId
+      - name: ProviderInterfaceName
+        type: string
+        jsonPath: .spec.providerInterfaceName
+      - name: Subnet
+        type: string
+        jsonPath: .spec.subnet
  scope: Cluster
  names:
    plural: vlans
@@ -95,13 +219,3 @@ spec:
    kind: Vlan
    shortNames:
      - vlan
-  additionalPrinterColumns:
-    - name: VlanID
-      type: string
-      JSONPath: .spec.vlanId
-    - name: ProviderInterfaceName
-      type: string
-      JSONPath: .spec.providerInterfaceName
-    - name: Subnet
-      type: string
-      JSONPath: .spec.subnet