use in-cluster config

openshift · Jul 12, 2024 · b966a02 · b966a02
1 parent f3af2ab
commit b966a02
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/bindata/etcd/pod.yaml b/bindata/etcd/pod.yaml
@@ -341,6 +341,8 @@ ${COMPUTED_ENV_VARS}
         name: backup-dir
       - mountPath: /etc/kubernetes
         name: config-dir
+      - mountPath: /etc/kubernetes/static-pod-certs
+        name: cert-dir
   hostNetwork: true
   priorityClassName: system-node-critical
   tolerations:

diff --git a/pkg/cmd/backuprestore/backupnoconfig.go b/pkg/cmd/backuprestore/backupnoconfig.go
@@ -4,14 +4,14 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"k8s.io/client-go/rest"
 	"slices"
 
 	backupv1alpha1 "github.com/openshift/api/config/v1alpha1"
 	backupv1client "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1alpha1"
 	prunebackups "github.com/openshift/cluster-etcd-operator/pkg/cmd/prune-backups"
 
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/klog/v2"
 
 	"github.com/adhocore/gronx/pkg/tasker"
@@ -20,11 +20,10 @@ import (
 )
 
 type backupNoConfig struct {
-	kubeConfig string
-	schedule   string
-	timeZone   string
-	retention  backupv1alpha1.RetentionPolicy
-	scheduler  *tasker.Tasker
+	schedule  string
+	timeZone  string
+	retention backupv1alpha1.RetentionPolicy
+	scheduler *tasker.Tasker
 	backupOptions
 }
 
@@ -93,14 +92,14 @@ func (b *backupNoConfig) Run() error {
 }
 
 func (b *backupNoConfig) getBackupClient() (backupv1client.BackupsGetter, error) {
-	kubeConfig, err := clientcmd.BuildConfigFromFlags("", b.kubeConfig)
+	config, err := rest.InClusterConfig()
 	if err != nil {
-		bErr := fmt.Errorf("error loading kubeconfig: %v", err)
+		bErr := fmt.Errorf("error loading in-cluster kube client config: %v", err)
 		klog.Error(bErr)
 		return nil, bErr
 	}
 
-	backupsClient, err := backupv1client.NewForConfig(kubeConfig)
+	backupsClient, err := backupv1client.NewForConfig(config)
 	if err != nil {
 		bErr := fmt.Errorf("error creating etcd backups client: %v", err)
 		klog.Error(bErr)

diff --git a/pkg/operator/etcd_assets/bindata.go b/pkg/operator/etcd_assets/bindata.go