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

Update version of oc used in oc image #1158

Merged
merged 12 commits into from
Nov 20, 2019

Conversation

shreddedbacon
Copy link
Member

Checklist

  • Affected Issues have been mentioned in the Closing issues section
  • Documentation has been written/updated.
  • Changelog entry has been written

The version of oc (3.7.2) used in the oc image has an issue when updating annotations that contain a / in them, version 3.9.0 contains a fix for this which will resolve issue #1083 when trying to set idling.alpha.openshift.io/unidle-targets=..

Changelog Entry

Change - Update oc version in oc image from 3.7.2 to 3.9.0

Closing issues

closes #1083

@Schnitzel Schnitzel added this to the v1.0.0 RBAC milestone Aug 21, 2019
Schnitzel added a commit that referenced this pull request Aug 28, 2019
Update version of oc used in oc image
@Schnitzel Schnitzel modified the milestones: v1.0.0 RBAC, v1.1.0 Aug 29, 2019
@Schnitzel Schnitzel modified the milestones: v1.1.0, v1.2.0 Oct 5, 2019
@Schnitzel
Copy link
Contributor

@shreddedbacon
so this fails here: https://github.com/amazeeio/lagoon/blob/master/images/oc-build-deploy-dind/scripts/exec-openshift-create-route.sh#L5
Logs:

�[35;1mopenshiftbuilddeploymonitor_1    |�[0m +++ oc --insecure-skip-tls-verify -n ci-node-node10 patch route customdomain-will-be-main-domain.com -p '{"metadata":{"annotations":{"kubernetes.io/tls-acme":"true","haproxy.router.openshift.io/hsts_header":"null"}},"spec":{"to":{"name":"node"},"tls":{"insecureEdgeTerminationPolicy":"Redirect"}}}'
�[35;1mopenshiftbuilddeploymonitor_1    |�[0m route "customdomain-will-be-main-domain.com" not patched

the problem is that oc patch in version 3.7 does return a shell returncode of 0 if a patch doesn't change anything, now in 3.9 oc patch returns with returncode of non-0 if there is nothing to patch.
So we should find a way that oc patch does not fail with non-0 if there was nothing to patch, or find a way that the bash script can catch this.

@shreddedbacon
Copy link
Member Author

Ahh, bugger. I'll see what I can figure out

@tobybellwood
Copy link
Member

It's fixed upstream in openshift 3.11 openshift/origin#20665 - can we use that in testing - or do we need to use 3.9?

@shreddedbacon
Copy link
Member Author

Maybe we can use 3.11, will try it out

@Schnitzel Schnitzel merged commit cc35bbe into uselagoon:master Nov 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Un-idle targets in service auto idler is not working correctly
3 participants