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

Documentation/Manifests: Improve YMLs. #884

Merged
merged 2 commits into from
Nov 24, 2017
Merged

Documentation/Manifests: Improve YMLs. #884

merged 2 commits into from
Nov 24, 2017

Conversation

Gacko
Copy link
Contributor

@Gacko Gacko commented Nov 21, 2017

No description provided.

@tomdee
Copy link
Contributor

tomdee commented Nov 22, 2017

Could you make this change to the other two manifest files in this repo too?

@Gacko Gacko changed the title Doc: Use list notation and command with args. Documentation/Manifests: Use list notation and command with args. Nov 22, 2017
@Gacko
Copy link
Contributor Author

Gacko commented Nov 22, 2017

Done. I did not change the legacy init containers in some manifests since it would make them hardly readable.

@Gacko Gacko changed the title Documentation/Manifests: Use list notation and command with args. Documentation/Manifests: Improve YMLs. Nov 22, 2017
@@ -93,7 +94,7 @@ spec:
serviceAccountName: flannel
initContainers:
- name: install-cni
image: registry.cn-hangzhou.aliyuncs.com/google-containers/flannel:v0.9.0
image: registry.cn-hangzhou.aliyuncs.com/google-containers/flannel:v0.9.1
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this image actually exist? I don't have permissions to push to this repo...

Copy link
Contributor Author

@Gacko Gacko Nov 24, 2017

Choose a reason for hiding this comment

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

I don't know. I thought you already did so. I'll revert this change.

@tomdee
Copy link
Contributor

tomdee commented Nov 24, 2017

@Gacko Looks good, but I'm not sure about bumping the aliyun image - it might be safer to just leave that at 0.9.0

@Gacko
Copy link
Contributor Author

Gacko commented Nov 24, 2017

I removed the commit changing the version of the image from the aliyun registry.

@tomdee tomdee merged commit 83c984f into flannel-io:master Nov 24, 2017
@Gacko Gacko deleted the patch-1 branch November 24, 2017 20:11
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.

None yet

3 participants