Skip to content

Commit 2e201bd

Browse files
committed
remove kube client
1 parent c2f39ba commit 2e201bd

File tree

2 files changed

+1
-36
lines changed

2 files changed

+1
-36
lines changed

Diff for: go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ module lb_controller
33
go 1.23.0
44

55
require (
6-
github.com/antihax/optional v1.0.0
76
github.com/briandowns/spinner v1.23.2
87
github.com/crusoecloud/client-go v0.1.78
98
github.com/go-logr/logr v1.4.2
@@ -17,6 +16,7 @@ require (
1716
)
1817

1918
require (
19+
github.com/antihax/optional v1.0.0 // indirect
2020
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
2121
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
2222
github.com/beorn7/perks v1.0.1 // indirect

Diff for: internal/controller/util.go

-35
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@ import (
1414
"github.com/go-logr/logr"
1515
"github.com/ory/viper"
1616
corev1 "k8s.io/api/core/v1"
17-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1817
"k8s.io/apimachinery/pkg/types"
19-
"k8s.io/client-go/kubernetes"
20-
"k8s.io/client-go/rest"
2118
"sigs.k8s.io/controller-runtime/pkg/client"
2219
"sigs.k8s.io/controller-runtime/pkg/log"
2320
)
@@ -45,11 +42,6 @@ const (
4542
)
4643

4744
var (
48-
errInstanceNotFound = errors.New("instance not found")
49-
errProjectIDNotFound = fmt.Errorf("project ID not found in %s env var or %s node label",
50-
projectIDEnvKey, projectIDLabelKey)
51-
errInstanceIDNotFound = fmt.Errorf("instance ID not found in %s env var or %s node label",
52-
instanceIDEnvKey, instanceIDLabelKey)
5345
errUnableToGetOpRes = errors.New("failed to get result of operation")
5446
)
5547

@@ -189,33 +181,6 @@ func GetCrusoeClient(ctx context.Context) (*crusoeapi.APIClient, error) {
189181
"crusoe-external-load-balancer-controller/0.0.1",
190182
)
191183

192-
var projectID string
193-
194-
projectID = viper.GetString(CrusoeProjectIDFlag)
195-
if projectID == "" {
196-
var ok bool
197-
kubeClientConfig, configErr := rest.InClusterConfig()
198-
if configErr != nil {
199-
return nil, fmt.Errorf("could not get kube client config: %w", configErr)
200-
}
201-
202-
kubeClient, clientErr := kubernetes.NewForConfig(kubeClientConfig)
203-
if clientErr != nil {
204-
return nil, fmt.Errorf("could not get kube client: %w", clientErr)
205-
}
206-
207-
hostNode, nodeFetchErr := kubeClient.CoreV1().Nodes().Get(ctx, viper.GetString(NodeNameFlag), metav1.GetOptions{})
208-
if nodeFetchErr != nil {
209-
return nil, fmt.Errorf("could not fetch current node with kube client: %w", nodeFetchErr)
210-
}
211-
212-
projectID, ok = hostNode.Labels[projectIDLabelKey]
213-
if !ok {
214-
return nil, errProjectIDNotFound
215-
}
216-
217-
}
218-
219184
return crusoeClient, nil
220185
}
221186

0 commit comments

Comments
 (0)