-
Notifications
You must be signed in to change notification settings - Fork 228
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update Kuryr K8s resources to latest versions
Webhooks and CRDs got out of beta with K8s 1.16. This commit updates Kuryr resources to use the new v1 versions of them.
- Loading branch information
Showing
2 changed files
with
148 additions
and
126 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,161 +1,181 @@ | ||
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 | ||
additionalPrinterColumns: | ||
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: | ||
openAPIV3Schema: | ||
properties: | ||
spec: | ||
required: | ||
- netId | ||
- routerId | ||
- subnetCIDR | ||
- subnetId | ||
properties: | ||
netId: | ||
type: string | ||
populated: | ||
type: boolean | ||
routerId: | ||
type: string | ||
sgId: | ||
type: string | ||
subnetCIDR: | ||
type: string | ||
subnetId: | ||
type: string | ||
jsonPath: .metadata.creationTimestamp | ||
schema: | ||
openAPIV3Schema: | ||
type: object | ||
properties: | ||
spec: | ||
type: object | ||
required: | ||
- netId | ||
- routerId | ||
- subnetCIDR | ||
- subnetId | ||
properties: | ||
netId: | ||
type: string | ||
populated: | ||
type: boolean | ||
routerId: | ||
type: string | ||
sgId: | ||
type: string | ||
subnetCIDR: | ||
type: string | ||
subnetId: | ||
type: string | ||
--- | ||
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 | ||
singular: kuryrnetpolicy | ||
kind: KuryrNetPolicy | ||
shortNames: | ||
- knp | ||
additionalPrinterColumns: | ||
- 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: | ||
openAPIV3Schema: | ||
properties: | ||
spec: | ||
required: | ||
- egressSgRules | ||
- ingressSgRules | ||
- networkpolicy_spec | ||
- podSelector | ||
- securityGroupId | ||
properties: | ||
egressSgRules: | ||
type: array | ||
items: | ||
jsonPath: .metadata.creationTimestamp | ||
schema: | ||
openAPIV3Schema: | ||
type: object | ||
properties: | ||
spec: | ||
type: object | ||
required: | ||
- egressSgRules | ||
- ingressSgRules | ||
- networkpolicy_spec | ||
- podSelector | ||
- securityGroupId | ||
properties: | ||
egressSgRules: | ||
type: array | ||
items: | ||
type: object | ||
required: | ||
- security_group_rule | ||
properties: | ||
remote_ip_prefixes: | ||
type: object | ||
namespace: | ||
type: string | ||
security_group_rule: | ||
type: object | ||
required: | ||
- id | ||
properties: | ||
description: | ||
type: string | ||
direction: | ||
type: string | ||
ethertype: | ||
type: string | ||
id: | ||
type: string | ||
port_range_max: | ||
type: integer | ||
port_range_min: | ||
type: integer | ||
protocol: | ||
type: string | ||
remote_ip_prefix: | ||
type: string | ||
security_group_id: | ||
type: string | ||
ingressSgRules: | ||
type: array | ||
items: | ||
type: object | ||
required: | ||
- security_group_rule | ||
properties: | ||
remote_ip_prefixes: | ||
type: object | ||
namespace: | ||
type: string | ||
security_group_rule: | ||
type: object | ||
required: | ||
- id | ||
properties: | ||
description: | ||
type: string | ||
direction: | ||
type: string | ||
ethertype: | ||
type: string | ||
id: | ||
type: string | ||
port_range_max: | ||
type: integer | ||
port_range_min: | ||
type: integer | ||
protocol: | ||
type: string | ||
remote_ip_prefix: | ||
type: string | ||
security_group_id: | ||
type: string | ||
networkpolicy_spec: | ||
type: object | ||
required: | ||
- security_group_rule | ||
properties: | ||
remote_ip_prefixes: | ||
podSelector: | ||
x-kubernetes-preserve-unknown-fields: true | ||
type: object | ||
namespace: | ||
type: string | ||
security_group_rule: | ||
type: object | ||
required: | ||
- id | ||
properties: | ||
description: | ||
type: string | ||
direction: | ||
type: string | ||
ethertype: | ||
type: string | ||
id: | ||
type: string | ||
port_range_max: | ||
type: integer | ||
port_range_min: | ||
type: integer | ||
protocol: | ||
type: string | ||
remote_ip_prefix: | ||
type: string | ||
security_group_id: | ||
type: string | ||
ingressSgRules: | ||
type: array | ||
items: | ||
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 | ||
required: | ||
- security_group_rule | ||
properties: | ||
remote_ip_prefixes: | ||
type: object | ||
namespace: | ||
type: string | ||
security_group_rule: | ||
type: object | ||
required: | ||
- id | ||
properties: | ||
description: | ||
type: string | ||
direction: | ||
type: string | ||
ethertype: | ||
type: string | ||
id: | ||
type: string | ||
port_range_max: | ||
type: integer | ||
port_range_min: | ||
type: integer | ||
protocol: | ||
type: string | ||
remote_ip_prefix: | ||
type: string | ||
security_group_id: | ||
type: string | ||
networkpolicy_spec: | ||
type: object | ||
properties: | ||
podSelector: | ||
type: object | ||
policyTypes: | ||
type: array | ||
ingress: | ||
type: array | ||
egress: | ||
type: array | ||
podSelector: | ||
type: object | ||
securityGroupId: | ||
type: string | ||
securityGroupName: | ||
type: string | ||
securityGroupId: | ||
type: string | ||
securityGroupName: | ||
type: string |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters