Skip to content

Commit

Permalink
chore: remove networks crd
Browse files Browse the repository at this point in the history
  • Loading branch information
oilbeater committed May 15, 2020
1 parent ce0c0ab commit b03c376
Show file tree
Hide file tree
Showing 37 changed files with 30 additions and 1,904 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ dist/images/kube-ovn-gateway
dist/images/kube-ovn-webhook
dist/images/kube-ovn-pinger
dist/images/kube-ovn-speaker
kube-ovn.yaml
kube-ovn-crd.yaml
ovn.yaml
35 changes: 0 additions & 35 deletions dist/images/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -143,40 +143,6 @@ spec:
- name: Subnet
type: string
JSONPath: .spec.subnet
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
name: networks.kubeovn.io
spec:
group: kubeovn.io
version: v1
scope: Cluster
names:
plural: networks
singular: network
kind: Network
shortNames:
- network
additionalPrinterColumns:
- name: NetworkType
type: string
JSONPath: .spec.networkType
- name: DefaultSubnet
type: string
JSONPath: .spec.defaultSubnet
- name: NodeSubnet
type: string
JSONPath: .spec.nodeSubnet
- name: MasterNode
type: string
JSONPath: .spec.masterNode
- name: PprofPort
type: integer
JSONPath: .spec.pprofPort
- name: ProviderName
type: string
JSONPath: .spec.providerName
EOF

cat <<EOF > ovn.yaml
Expand Down Expand Up @@ -208,7 +174,6 @@ rules:
- subnets/status
- ips
- vlans
- networks
verbs:
- "*"
- apiGroups:
Expand Down
1 change: 0 additions & 1 deletion pkg/apis/kubeovn/v1/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&SubnetList{},
&Vlan{},
&VlanList{},
&Network{},
)
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil
Expand Down
33 changes: 0 additions & 33 deletions pkg/apis/kubeovn/v1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -192,36 +192,3 @@ type VlanList struct {

Items []Vlan `json:"items"`
}

// +genclient
// +genclient:noStatus
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// +genclient:nonNamespaced

type Network struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`

Spec NetworkSpec `json:"spec"`
}

type NetworkSpec struct {
NetworkType string `json:"networkType"`
DefaultSubnet string `json:"defaultSubnet,omitempty"`
NodeSubnet string `json:"nodeSubnet,omitempty"`
MasterNode string `json:"masterNode,omitempty"`
PprofPort int `json:"pprofPort,omitempty"`
ProviderName string `json:"providerName,omitempty"`
InterfaceName string `json:"interfaceName,omitempty"`
DefaultVlan string `json:"defaultVlan,omitempty"`
VlanRange string `json:"vlanRange,omitempty"`
}

// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

type NetworkList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata"`

Items []Network `json:"items"`
}
76 changes: 0 additions & 76 deletions pkg/apis/kubeovn/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 0 additions & 20 deletions pkg/client/clientset/versioned/typed/kube-ovn/v1/doc.go

This file was deleted.

20 changes: 0 additions & 20 deletions pkg/client/clientset/versioned/typed/kube-ovn/v1/fake/doc.go

This file was deleted.

120 changes: 0 additions & 120 deletions pkg/client/clientset/versioned/typed/kube-ovn/v1/fake/fake_ip.go

This file was deleted.

This file was deleted.

0 comments on commit b03c376

Please sign in to comment.