delete htb qos priority (#2288)

kubeovn · Feb 6, 2023 · ac72f77 · ac72f77
1 parent 36da29c
commit ac72f77
Show file tree

Hide file tree

Showing 33 changed files with 34 additions and 1,146 deletions.
diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -1446,8 +1446,6 @@ spec:
                   type: boolean
                 disableInterConnection:
                   type: boolean
-                htbqos:
-                  type: string
                 enableDHCP:
                   type: boolean
                 dhcpV4Options:
@@ -1745,37 +1743,6 @@ spec:
         status: {}
   conversion:
     strategy: None
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: htbqoses.kubeovn.io
-spec:
-  group: kubeovn.io
-  versions:
-    - name: v1
-      served: true
-      storage: true
-      additionalPrinterColumns:
-      - name: PRIORITY
-        type: string
-        jsonPath: .spec.priority
-      schema:
-        openAPIV3Schema:
-          type: object
-          properties:
-            spec:
-              type: object
-              properties:
-                priority:
-                  type: string					# Value in range 0 to 4,294,967,295.
-  scope: Cluster
-  names:
-    plural: htbqoses
-    singular: htbqos
-    kind: HtbQos
-    shortNames:
-      - htbqos
 EOF
 
 if $DPDK; then
@@ -1812,7 +1779,6 @@ rules:
       - provider-networks/status
       - security-groups
       - security-groups/status
-      - htbqoses
       - iptables-eips
       - iptables-fip-rules
       - iptables-dnat-rules
@@ -2315,7 +2281,6 @@ rules:
       - provider-networks/status
       - security-groups
       - security-groups/status
-      - htbqoses
       - iptables-eips
       - iptables-fip-rules
       - iptables-dnat-rules

diff --git a/dist/images/update/1.8.3-1.9.1.sh b/dist/images/update/1.8.3-1.9.1.sh
@@ -422,8 +422,6 @@ spec:
                   type: boolean
                 disableInterConnection:
                   type: boolean
-                htbqos:
-                  type: string
   scope: Cluster
   names:
     plural: subnets
@@ -674,36 +672,6 @@ spec:
   conversion:
     strategy: None
 ---
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: htbqoses.kubeovn.io
-spec:
-  group: kubeovn.io
-  versions:
-    - name: v1
-      served: true
-      storage: true
-      additionalPrinterColumns:
-      - name: PRIORITY
-        type: string
-        jsonPath: .spec.priority
-      schema:
-        openAPIV3Schema:
-          type: object
-          properties:
-            spec:
-              type: object
-              properties:
-                priority:
-                  type: string					# Value in range 0 to 4,294,967,295.
-  scope: Cluster
-  names:
-    plural: htbqoses
-    singular: htbqos
-    kind: HtbQos
-    shortNames:
-      - htbqos
 EOF
 
 kubectl apply -f kube-ovn-crd-1.9.yaml
@@ -740,7 +708,6 @@ rules:
       - provider-networks/status
       - security-groups
       - security-groups/status
-      - htbqoses
     verbs:
       - "*"
   - apiGroups:

diff --git a/kubeovn-helm/templates/kube-ovn-crd.yaml b/kubeovn-helm/templates/kube-ovn-crd.yaml
@@ -1232,8 +1232,6 @@ spec:
                   type: boolean
                 disableInterConnection:
                   type: boolean
-                htbqos:
-                  type: string
                 enableDHCP:
                   type: boolean
                 dhcpV4Options:
@@ -1531,34 +1529,3 @@ spec:
         status: {}
   conversion:
     strategy: None
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: htbqoses.kubeovn.io
-spec:
-  group: kubeovn.io
-  versions:
-    - name: v1
-      served: true
-      storage: true
-      additionalPrinterColumns:
-      - name: PRIORITY
-        type: string
-        jsonPath: .spec.priority
-      schema:
-        openAPIV3Schema:
-          type: object
-          properties:
-            spec:
-              type: object
-              properties:
-                priority:
-                  type: string					# Value in range 0 to 4,294,967,295.
-  scope: Cluster
-  names:
-    plural: htbqoses
-    singular: htbqos
-    kind: HtbQos
-    shortNames:
-      - htbqos
diff --git a/kubeovn-helm/templates/ovn-CR.yaml b/kubeovn-helm/templates/ovn-CR.yaml
@@ -22,7 +22,6 @@ rules:
       - provider-networks/status
       - security-groups
       - security-groups/status
-      - htbqoses
       - iptables-eips
       - iptables-fip-rules
       - iptables-dnat-rules

diff --git a/pkg/apis/kubeovn/v1/register.go b/pkg/apis/kubeovn/v1/register.go
@@ -61,8 +61,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&OvnSnatRuleList{},
 		&SecurityGroup{},
 		&SecurityGroupList{},
-		&HtbQos{},
-		&HtbQosList{},
 		&SwitchLBRule{},
 		&SwitchLBRuleList{},
 		&VpcDns{},

diff --git a/pkg/apis/kubeovn/v1/types.go b/pkg/apis/kubeovn/v1/types.go
@@ -121,9 +121,7 @@ type SubnetSpec struct {
 	Private      bool     `json:"private"`
 	AllowSubnets []string `json:"allowSubnets,omitempty"`
 
-	Vlan   string `json:"vlan,omitempty"`
-	HtbQos string `json:"htbqos,omitempty"`
-
+	Vlan string   `json:"vlan,omitempty"`
 	Vips []string `json:"vips,omitempty"`
 
 	LogicalGateway         bool `json:"logicalGateway,omitempty"`
@@ -786,31 +784,6 @@ type SecurityGroupList struct {
 	Items []SecurityGroup `json:"items"`
 }
 
-// +genclient
-// +genclient:noStatus
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +genclient:nonNamespaced
-
-type HtbQos struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec HtbQosSpec `json:"spec"`
-}
-
-type HtbQosSpec struct {
-	Priority string `json:"priority"`
-}
-
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-type HtbQosList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata"`
-
-	Items []HtbQos `json:"items"`
-}
-
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +genclient:nonNamespaced

diff --git a/pkg/apis/kubeovn/v1/zz_generated.deepcopy.go b/pkg/apis/kubeovn/v1/zz_generated.deepcopy.go