Update CRDs from apiextensions.k8s.io/v1beta1 to v1

In Kubernetes 1.16 CRDs got out of beta and added to regular
apiextensions.k8s.io/v1. This was accompanied with some format changes.
This patch updates our CRD definitions to new version.

Change-Id: Ib5e64fe72581ef601e5df2e317900566cd476470
This commit is contained in:
Michał Dulko 2020-01-23 11:21:58 +01:00
parent bf50385f62
commit c10468cd74
4 changed files with 330 additions and 299 deletions

View File

@ -1,10 +1,9 @@
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: kuryrloadbalancers.openstack.org
spec:
group: openstack.org
version: v1
scope: Namespaced
names:
plural: kuryrloadbalancers
@ -12,16 +11,21 @@ spec:
kind: KuryrLoadBalancer
shortNames:
- klb
versions:
- name: v1
served: true
storage: true
additionalPrinterColumns:
- name: PROJECT-ID
type: string
description: The ID of the PROJECT associated to the loadbalancer
JSONPath: .spec.project_id
jsonPath: .spec.project_id
- name: Age
type: date
JSONPath: .metadata.creationTimestamp
validation:
jsonPath: .metadata.creationTimestamp
schema:
openAPIV3Schema:
type: object
properties:
spec:
type: object

View File

@ -1,27 +1,32 @@
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: kuryrnets.openstack.org
spec:
group: openstack.org
version: v1
scope: Cluster
names:
plural: kuryrnets
singular: kuryrnet
kind: KuryrNet
versions:
- name: v1
served: true
storage: true
additionalPrinterColumns:
- name: SUBNET-CIDR
type: string
description: The subnet CIDR allocated to the namespace
JSONPath: .spec.subnetCIDR
jsonPath: .spec.subnetCIDR
- name: Age
type: date
JSONPath: .metadata.creationTimestamp
validation:
jsonPath: .metadata.creationTimestamp
schema:
openAPIV3Schema:
type: object
properties:
spec:
type: object
required:
- netId
- routerId
@ -34,6 +39,8 @@ spec:
type: boolean
routerId:
type: string
sgId:
type: string
subnetCIDR:
type: string
subnetId:

View File

@ -1,10 +1,9 @@
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: kuryrnetpolicies.openstack.org
spec:
group: openstack.org
version: v1
scope: Namespaced
names:
plural: kuryrnetpolicies
@ -12,18 +11,24 @@ spec:
kind: KuryrNetPolicy
shortNames:
- knp
versions:
- name: v1
served: true
storage: true
additionalPrinterColumns:
- name: SG-ID
type: string
description: The ID of the SG associated to the policy
JSONPath: .spec.securityGroupId
jsonPath: .spec.securityGroupId
- name: Age
type: date
JSONPath: .metadata.creationTimestamp
validation:
jsonPath: .metadata.creationTimestamp
schema:
openAPIV3Schema:
type: object
properties:
spec:
type: object
required:
- egressSgRules
- ingressSgRules
@ -103,14 +108,24 @@ spec:
type: object
properties:
podSelector:
x-kubernetes-preserve-unknown-fields: true
type: object
policyTypes:
type: array
items:
type: string
ingress:
type: array
items:
x-kubernetes-preserve-unknown-fields: true
type: object
egress:
type: array
items:
x-kubernetes-preserve-unknown-fields: true
type: object
podSelector:
x-kubernetes-preserve-unknown-fields: true
type: object
securityGroupId:
type: string

View File

@ -1,10 +1,9 @@
apiVersion: apiextensions.k8s.io/v1beta1
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: network-attachment-definitions.k8s.cni.cncf.io
spec:
group: k8s.cni.cncf.io
version: v1
scope: Namespaced
names:
plural: network-attachment-definitions
@ -12,10 +11,16 @@ spec:
kind: NetworkAttachmentDefinition
shortNames:
- net-attach-def
validation:
versions:
- name: v1
served: true
storage: true
schema:
openAPIV3Schema:
type: object
properties:
spec:
type: object
properties:
config:
type: string