weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix webhook kubernetes config in integration tests

Browse Source 
Signed-off-by: James Munnelly <jmunnelly@apple.com>
This commit is contained in:
James Munnelly 2021-12-15 17:12:54 +00:00
parent e13c879681
commit d03d98967d
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
test/integration/framework/apiserver.go
View File

@ -19,6 +19,7 @@ package framework
import (
"context"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"strings"
@ -83,10 +84,30 @@ func RunControlPlane(t *testing.T, ctx context.Context, optionFunctions ...RunCo
}
env, stopControlPlane := apiserver.RunBareControlPlane(t)
config := env.Config
testuser, err := env.ControlPlane.AddUser(envtest.User{Name: "test-user", Groups: []string{"cluster-admin"}}, env.Config)
if err != nil {
t.Fatal(err)
}
kubeconfig, err := testuser.KubeConfig()
if err != nil {
t.Fatal(err)
}
f, err := ioutil.TempFile("", "integration-")
if err != nil {
t.Fatal(err)
}
defer f.Close()
defer func() {
os.Remove(f.Name())
}()
if _, err := f.Write(kubeconfig); err != nil {
t.Fatal(err)
}
webhookOpts, stopWebhook := webhooktesting.StartWebhookServer(
t, ctx, []string{"--api-server-host=" + config.Host},
t, ctx, []string{"--kubeconfig", f.Name()},
webhook.WithConversionHandler(options.webhookConversionHandler),
)
@ -96,13 +117,13 @@ func RunControlPlane(t *testing.T, ctx context.Context, optionFunctions ...RunCo
}
patchCRDConversion(crds, webhookOpts.URL, webhookOpts.CAPEM)
if _, err := envtest.InstallCRDs(config, envtest.CRDInstallOptions{
if _, err := envtest.InstallCRDs(env.Config, envtest.CRDInstallOptions{
CRDs: crds,
}); err != nil {
t.Fatal(err)
}
cl, err := client.New(config, client.Options{Scheme: api.Scheme})
cl, err := client.New(env.Config, client.Options{Scheme: api.Scheme})
if err != nil {
t.Fatal(err)
}
@ -119,7 +140,7 @@ func RunControlPlane(t *testing.T, ctx context.Context, optionFunctions ...RunCo
t.Fatal(err)
}
return config, func() {
return env.Config, func() {
defer stopWebhook()
stopControlPlane()
}