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.

Sign up for GitHub

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

extended: fixed registry tests #15807

Merged
merged 1 commit into from
Oct 12, 2017
Merged

extended: fixed registry tests #15807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions test/extended/imageapis/limitrange_admission.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

const limitRangeName = "limits"

var _ = g.Describe("[Feature:ImageQuota] Image limit range", func() {
var _ = g.Describe("[Feature:ImageQuota][Serial] Image limit range", func() {
defer g.GinkgoRecover()
var oc = exutil.NewCLI("limitrange-admission", exutil.KubeConfigPath())

Expand All @@ -40,7 +40,8 @@ var _ = g.Describe("[Feature:ImageQuota] Image limit range", func() {
deleteTestImagesAndStreams(oc)
}

g.It(fmt.Sprintf("should deny a push of built image exceeding %s limit", imageapi.LimitTypeImage), func() {
g.It(fmt.Sprintf("[Skipped] should deny a push of built image exceeding %s limit", imageapi.LimitTypeImage), func() {
g.Skip("FIXME: fill image metadata for schema1 in the registry")
Copy link
Contributor

Choose a reason for hiding this comment

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

do we have an issue for this? if not, please open one to track fixing this.

oc.SetOutputDir(exutil.TestContext.OutputDir)
defer tearDown(oc)

Expand Down
2 changes: 1 addition & 1 deletion test/extended/imageapis/quota_admission.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const (
waitTimeout = time.Second * 30
)

var _ = g.Describe("[Feature:ImageQuota] Image resource quota", func() {
var _ = g.Describe("[Feature:ImageQuota][Serial] Image resource quota", func() {
defer g.GinkgoRecover()
var oc = exutil.NewCLI("resourcequota-admission", exutil.KubeConfigPath())

Expand Down
43 changes: 33 additions & 10 deletions test/extended/images/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package images
import (
"bytes"
cryptorand "crypto/rand"
"crypto/tls"
"fmt"
"io"
"io/ioutil"
Expand All @@ -21,6 +22,7 @@ import (

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kerrors "k8s.io/apimachinery/pkg/util/errors"
knet "k8s.io/apimachinery/pkg/util/net"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/kubernetes/pkg/client/retry"
Expand Down Expand Up @@ -517,20 +519,41 @@ func MirrorBlobInRegistry(oc *exutil.CLI, dgst digest.Digest, repository string,
if err != nil {
return err
}
req, err := http.NewRequest("GET", fmt.Sprintf("http://%s/v2/%s/blobs/%s", registryURL, repository, dgst.String()), nil)
if err != nil {
return err
}
token, err := oc.Run("whoami").Args("-t").Output()
if err != nil {
return err
}
req.Header.Set("range", "bytes=0-1")
req.Header.Set("Authorization", "Bearer "+token)
c := http.Client{}
resp, err := c.Do(req)
if err != nil {
return err

c := http.Client{
Transport: knet.SetTransportDefaults(&http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
}),
}

peekAtBlob := func(schema string) (*http.Request, *http.Response, error) {
req, err := http.NewRequest("GET", fmt.Sprintf("%s://%s/v2/%s/blobs/%s", schema, registryURL, repository, dgst.String()), nil)
if err != nil {
return nil, nil, err
}
req.Header.Set("range", "bytes=0-1")
req.Header.Set("Authorization", "Bearer "+token)
resp, err := c.Do(req)
if err != nil {
fmt.Fprintf(g.GinkgoWriter, "failed to %s %s: %v (%#+v)\n", req.Method, req.URL, err, err)
return nil, nil, err
}
return req, resp, nil
}

var (
req *http.Request
resp *http.Response
getErr error
)
if req, resp, getErr = peekAtBlob("https"); getErr != nil {
if req, resp, getErr = peekAtBlob("http"); getErr != nil {
return getErr
}
}
defer resp.Body.Close()

Expand Down
2 changes: 1 addition & 1 deletion test/extended/registry/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const (
imageSize = 1024
)

var _ = g.Describe("[Conformance][registry][migration] manifest migration from etcd to registry storage", func() {
var _ = g.Describe("[Conformance][registry][migration][Serial] manifest migration from etcd to registry storage", func() {
defer g.GinkgoRecover()
var oc = exutil.NewCLI("registry-migration", exutil.KubeConfigPath())

Expand Down
4 changes: 3 additions & 1 deletion test/extended/registry/signature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ import (
e2e "k8s.io/kubernetes/test/e2e/framework"
)

var _ = g.Describe("[imageapis][registry] image signature workflow", func() {
var _ = g.Describe("[imageapis][registry][Skipped] image signature workflow", func() {

defer g.GinkgoRecover()

var (
Expand All @@ -21,6 +22,7 @@ var _ = g.Describe("[imageapis][registry] image signature workflow", func() {
)

g.It("can push a signed image to openshift registry and verify it", func() {
g.Skip("FIXME: fix oadm verify-image-signature to work with secured registry")
Copy link
Contributor

Choose a reason for hiding this comment

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

same here, please open an issue to track fixing this if we don't have one.

g.By("building a signer image that knows how to sign images")
output, err := oc.Run("create").Args("-f", signerBuildFixture).Output()
if err != nil {
Expand Down
18 changes: 18 additions & 0 deletions test/extended/registry/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,19 @@ func GetRegistryPod(podsGetter kcoreclient.PodsGetter) (*kapiv1.Pod, error) {
return &podList.Items[0], nil
}

// LogRegistryPod attempts to write registry log to a file to recent test's output directory.
func LogRegistryPod(oc *exutil.CLI) error {
pod, err := GetRegistryPod(oc.KubeClient().Core())
if err != nil {
return fmt.Errorf("failed to get registry pod: %v", err)
}
path, err := oc.Run("logs").Args("dc/docker-registry").OutputToFile("pod-" + pod.Name + ".log")
Copy link
Contributor

Choose a reason for hiding this comment

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

@jim-minter if you want to change the Pod log dumping logic to put it in a file, this looks like a promising way to do it instead of spamming the stdout.

Copy link
Contributor

Choose a reason for hiding this comment

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

@bparees yes, but currently it ends up in /tmp, not as an artifact.

Copy link
Contributor

Choose a reason for hiding this comment

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

well that's not very useful... and it makes me think @miminar should update this to dump to stdout then because this won't be accessible when the job is done, right?

(or use one of the existing DumpPodLogs methods)

Copy link
Contributor

Choose a reason for hiding this comment

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

+1, @miminar I don't think this output will be retrievable when run in the CI system?

Copy link
Author

Choose a reason for hiding this comment

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

+1, @miminar I don't think this output will be retrievable when run in the CI system?

I was happy using it locally. I didn't realize it won't be preserved in CI system.
Addressed by #16859

if err == nil {
fmt.Fprintf(g.GinkgoWriter, "written registry pod log to %s\n", path)
}
return err
}

// ConfigureRegistry re-deploys the registry pod if its configuration doesn't match the desiredState. The
// function blocks until the registry is ready.
func ConfigureRegistry(oc *exutil.CLI, desiredState RegistryConfiguration) error {
Expand Down Expand Up @@ -154,7 +167,12 @@ func ConfigureRegistry(oc *exutil.CLI, desiredState RegistryConfiguration) error
if err != nil {
return err
}

// log docker-registry pod output before re-deploying
waitForVersion := dc.Status.LatestVersion + 1
if err = LogRegistryPod(oc); err != nil {
fmt.Fprintf(g.GinkgoWriter, "failed to log registry pod: %v\n", err)
}

err = oc.Run("env").Args(append([]string{"dc/docker-registry"}, envOverrides...)...).Execute()
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions test/extended/util/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@ func (c *CLI) SetNamespace(ns string) *CLI {
}

// WithoutNamespace instructs the command should be invoked without adding --namespace parameter
func (c *CLI) WithoutNamespace() *CLI {
func (c CLI) WithoutNamespace() *CLI {
c.withoutNamespace = true
return c
return &c
}

// SetOutputDir change the default output directory for temporary files
Expand Down