Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add TestRouterCerts e2e #183

Merged
merged 5 commits into from
Aug 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
30 changes: 19 additions & 11 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ import:
- package: k8s.io/code-generator
version: kubernetes-1.14.0

# pinned to a level that kubernetes uses.
- package: github.com/evanphx/json-patch
version: 5858425f75500d40c52783dce87d085a483ce135

- package: github.com/openshift/api
version: master
- package: github.com/openshift/client-go
Expand All @@ -38,3 +42,7 @@ import:
- package: k8s.io/gengo/args
version: 01a732e01d00cb9a81bb0ca050d3e6d2b947927b
- package: golang.org/x/tools/imports

# testing
- package: github.com/stretchr/testify
version: ~1.3.0
44 changes: 44 additions & 0 deletions test/e2e/certs_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package e2e

import (
"crypto/x509"
"encoding/pem"
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"

"github.com/openshift/client-go/config/clientset/versioned"

e2e "github.com/openshift/cluster-authentication-operator/test/library"
)

func TestRouterCerts(t *testing.T) {
kubeConfig, err := e2e.NewClientConfigForTest()
require.NoError(t, err)
kubeClient, err := kubernetes.NewForConfig(kubeConfig)
require.NoError(t, err)
configClient, err := versioned.NewForConfig(kubeConfig)
require.NoError(t, err)
// machine managed router-certs secret should exist
machineManagedRouterCerts, err := kubeClient.CoreV1().Secrets("openshift-config-managed").Get("router-certs", metav1.GetOptions{})
require.NoError(t, err)
// operator managed router-certs secret should exist
operatorManagedRouterCerts, err := kubeClient.CoreV1().Secrets("openshift-authentication").Get("v4-0-config-system-router-certs", metav1.GetOptions{})
require.NoError(t, err)
// operator managed router-certs data should be a copy of machine managed router-certs
require.Equal(t, operatorManagedRouterCerts.Data, machineManagedRouterCerts.Data)
// there should be an entry for the ingress domain
ingress, err := configClient.ConfigV1().Ingresses().Get("cluster", metav1.GetOptions{})
require.NoError(t, err)
require.Contains(t, operatorManagedRouterCerts.Data, ingress.Spec.Domain)
// the entry should contain certificates that validate the oauth service hostname
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This step is invalid. It will work until you reflect reality and create a situation where they don't match. I can merge this now, but this will fail for your next test.

block, _ := pem.Decode(operatorManagedRouterCerts.Data[ingress.Spec.Domain])
cert, err := x509.ParseCertificate(block.Bytes)
require.NoError(t, err)
err = cert.VerifyHostname("oauth-openshift." + ingress.Spec.Domain)
assert.NoError(t, err)
}
11 changes: 0 additions & 11 deletions test/e2e/e2e_test.go

This file was deleted.

21 changes: 21 additions & 0 deletions test/e2e/operator_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package e2e

import (
"testing"

"github.com/stretchr/testify/require"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"

test "github.com/openshift/cluster-authentication-operator/test/library"
)

func TestOperatorNamespace(t *testing.T) {
kubeConfig, err := test.NewClientConfigForTest()
require.NoError(t, err)
kubeClient, err := kubernetes.NewForConfig(kubeConfig)
require.NoError(t, err)
_, err = kubeClient.CoreV1().Namespaces().Get("openshift-authentication-operator", metav1.GetOptions{})
require.NoError(t, err)
}
20 changes: 20 additions & 0 deletions test/library/client.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package library

import (
"fmt"

"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
"k8s.io/client-go/tools/clientcmd/api"
)

// NewClientConfigForTest returns a config configured to connect to the api server
func NewClientConfigForTest() (*rest.Config, error) {
loader := clientcmd.NewDefaultClientConfigLoadingRules()
clientConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(loader, &clientcmd.ConfigOverrides{ClusterInfo: api.Cluster{InsecureSkipTLSVerify: true}})
config, err := clientConfig.ClientConfig()
if err == nil {
fmt.Printf("Found configuration for host %v.\n", config.Host)
}
return config, err
}
26 changes: 16 additions & 10 deletions vendor/github.com/openshift/api/apps/v1/generated.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 16 additions & 9 deletions vendor/github.com/openshift/api/authorization/v1/generated.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 16 additions & 10 deletions vendor/github.com/openshift/api/build/v1/generated.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion vendor/github.com/openshift/api/config/v1/types_build.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 8 additions & 3 deletions vendor/github.com/openshift/api/config/v1/types_ingress.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading