@@ -22,10 +22,6 @@ import (
2222 "regexp"
2323 "strings"
2424
25- corev1 "k8s.io/api/core/v1"
26- k8serrors "k8s.io/apimachinery/pkg/api/errors"
27- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
28-
2925 gke "cloud.google.com/go/container/apiv1"
3026 "cloud.google.com/go/container/apiv1/containerpb"
3127 "google.golang.org/api/option"
@@ -586,59 +582,9 @@ func (c *GKE) NewK8sProvider(*kingpin.ParseContext) error {
586582// For more information, refer to this PR: https://github.com/prometheus/test-infra/pull/840
587583
588584func (c * GKE ) CreateNamespace (* kingpin.ParseContext ) error {
589- sourceNS := "default"
590- targetNS := "prombench-" + c .DeploymentVars ["PR_NUMBER" ]
591- configMapName := "blocksync-config"
592- secretName := "bucket-secret"
593-
594- // check if namespace exists
595- _ , err := c .k8sProvider .Clt .CoreV1 ().Namespaces ().Get (context .TODO (), targetNS , metav1.GetOptions {})
596- if err != nil {
597- if k8serrors .IsNotFound (err ) {
598- ns := & corev1.Namespace {
599- ObjectMeta : metav1.ObjectMeta {
600- Name : targetNS ,
601- },
602- }
603- _ , err = c .k8sProvider .Clt .CoreV1 ().Namespaces ().Create (context .TODO (), ns , metav1.CreateOptions {})
604- if err != nil {
605- return fmt .Errorf ("error creating namespace: %w" , err )
606- }
607- } else {
608- return fmt .Errorf ("error checking namespace: %w" , err )
609- }
610- }
611-
612- // copy ConfigMap
613- _ , err = c .k8sProvider .Clt .CoreV1 ().ConfigMaps (targetNS ).Get (context .TODO (), configMapName , metav1.GetOptions {})
614- if k8serrors .IsNotFound (err ) {
615- cm , err := c .k8sProvider .Clt .CoreV1 ().ConfigMaps (sourceNS ).Get (context .TODO (), configMapName , metav1.GetOptions {})
616- if err != nil {
617- return fmt .Errorf ("error getting configmap: %w" , err )
618- }
619- cm .ResourceVersion = ""
620- cm .Namespace = targetNS
621- _ , err = c .k8sProvider .Clt .CoreV1 ().ConfigMaps (targetNS ).Create (context .TODO (), cm , metav1.CreateOptions {})
622- if err != nil {
623- return fmt .Errorf ("error creating configmap: %w" , err )
624- }
625- }
626-
627- // copy Secret
628- _ , err = c .k8sProvider .Clt .CoreV1 ().Secrets (targetNS ).Get (context .TODO (), secretName , metav1.GetOptions {})
629- if k8serrors .IsNotFound (err ) {
630- secret , err := c .k8sProvider .Clt .CoreV1 ().Secrets (sourceNS ).Get (context .TODO (), secretName , metav1.GetOptions {})
631- if err != nil {
632- return fmt .Errorf ("error getting secret: %w" , err )
633- }
634- secret .ResourceVersion = ""
635- secret .Namespace = targetNS
636- _ , err = c .k8sProvider .Clt .CoreV1 ().Secrets (targetNS ).Create (context .TODO (), secret , metav1.CreateOptions {})
637- if err != nil {
638- return fmt .Errorf ("error creating secret in target NS: %w" , err )
639- }
585+ if err := c .k8sProvider .CreateNamespace (c .DeploymentVars ["PR_NUMBER" ]); err != nil {
586+ return err
640587 }
641-
642588 return nil
643589}
644590
0 commit comments