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

Fix ist slaves #43

Merged
merged 1 commit into from Jun 20, 2017
Merged

Fix ist slaves #43

merged 1 commit into from Jun 20, 2017

Conversation

gabemontero
Copy link
Contributor

@bparees see openshift/origin#14756 (comment)

also i inadvertently cut a new release before merging this change .... i'll have to cut a 0.1.22 after 0.1.21 is complete

@@ -189,7 +189,8 @@ private synchronized void onInitialImageStream(ImageStreamList imageStreams) {
}
// for IST, can't set labels, so check annotations
if (ist != null && hasSlaveLabelOrAnnotation(ist.getMetadata().getAnnotations())) {
results.add(this.podTemplateFromData(ist.getMetadata().getName(),
// note, pod names cannot have colons
results.add(this.podTemplateFromData(ist.getMetadata().getName().replaceAll(":", "."),
Copy link
Contributor

Choose a reason for hiding this comment

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

so now "my.imagestream:foo" and "my:imagestream.foo" are going to get mapped to the same thing. are dots allowed in imagestream names and tag names? i suspect they are.

unfortunately this is hard problem for any separator unless there's a value that's valid in pod names and not valid in imagestreams or tag names.

@gabemontero
Copy link
Contributor Author

gabemontero commented Jun 20, 2017 via email

@bparees
Copy link
Contributor

bparees commented Jun 20, 2017

what was valid for pod names seemed pretty limited .... lower case aphanumeric, hyphens, and periods ... that was it according to the validation error message that came back

yeah most of this stuff accepts anything that's valid for a DNS name.

there are options to pick a more distinctive separator that's less likely to collide, but i admit even my scenario is relatively contrived.

@gabemontero
Copy link
Contributor Author

this commit passed tests in openshift repo ... given where the separator discussion landed with @bparees going to merge

the jenkins ci jobs are failing with some maven complaint regarding our pom's use of jdk 1.8 when the dependency of the k8s plugin was pulled in by Ryan, though mvn clean package works as does mvn release:prepare release:perform

will circle back to see if the pom.xml can be tweaked to clean those up after we cycle through last minute 3.6 bugs

@gabemontero gabemontero merged commit 4975eb4 into master Jun 20, 2017
@gabemontero gabemontero deleted the fix-ist-slaves branch June 20, 2017 21:53
scoheb pushed a commit to scoheb/openshift-sync-plugin that referenced this pull request Aug 16, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants