Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 1807062: Revert inclusion of route-override/whereabouts in 4.3 #519

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
80 changes: 0 additions & 80 deletions bindata/network/additional-networks/crd/001-crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,83 +13,3 @@ spec:
kind: NetworkAttachmentDefinition
shortNames:
- net-attach-def
versions:
- name: v1
served: true
storage: true
preserveUnknownFields: true
validation:
openAPIV3Schema:
type: object
properties:
spec:
type: object
properties:
config:
type: string
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
creationTimestamp: null
name: ippools.whereabouts.cni.cncf.io
spec:
group: whereabouts.cni.cncf.io
names:
kind: IPPool
plural: ippools
scope: ""
validation:
openAPIV3Schema:
description: IPPool is the Schema for Whereabouts for IP address allocation
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: IPPoolSpec defines the desired state of IPPool
properties:
allocations:
additionalProperties:
description: IPAllocation represents metadata about the pod/container
owner of a specific IP
properties:
id:
type: string
required:
- id
type: object
description: Allocations is the set of allocated IPs for the given range.
Its indices are a direct mapping to the IP with the same index/offset
for the pool's range.
type: object
range:
description: Range is a RFC 4632/4291-style string that represents an
IP address and prefix length in CIDR notation
type: string
required:
- allocations
- range
type: object
type: object
version: v1alpha1
versions:
- name: v1alpha1
served: true
storage: true
preserveUnknownFields: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
33 changes: 0 additions & 33 deletions bindata/network/multus/002-rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,36 +63,3 @@ subjects:
- kind: ServiceAccount
name: multus
namespace: openshift-multus

---
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: multus-whereabouts
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: whereabouts-cni
subjects:
- kind: ServiceAccount
name: multus
namespace: openshift-multus

---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: whereabouts-cni
rules:
- apiGroups:
- whereabouts.cni.k8s.io
resources:
- ippools
verbs:
- get
- list
- watch
- create
- update
- patch
- delete