Fix oreg_url to work for our CI tests

[0xmichalis]

@mjudeikis ptal

Fixes openshift/openshift-ansible#9205

[mjudeikis]

/lgtm

[0xmichalis]

Unfortunately the bot is dead, @CecileRobertMichon @jackfrancis mind merging this?

[0xmichalis]

Unfortunately the bot is dead, @CecileRobertMichon @jackfrancis mind merging this?

Hold on, I think there is something more missing.

[0xmichalis]

This should be ready now but it's unclear why go-bindata does not cooperate. I have updated my local binary and running make validate-generated locally passes for me...

[jim-minter]

@Kargakis you have a different version of go-bindata to the CI system?

[jim-minter]

@Kargakis is it correct that ${component}:${version} is not shell /single/ quoted? Can this work as is?

[0xmichalis]

dollar signs need to be escaped, fixed!

[0xmichalis]

@Kargakis you have a different version of go-bindata to the CI system?

Both CircleCI and I are fetching go-bindata on the spot (go get github.com/go-bindata/go-bindata/...)

[CecileRobertMichon]

@Kargakis let me know when this is ready, I'll run the tests and merge it

[0xmichalis]

this is ready now

[codecov]

Codecov Report

Merging #3480 into master will decrease coverage by <.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #3480      +/-   ##
==========================================
- Coverage   55.95%   55.94%   -0.01%     
==========================================
  Files         105      105              
  Lines       15919    15888      -31     
==========================================
- Hits         8907     8889      -18     
+ Misses       6262     6253       -9     
+ Partials      750      746       -4

[0xmichalis]

For some reason, with this fix ansible breaks the image config format for the router and the registry

failed: [localhost] (item={u'name': u'router', u'certificate': {u'keyfile': u'/etc/origin//master/openshift-router.key', u'certfile': u'/etc/origin//master/openshift-router.crt', u'cafile': u'/etc/origin//master/ca.crt'}, u'replicas': u'1', u'serviceaccount': u'router', u'namespace': u'default', u'selector': u'region=infra', u'edits': [{u'action': u'put', u'key': u'spec.strategy.rollingParams.intervalSeconds', u'value': 1}, {u'action': u'put', u'key': u'spec.strategy.rollingParams.updatePeriodSeconds', u'value': 1}, {u'action': u'put', u'key': u'spec.strategy.activeDeadlineSeconds', u'value': 21600}], u'images': u'openshift/origin-${component}:${version}-${component}:${version}', u'stats_port': 1936, u'ports': [u'80:80', u'443:443']}) => {"changed": false, "item": {"certificate": {"cafile": "/etc/origin//master/ca.crt", "certfile": "/etc/origin//master/openshift-router.crt", "keyfile": "/etc/origin//master/openshift-router.key"}, "edits": [{"action": "put", "key": "spec.strategy.rollingParams.intervalSeconds", "value": 1}, {"action": "put", "key": "spec.strategy.rollingParams.updatePeriodSeconds", "value": 1}, {"action": "put", "key": "spec.strategy.activeDeadlineSeconds", "value": 21600}], "images": "openshift/origin-${component}:${version}-${component}:${version}", "name": "router", "namespace": "default", "ports": ["80:80", "443:443"], "replicas": "1", "selector": "region=infra", "serviceaccount": "router", "stats_port": 1936}, "msg": {"cmd": "/usr/bin/oc create -f /tmp/router-9uW9yF -n default", "results": {}, "returncode": 1, "stderr": "Error from server: error when creating \"/tmp/router-9uW9yF\": timeout\n", "stdout": ""}}

Error is unrelated but you can see that the images field is wrong (openshift/origin-${component}:${version}-${component}:${version}).

[0xmichalis]

For some reason, with this fix ansible breaks the image config format for the router and the registry

OK, I think I figured this out (once again).

[jim-minter]

lgtm - @CecileRobertMichon or @jackfrancis please merge