Add calico-pull-secret by mgleung · Pull Request #9868 · openshift/openshift-ansible

mgleung · 2018-08-31T21:40:29Z

Adds the use of image credentials for Calico images in case the Calico image is hosted in an image registry that requires credentials to access.

This is a copy of #9867 against the release-3.10 branch.

papr-bot · 2018-08-31T22:17:29Z

Can one of the admins verify this patch?
I understand the following commands:

bot, add author to whitelist
bot, test pull request
bot, test pull request once

vrutkovs · 2018-09-17T12:39:55Z

/ok-to-test

mgleung · 2018-09-20T21:21:08Z

@vrutkovs Can I get you to take another look at this now that #9867 has been merged?

vrutkovs · 2018-09-21T07:56:10Z

roles/calico_master/tasks/main.yml

+    -f {{ mktemp.stdout }}/calico-pull-secret.yml
+    --config={{ openshift.common.config_base }}/master/admin.kubeconfig
+  register: calico_pull_secret_create_output
+  failed_when: "calico_pull_secret_create_output.rc != 0"


This should exclude cases where stdout has Already exists - so that the playbook could be rerun several times and work properly on multi-master setup

I might be misunderstanding, but I thought the apply command has an exit code of 0 when it modifies a resource, creates a resource, or leaves a resource unchanged?

Here are the results of testing it in my own environment:

$ oc apply -f test-ps.yaml secret "test-calico-pull-secret" created $ echo $? 0 $ oc apply -f test-ps.yaml secret "test-calico-pull-secret" unchanged $ echo $? 0 $ vim test-ps.yaml $ oc apply -f test-ps.yaml secret "test-calico-pull-secret" configured $ echo $? 0

Am I looking at the right values?

Ah, right, we're using apply here, it would error only when create is used

vrutkovs

/lgtm

openshift-ci-robot · 2018-09-24T10:42:25Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mgleung, vrutkovs

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [vrutkovs]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-bot · 2018-09-24T10:44:14Z

/retest