Merge pull request #756 from MartinForReal/master

Remove heapster from project dependencies
kubernetes · May 30, 2023 · f116c92 · f116c92
2 parents af22261 + 75095b2
commit f116c92
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 211 deletions.
diff --git a/go.mod b/go.mod
@@ -30,7 +30,6 @@ require (
 	k8s.io/api v0.0.0-20190816222004-e3a6b8045b0b
 	k8s.io/apimachinery v0.0.0-20190816221834-a9f1d8a9c101
 	k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
-	k8s.io/heapster v0.0.0-20180704153620-b25f8a16208f
 	k8s.io/kubernetes v1.14.6
 	k8s.io/test-infra v0.0.0-20190914015041-e1cbc3ccd91c
 )

diff --git a/go.sum b/go.sum
@@ -695,8 +695,6 @@ k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible h1:A5pdeNsAy
 k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
 k8s.io/code-generator v0.0.0-20190311093542-50b561225d70/go.mod h1:MYiN+ZJZ9HkETbgVZdWw2AsuAi9PZ4V80cwfuf2axe8=
 k8s.io/gengo v0.0.0-20190306031000-7a1b7fb0289f/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
-k8s.io/heapster v0.0.0-20180704153620-b25f8a16208f h1:TEdSQIRnEe+5ajIJY/JZOfZvQO0w7aWmcmv/ZrZcTF4=
-k8s.io/heapster v0.0.0-20180704153620-b25f8a16208f/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM=
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.4.0 h1:lCJCxf/LIowc2IGS9TPjWDyXY4nOmdGdfcwwDQCOURQ=
 k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=

diff --git a/....io/heapster/common/kubernetes/configs.go → ...ters/k8sexporter/problemclient/configs.go b/....io/heapster/common/kubernetes/configs.go → ...ters/k8sexporter/problemclient/configs.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package kubernetes
+package problemclient
 
 import (
 	"fmt"
@@ -57,7 +57,7 @@ func getConfigOverrides(uri *url.URL) (*kubeClientCmd.ConfigOverrides, error) {
 	return &kubeConfigOverride, nil
 }
 
-func GetKubeClientConfig(uri *url.URL) (*kube_rest.Config, error) {
+func getKubeClientConfig(uri *url.URL) (*kube_rest.Config, error) {
 	var (
 		kubeConfig *kube_rest.Config
 		err        error

diff --git a/pkg/exporters/k8sexporter/problemclient/problem_client.go b/pkg/exporters/k8sexporter/problemclient/problem_client.go
@@ -34,7 +34,6 @@ import (
 	"k8s.io/client-go/tools/record"
 
 	"github.com/golang/glog"
-	"k8s.io/heapster/common/kubernetes"
 	"k8s.io/node-problem-detector/cmd/options"
 	"k8s.io/node-problem-detector/pkg/version"
 )
@@ -68,7 +67,7 @@ func NewClientOrDie(npdo *options.NodeProblemDetectorOptions) Client {
 	// we have checked it is a valid URI after command line argument is parsed.:)
 	uri, _ := url.Parse(npdo.ApiServerOverride)
 
-	cfg, err := kubernetes.GetKubeClientConfig(uri)
+	cfg, err := getKubeClientConfig(uri)
 	if err != nil {
 		panic(err)
 	}

diff --git a/vendor/k8s.io/heapster/LICENSE b/vendor/k8s.io/heapster/LICENSE
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -650,9 +650,6 @@ k8s.io/client-go/util/connrotation
 k8s.io/client-go/util/flowcontrol
 k8s.io/client-go/util/homedir
 k8s.io/client-go/util/keyutil
-# k8s.io/heapster v0.0.0-20180704153620-b25f8a16208f
-## explicit
-k8s.io/heapster/common/kubernetes
 # k8s.io/klog v0.4.0
 ## explicit; go 1.12
 k8s.io/klog