Skip to content

Commit

Permalink
remove unused subnet status fields (#2178)
Browse files Browse the repository at this point in the history
  • Loading branch information
zhangzujian committed Dec 21, 2022
1 parent 484fe97 commit 4d6ad64
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 16 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build-x86-image.yaml
Expand Up @@ -64,6 +64,7 @@ jobs:
- name: Build
run: |
go mod tidy
git diff --exit-code
make lint
make image-kube-ovn
make tar-kube-ovn
Expand Down
17 changes: 9 additions & 8 deletions cmd/controller/controller.go
Expand Up @@ -3,25 +3,26 @@ package controller
import (
"context"
"fmt"
"net/http"
"net/http/pprof"
"os"
"time"

"github.com/prometheus/client_golang/prometheus/promhttp"
v1 "k8s.io/api/authorization/v1"
apiv1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apiserver/pkg/server"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/tools/leaderelection"
"k8s.io/client-go/tools/leaderelection/resourcelock"
"k8s.io/client-go/tools/record"
"net/http"
"net/http/pprof"
"os"
"time"
"k8s.io/klog/v2"

"github.com/kubeovn/kube-ovn/pkg/controller"
"github.com/kubeovn/kube-ovn/pkg/ovs"
"github.com/kubeovn/kube-ovn/pkg/util"
"github.com/kubeovn/kube-ovn/versions"
"github.com/prometheus/client_golang/prometheus/promhttp"
v1 "k8s.io/api/authorization/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/klog/v2"
)

const ovnLeaderResource = "kube-ovn-controller"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Expand Up @@ -40,6 +40,7 @@ require (
gopkg.in/k8snetworkplumbingwg/multus-cni.v3 v3.9.2
k8s.io/api v0.26.0
k8s.io/apimachinery v0.26.0
k8s.io/apiserver v0.26.0
k8s.io/client-go v12.0.0+incompatible
k8s.io/klog/v2 v2.80.1
k8s.io/kubernetes v1.26.0
Expand Down Expand Up @@ -230,7 +231,6 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.26.0 // indirect
k8s.io/apiserver v0.26.0 // indirect
k8s.io/cloud-provider v0.26.0 // indirect
k8s.io/cluster-bootstrap v0.26.0 // indirect
k8s.io/component-base v0.26.0 // indirect
Expand Down
2 changes: 0 additions & 2 deletions pkg/apis/kubeovn/v1/types.go
Expand Up @@ -179,8 +179,6 @@ type SubnetStatus struct {
// +patchStrategy=merge
Conditions []SubnetCondition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"`

AvailableIPs float64 `json:"availableIPs"`
UsingIPs float64 `json:"usingIPs"`
V4AvailableIPs float64 `json:"v4availableIPs"`
V4UsingIPs float64 `json:"v4usingIPs"`
V6AvailableIPs float64 `json:"v6availableIPs"`
Expand Down
7 changes: 4 additions & 3 deletions pkg/controller/vpc_nat_gw_eip.go
Expand Up @@ -8,9 +8,6 @@ import (
"strings"
"time"

kubeovnv1 "github.com/kubeovn/kube-ovn/pkg/apis/kubeovn/v1"
"github.com/kubeovn/kube-ovn/pkg/ovs"
"github.com/kubeovn/kube-ovn/pkg/util"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
Expand All @@ -19,6 +16,10 @@ import (
"k8s.io/client-go/tools/cache"
"k8s.io/klog/v2"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

kubeovnv1 "github.com/kubeovn/kube-ovn/pkg/apis/kubeovn/v1"
"github.com/kubeovn/kube-ovn/pkg/ovs"
"github.com/kubeovn/kube-ovn/pkg/util"
)

var (
Expand Down
5 changes: 3 additions & 2 deletions pkg/controller/vpc_nat_gw_nat.go
Expand Up @@ -5,15 +5,16 @@ import (
"encoding/json"
"fmt"

kubeovnv1 "github.com/kubeovn/kube-ovn/pkg/apis/kubeovn/v1"
"github.com/kubeovn/kube-ovn/pkg/util"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/client-go/tools/cache"
"k8s.io/klog/v2"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

kubeovnv1 "github.com/kubeovn/kube-ovn/pkg/apis/kubeovn/v1"
"github.com/kubeovn/kube-ovn/pkg/util"
)

func (c *Controller) enqueueAddIptablesFip(obj interface{}) {
Expand Down

0 comments on commit 4d6ad64

Please sign in to comment.