djpbessems/ContainerImage.Pinniped
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "test/library: try another cert rest config"

Browse Source 
Didn't fix CI. I didn't think it would.

I have never seen the integration tests fail like this locally, so I
have to imagine the failure has something to do with the environment
on which we are testing.

This reverts commit ba2e2f509a.
This commit is contained in:
Andrew Keesler 2020-08-24 11:52:47 -04:00
parent ba2e2f509a
commit ed8b1be178
No known key found for this signature in database
GPG Key ID: 27CE0444346F9413
1 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
test/library/client.go
View File

@ -35,7 +35,7 @@ func NewClientset(t *testing.T) kubernetes.Interface {
func NewClientsetWithCertAndKey(t *testing.T, clientCertificateData, clientKeyData string) kubernetes.Interface { func NewClientsetWithCertAndKey(t *testing.T, clientCertificateData, clientKeyData string) kubernetes.Interface {
t.Helper() t.Helper()
return newClientsetWithConfig(t, newClientConfigWithCertAndKey(t, clientCertificateData, clientKeyData)) return newClientsetWithConfig(t, newAnonymousClientRestConfigWithCertAndKeyAdded(t, clientCertificateData, clientKeyData))
} }
func NewPinnipedClientset(t *testing.T) pinnipedclientset.Interface { func NewPinnipedClientset(t *testing.T) pinnipedclientset.Interface {
@ -47,7 +47,7 @@ func NewPinnipedClientset(t *testing.T) pinnipedclientset.Interface {
func NewAnonymousPinnipedClientset(t *testing.T) pinnipedclientset.Interface { func NewAnonymousPinnipedClientset(t *testing.T) pinnipedclientset.Interface {
t.Helper() t.Helper()
return pinnipedclientset.NewForConfigOrDie(newAnonymousClientConfig(t)) return pinnipedclientset.NewForConfigOrDie(newAnonymousClientRestConfig(t))
} }
func NewAggregatedClientset(t *testing.T) aggregatorclient.Interface { func NewAggregatedClientset(t *testing.T) aggregatorclient.Interface {
@ -78,7 +78,7 @@ func newClientsetWithConfig(t *testing.T, config *rest.Config) kubernetes.Interf
// Ensures that we are not accidentally picking up any authentication info from the kube config file. // Ensures that we are not accidentally picking up any authentication info from the kube config file.
// E.g. If your kube config were pointing at an Azure cluster, it would have both certs and a token, // E.g. If your kube config were pointing at an Azure cluster, it would have both certs and a token,
// and we don't want our tests to accidentally pick up that token. // and we don't want our tests to accidentally pick up that token.
func newAnonymousClientConfig(t *testing.T) *rest.Config { func newAnonymousClientRestConfig(t *testing.T) *rest.Config {
t.Helper() t.Helper()
realConfig := NewClientConfig(t) realConfig := NewClientConfig(t)
@ -110,38 +110,11 @@ func newAnonymousClientConfig(t *testing.T) *rest.Config {
} }
// Starting with an anonymous client config, add a cert and key to use for authentication in the API server. // Starting with an anonymous client config, add a cert and key to use for authentication in the API server.
func newClientConfigWithCertAndKey(t *testing.T, clientCertificateData, clientKeyData string) *rest.Config { func newAnonymousClientRestConfigWithCertAndKeyAdded(t *testing.T, clientCertificateData, clientKeyData string) *rest.Config {
t.Helper() t.Helper()
realConfig := NewClientConfig(t) config := newAnonymousClientRestConfig(t)
config.CertData = []byte(clientCertificateData)
out, err := ioutil.TempFile("", "pinniped-cert-and-key-kubeconfig-test-*") config.KeyData = []byte(clientKeyData)
require.NoError(t, err) return config
defer os.Remove(out.Name())
certAndKeyConfig := clientcmdapi.NewConfig()
certAndKeyConfig.Clusters["cert-and-key-cluster"] = &clientcmdapi.Cluster{
Server: realConfig.Host,
CertificateAuthorityData: realConfig.CAData,
}
certAndKeyConfig.AuthInfos["cert-and-key-auth-info"] = &clientcmdapi.AuthInfo{
ClientCertificateData: []byte(clientCertificateData),
ClientKeyData: []byte(clientKeyData),
}
certAndKeyConfig.Contexts["cert-and-key"] = &clientcmdapi.Context{
Cluster: "cert-and-key-cluster",
AuthInfo: "cert-and-key-auth-info",
}
certAndKeyConfig.CurrentContext = "cert-and-key"
data, err := clientcmd.Write(*certAndKeyConfig)
require.NoError(t, err)
_, err = out.Write(data)
require.NoError(t, err)
restConfig, err := clientcmd.BuildConfigFromFlags("", out.Name())
require.NoError(t, err)
return restConfig
} }