mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 21:47:07 +00:00
Do GCE Secret setup in driver creation instead of skip test
This commit is contained in:
parent
6be4f1bbf3
commit
67a40cd3cc
@ -38,7 +38,6 @@ package drivers
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"math/rand"
|
"math/rand"
|
||||||
"time"
|
|
||||||
|
|
||||||
. "github.com/onsi/ginkgo"
|
. "github.com/onsi/ginkgo"
|
||||||
storagev1 "k8s.io/api/storage/v1"
|
storagev1 "k8s.io/api/storage/v1"
|
||||||
@ -256,14 +255,8 @@ func (g *gcePDCSIDriver) GetDriverInfo() *DriverInfo {
|
|||||||
|
|
||||||
func (g *gcePDCSIDriver) SkipUnsupportedTest(pattern testpatterns.TestPattern) {
|
func (g *gcePDCSIDriver) SkipUnsupportedTest(pattern testpatterns.TestPattern) {
|
||||||
f := g.driverInfo.Framework
|
f := g.driverInfo.Framework
|
||||||
cs := f.ClientSet
|
|
||||||
config := g.driverInfo.Config
|
|
||||||
framework.SkipUnlessProviderIs("gce", "gke")
|
framework.SkipUnlessProviderIs("gce", "gke")
|
||||||
framework.SkipIfMultizone(cs)
|
framework.SkipIfMultizone(f.ClientSet)
|
||||||
|
|
||||||
// TODO(#62561): Use credentials through external pod identity when that goes GA instead of downloading keys.
|
|
||||||
createGCESecrets(cs, config)
|
|
||||||
framework.SkipUnlessSecretExistsAfterWait(cs, "cloud-sa", config.Namespace, 3*time.Minute)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g *gcePDCSIDriver) GetDynamicProvisionStorageClass(fsType string) *storagev1.StorageClass {
|
func (g *gcePDCSIDriver) GetDynamicProvisionStorageClass(fsType string) *storagev1.StorageClass {
|
||||||
@ -290,6 +283,8 @@ func (g *gcePDCSIDriver) CreateDriver() {
|
|||||||
// DriverContainerName: "gce-driver",
|
// DriverContainerName: "gce-driver",
|
||||||
// ProvisionerContainerName: "csi-external-provisioner",
|
// ProvisionerContainerName: "csi-external-provisioner",
|
||||||
// }
|
// }
|
||||||
|
createGCESecrets(g.driverInfo.Framework.ClientSet, g.driverInfo.Config)
|
||||||
|
|
||||||
cleanup, err := g.driverInfo.Framework.CreateFromManifests(nil,
|
cleanup, err := g.driverInfo.Framework.CreateFromManifests(nil,
|
||||||
"test/e2e/testing-manifests/storage-csi/driver-registrar/rbac.yaml",
|
"test/e2e/testing-manifests/storage-csi/driver-registrar/rbac.yaml",
|
||||||
"test/e2e/testing-manifests/storage-csi/external-attacher/rbac.yaml",
|
"test/e2e/testing-manifests/storage-csi/external-attacher/rbac.yaml",
|
||||||
|
@ -28,6 +28,7 @@ import (
|
|||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
"k8s.io/api/core/v1"
|
"k8s.io/api/core/v1"
|
||||||
|
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
"k8s.io/apimachinery/pkg/util/uuid"
|
"k8s.io/apimachinery/pkg/util/uuid"
|
||||||
|
|
||||||
@ -115,5 +116,7 @@ func createGCESecrets(client clientset.Interface, config framework.VolumeTestCon
|
|||||||
}
|
}
|
||||||
|
|
||||||
_, err = client.CoreV1().Secrets(config.Namespace).Create(s)
|
_, err = client.CoreV1().Secrets(config.Namespace).Create(s)
|
||||||
|
if !apierrors.IsAlreadyExists(err) {
|
||||||
framework.ExpectNoError(err, "Failed to create Secret %v", s.GetName())
|
framework.ExpectNoError(err, "Failed to create Secret %v", s.GetName())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user