Skip to content

Bug 1697644: test/extended: update test to use openshift-config pull-secret #22508

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

Merged
openshift-merge-robot merged 1 commit into from
Apr 12, 2019
Merged

Bug 1697644: test/extended: update test to use openshift-config pull-secret #22508

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
4 changes: 1 addition & 3 deletions test/extended/operators/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ var _ = Describe("[Feature:Platform][Smoke] Managed cluster", func() {
oc := exutil.NewCLIWithoutNamespace("operators")

It("should ensure pods use images from our release image with proper ImagePullPolicy", func() {
// TODO this should probably be in openshift-config and have a name like "openshift-pull-secret"
// get the image pull secret and write it to a temporary location
imagePullSecret, err := oc.KubeFramework().ClientSet.CoreV1().Secrets("kube-system").Get("coreos-pull-secret", metav1.GetOptions{})
imagePullSecret, err := oc.KubeFramework().ClientSet.CoreV1().Secrets("openshift-config").Get("pull-secret", metav1.GetOptions{})
if err != nil {
e2e.Failf("unable to get pull secret for cluster: %v", err)
}
Expand Down
6 changes: 3 additions & 3 deletions test/extended/prometheus/prometheus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,12 +363,12 @@ func locatePrometheus(oc *exutil.CLI) (url, bearerToken string, ok bool) {
}

func hasPullSecret(client clientset.Interface, name string) bool {
scrt, err := client.CoreV1().Secrets("kube-system").Get("coreos-pull-secret", metav1.GetOptions{})
scrt, err := client.CoreV1().Secrets("openshift-config").Get("pull-secret", metav1.GetOptions{})
if err != nil {
if kapierrs.IsNotFound(err) {
return false
}
e2e.Failf("could not retrieve coreos-pull-secret: %v", err)
e2e.Failf("could not retrieve pull-secret: %v", err)
}

if scrt.Type != v1.SecretTypeDockerConfigJson {
Expand All @@ -382,7 +382,7 @@ func hasPullSecret(client clientset.Interface, name string) bool {
}{}

if err := json.Unmarshal(scrt.Data[v1.DockerConfigJsonKey], &ps); err != nil {
e2e.Failf("could not unmarshal pullSecret from coreos-pull-secret: %v", err)
e2e.Failf("could not unmarshal pullSecret from openshift-config/pull-secret: %v", err)
}
return len(ps.Auths[name].Auth) > 0
}