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.

Sign up for GitHub

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

Jump to bottom

Official documentation on Poseidon/Firmament, a new multi-scheduler #12343

Merged
merged 2 commits into from
Jan 29, 2019
Merged

Official documentation on Poseidon/Firmament, a new multi-scheduler #12343

merged 2 commits into from
Jan 29, 2019

Conversation

anvithks
Copy link

Ref PR #12069 and #11752

Bringing dev-1.14 branch inline with master.

/assign @chenopis

@deepak-vij @chenopis As per the discussions I have cherry-picked the PR here.

@k8sio-netlify-preview-bot
Copy link
Collaborator

k8sio-netlify-preview-bot commented Jan 23, 2019 •
edited
Loading

Deploy preview for kubernetes-io-vnext-staging processing.

Building with commit e47e512

https://app.netlify.com/sites/kubernetes-io-vnext-staging/deploys/5c497328bd2b7a000a959328

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/en Issues or PRs related to English language labels Jan 23, 2019
@kbhawkey
Copy link
Contributor

@anvithks, do you need to add this page to the docs dev-1.14 branch? The page is already on master and AFAIK will be merged into dev-1.14. Also, did you remove the other page/previous version of this content from the dev-1.14 branch, https://5c48640ab8cba4000906dee2--kubernetes-io-vnext-staging.netlify.com/docs/concepts/configuration/poseidon-firmament-alternate-scheduler/?

@tfogo
Copy link
Contributor

tfogo commented Jan 23, 2019

/assign @jimangel

@deepak-vij
Copy link

@anvithks, do you need to add this page to the docs dev-1.14 branch? The page is already on master and AFAIK will be merged into dev-1.14. Also, did you remove the other page/previous version of this content from the dev-1.14 branch, https://5c48640ab8cba4000906dee2--kubernetes-io-vnext-staging.netlify.com/docs/concepts/configuration/poseidon-firmament-alternate-scheduler/?

@kbhawkey, this is as desired by @chenopis. Andrew recommended that as master and 1.14-dev will eventually get merged together, so to prevent a conflict, we should cherry pick this merged commit and put it back in the dev branch.

As regards to earlier location of our content in 1.14-dev branch, I am assuming that cherry-picking the merged commit from master back to the dev branch should take care of it. Or the old location needs to be explicitly removed? If true, how do we do it? Please let us know. Thanks.

@kbhawkey
Copy link
Contributor

@anvithks, do you need to add this page to the docs dev-1.14 branch? The page is already on master and AFAIK will be merged into dev-1.14. Also, did you remove the other page/previous version of this content from the dev-1.14 branch, https://5c48640ab8cba4000906dee2--kubernetes-io-vnext-staging.netlify.com/docs/concepts/configuration/poseidon-firmament-alternate-scheduler/?

@kbhawkey, this is as desired by @chenopis. Andrew recommended that as master and 1.14-dev will eventually get merged together, so to prevent a conflict, we should cherry pick this merged commit and put it back in the dev branch.

Yes, sounds good. I assumed the conflict would be easy to resolve.

As regards to earlier location of our content in 1.14-dev branch, I am assuming that cherry-picking the merged commit from master back to the dev branch should take care of it. Or the old location needs to be explicitly removed? If true, how do we do it? Please let us know. Thanks.

Not sure, as the preview of dev-1.14 contains the older version. Let's see what @jimangel has to say. Thanks.

@jimangel
Copy link
Member

@anvithks after syncing with @chenopis - I understand what is going on here. We are merging this file to avoid a merge conflict at the end of the cycle.

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 23, 2019
@deepak-vij
Copy link

deepak-vij commented Jan 23, 2019 •
edited
Loading

@anvithks after syncing with @chenopis - I understand what is going on here. We are merging this file to avoid a merge conflict at the end of the cycle.

/lgtm
/approve

@anvithks, do you need to add this page to the docs dev-1.14 branch? The page is already on master and AFAIK will be merged into dev-1.14. Also, did you remove the other page/previous version of this content from the dev-1.14 branch, https://5c48640ab8cba4000906dee2--kubernetes-io-vnext-staging.netlify.com/docs/concepts/configuration/poseidon-firmament-alternate-scheduler/?

@kbhawkey, this is as desired by @chenopis. Andrew recommended that as master and 1.14-dev will eventually get merged together, so to prevent a conflict, we should cherry pick this merged commit and put it back in the dev branch.

Yes, sounds good. I assumed the conflict would be easy to resolve.

As regards to earlier location of our content in 1.14-dev branch, I am assuming that cherry-picking the merged commit from master back to the dev branch should take care of it. Or the old location needs to be explicitly removed? If true, how do we do it? Please let us know. Thanks.

Not sure, as the preview of dev-1.14 contains the older version. Let's see what @jimangel has to say. Thanks.

@jimangel & @chenopis, I am assuming after the merge, old location for the content on 1.14-dev branch goes away. Currently, I do see it in the preview as the PR is not merged yet?

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 24, 2019
@anvithks anvithks closed this Jan 24, 2019
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 24, 2019
@anvithks anvithks reopened this Jan 24, 2019
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 24, 2019
@anvithks
Official documentation on Poseidon/Firmament, a new multi-scheduler s…
e47e512 
…upport for K8S (kubernetes#12069)

* Official documentation on Poseidon/Firmament, a new multi-scheduler support for K8S. (kubernetes#11752)

* Added documentation about Poseidon-Firmament scheduler

* Fixed some style issues.

* Udpated the document as per the review comments.

* Fixed some typos and updated the document

* Updated the document as per the review comments.

* Updated the document as per review comments. Added config details.

* Updated the document as per the latest review comments. Fixed nits

* Made changes as per latest suggestions.

* Some more changes added.

* Updated as per suggestions.

* Changed the release process section.

* SIG Docs edits

Small edits to match style guidelines.

* add plus to feature state

* capitalization

* revert feature state shortcode

since this is a Kubernetes extension, not a direct feature, it shouldn't use the regular feature state tagging.

(cherry picked from commit 7730c15)
@anvithks
Copy link
Author

@kbhawkey you are right. The old file had to be removed from the previous location concepts/configuration.

@jimangel @chenopis I accidentally force pushed to the branch and lost the cherry-picked commit.

I have cherrypicked the commit again and also removed the old file.

Please check .

The dev1.14 and master branches are now synced.

@anvithks
Copy link
Author

/assign @jimangel
/assign @chenopis

chenopis
chenopis approved these changes Jan 25, 2019
View reviewed changes
Copy link
Contributor

@chenopis chenopis left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 25, 2019
@chenopis
Copy link
Contributor

I'll let @jimangel approve this.

@anvithks
Copy link
Author

/lgtm

Thank you Andrew.

@jimangel
Copy link
Member

/approve

@deepak-vij
Copy link

To fully approve this pull request, please assign additional approvers.
We suggest the following additional approver: chenopis

@jimangel & @chenopis , it is still waiting for additional approval from Andrew after Jim approved it. I thought Andrew already LGTMed it before.

@cody-clark
Copy link
Contributor

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cody-clark, jimangel

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

The pull request process is described here

Needs approval from an approver in each of these files:

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 29, 2019
@cody-clark
Copy link
Contributor

Thanks and sorry for the delay, @deepak-vij. I'm not sure why Jim's approve didn't go through.

@k8s-ci-robot k8s-ci-robot merged commit de2e67e into kubernetes:dev-1.14 Jan 29, 2019
@deepak-vij
Copy link

Thanks and sorry for the delay, @deepak-vij. I'm not sure why Jim's approve didn't go through.

Thanks all, appreciate it.

@jimangel
Copy link
Member

I need to still merge master into the dev-1.14 branch so it updates me as an owner (chicken and egg :/ ) Thanks! @cody-clark

@anvithks
Copy link
Author

Thanks all.

@anvithks anvithks mentioned this pull request Feb 4, 2019
Merged
k8s-ci-robot pushed a commit that referenced this pull request Mar 25, 2019
@jimangel @k8s-ci-robot
Official 1.14 Release Docs (#13174)
851ef58 
* Official documentation on Poseidon/Firmament, a new multi-scheduler support for K8S. (#11752)

* Added documentation about Poseidon-Firmament scheduler

* Fixed some style issues.

* Udpated the document as per the review comments.

* Fixed some typos and updated the document

* Updated the document as per the review comments.

* Document timeout attribute for kms-plugin. (#12158)

See 72540.

* Official documentation on Poseidon/Firmament, a new multi-scheduler  (#12343)

* Removed the old version of the Poseidon documentation. Incorrect location.

* Official documentation on Poseidon/Firmament, a new multi-scheduler support for K8S (#12069)

* Official documentation on Poseidon/Firmament, a new multi-scheduler support for K8S. (#11752)

* Added documentation about Poseidon-Firmament scheduler

* Fixed some style issues.

* Udpated the document as per the review comments.

* Fixed some typos and updated the document

* Updated the document as per the review comments.

* Updated the document as per review comments. Added config details.

* Updated the document as per the latest review comments. Fixed nits

* Made changes as per latest suggestions.

* Some more changes added.

* Updated as per suggestions.

* Changed the release process section.

* SIG Docs edits

Small edits to match style guidelines.

* add plus to feature state

* capitalization

* revert feature state shortcode

since this is a Kubernetes extension, not a direct feature, it shouldn't use the regular feature state tagging.

(cherry picked from commit 7730c15)

* Remove initializers from doc. It will be removed in 1.14 (#12331)

* kubeadm: Document CRI auto detection functionality (#12462)

Signed-off-by: Rostislav M. Georgiev <[email protected]>

* Minor doc change for GAing Pod DNS Config (#12514)

* Graduate ExpandInUsePersistentVolumes feature to beta (#10574)

* Rename 2018-11-07-grpc-load-balancing-with-linkerd.md.md file (#12594)

* Add dynamic percentage of node scoring to user docs (#12235)

* Add dynamic percentage of node scoring to user docs

* addressed review comments

* delete special symbol (#12445)

* Update documentation for VolumeSubpathEnvExpansion (#11843)

* Update documentation for VolumeSubpathEnvExpansion

* Address comments - improve descriptions

* Graduate Pod Priority and Preemption to GA (#12428)

* Added Instana links to the documentation (#12977)

* Added link to the Instana Kubernetes integration

* Added Instana link for services section

Added Instana and a link to the Kubernetes integration to the analytics services section and broadened the scope to APM, monitoring and analytics.

* Oxford comma /flex

* More Oxford commas, because they matter

* Update kubectl plugins to stable (#12847)

* documentation for CSI topology beta (#12889)

* Document changes to default RBAC discovery ClusterRole(Binding)s (#12888)

* Document changes to default RBAC discovery ClusterRole(Binding)s

Documentation for kubernetes/enhancements#789 and kubernetes/kubernetes#73807

* documentation review feedback

* CSI raw block to beta (#12931)

* Change incorrect string raw to block (#12926)

Fixes #12925

* Update documentation on node OS/arch labels (#12976)

These labels have been promoted to GA:
kubernetes/enhancements#793

* local pv GA doc updates (#12915)

* Publish CRD OpenAPI Documentation (#12910)

* add documentation for CustomResourcePublishOpenAPI

* address comments

fix links, ordered lists, style and typo

* kubeadm: add document for upgrading from 1.13 to 1.14 (single CP and HA) (#13189)

* kubeadm: add document for upgrading from 1.13 to 1.14

- remove doc for upgrading 1.10 -> 1.11

* kubeadm: apply amends to upgrade-1.14 doc

* kubeadm: apply amends to upgrade-1.14 doc (part2)

* kubeadm: apply amends to upgrade-1.14 doc (part3)

* kubeadm: add note about "upgrade node experimental-control-plane"

+ add comment about `upgrade plan`

* kubeadm: add missing "You should see output similar to this"

* fix bullet indentation (#13214)

* mark PodReadinessGate GA (#12800)

* Update RuntimeClass documentation for beta (#13043)

* Update RuntimeClass documentation for beta

* Update feature gate & add upgrade section

* formatting fixes

* Highlight upgrade action required

* Address feedback

* CSI ephemeral volume alpha documentation (#10934)

* update kubectl documentation (#12867)

* update kubectl documentation

* add document for Secret/ConfigMap generators

* replace `kubectl create -f` by `kubectl apply -f`

* Add page for kustomization support in kubectl

* fix spelling errors and address comments

* Documentation for Windows GMSA feature (#12936)

* Documentation for Windows GMSA feature

Signed-off-by: Deep Debroy <[email protected]>

* Enhancements to GMSA docs

Signed-off-by: Deep Debroy <[email protected]>

* Fix links

Signed-off-by: Deep Debroy <[email protected]>

* Fix GMSA link

Signed-off-by: Deep Debroy <[email protected]>

* Add GMSA feature flag in feature flag list

Signed-off-by: Deep Debroy <[email protected]>

* Relocate GMSA to container configuration

Signed-off-by: Deep Debroy <[email protected]>

* Add example for container spec

Signed-off-by: Deep Debroy <[email protected]>

* Remove changes in Windows index

Signed-off-by: Deep Debroy <[email protected]>

* Update configure-gmsa.md

* Update configure-gmsa.md

* Update configure-gmsa.md

* Update configure-gmsa.md

* Rearrange the steps into two sections and other edits

Signed-off-by: Deep Debroy <[email protected]>

* Fix links

Signed-off-by: Deep Debroy <[email protected]>

* Add reference to script to generate GMSA YAMLs

Signed-off-by: Deep Debroy <[email protected]>

* Some more clarifications for GMSA

Signed-off-by: Deep Debroy <[email protected]>

* HugePages graduated to GA (#13004)

* HugePages graduated to GA

* fixing nit for build

* Docs for node PID limiting (kubernetes/kubernetes#73651) (#12932)

* kubeadm: update the reference documentation for 1.14 (#12911)

* kubeadm: update list of generated files for 1.14

NOTE: PLACEHOLDERS! these files are generated by SIG Docs each
release, but we need them to pass the k/website PR CI.

- add join_phase* (new sub phases of join)
- add init_phase_upload-certs.md (new upload certs phase for init)
- remove alpha-preflight (now both init and join have this)

* kubeadm: update reference docs includes for 1.14

- remove includes from alpha.md
- add upload-certs to init-phase.md
- add join-phase.md and it's phases

* kubeadm: update the editorial content of join and init

- cleanup master->control-plane node
- add some notes about phases and join
- remove table about pre-pulling images
- remove outdated info about self-hosting

* kubeadm: update target release for v1alpha3 removal

1.14 -> 1.15

* kubeadm: copy edits for 1.14 reference docs (part1)

* kubeadm: use "shell" for code blocks

* kubeadm: update the 1.14 HA guide (#13191)

* kubeadm: update the 1.14 HA guide

* kubeadm: try to fix note/caution indent in HA page

* kubeadm: fix missing sudo and minor amends in HA doc

* kubeadm: apply latest amends to the HA doc for 1.14

* fixed a few missed merge conflicts

* Admission Webhook new features doc (#12938)

- kubernetes/kubernetes#74998
- kubernetes/kubernetes#74477
- kubernetes/kubernetes#74562

* Clarifications and fixes in GMSA doc (#13226)

* Clarifications and fixes in GMSA doc

Signed-off-by: Deep Debroy <[email protected]>

* Update configure-gmsa.md

* Reformat to align headings and pre-reqs better

Signed-off-by: Deep Debroy <[email protected]>

* Reformat to align headings and pre-reqs better

Signed-off-by: Deep Debroy <[email protected]>

* Reformat to fix bullets

Signed-off-by: Deep Debroy <[email protected]>

* Reword application of sample gmsa

Signed-off-by: Deep Debroy <[email protected]>

* Update configure-gmsa.md

* Address feedback to use active voice

Signed-off-by: Deep Debroy <[email protected]>

* Address feedback to use active voice

Signed-off-by: Deep Debroy <[email protected]>

* RunAsGroup documentation for Progressing this to Beta (#12297)

* start serverside-apply documentation (#13077)

* start serverside-apply documentation

* add more concept info on server side apply

* Update api concepts

* Update api-concepts.md

* fix style issues

* Document CSI update (#12928)

* Document CSI update

* Finish CSI documentation

Also fix mistake with  ExpandInUsePersistentVolumes documented as beta

* Overall docs for CSI Migration feature (#12935)

* Placeholder docs for CSI Migration feature

Signed-off-by: Deep Debroy <[email protected]>

* Address CR comments and update feature gates

Signed-off-by: Deep Debroy <[email protected]>

* Add mappings for CSI plugins

Signed-off-by: Deep Debroy <[email protected]>

* Add sections for AWS and GCE PD migration

Signed-off-by: Deep Debroy <[email protected]>

* Add docs for Cinder and CSI Migration info

Signed-off-by: Deep Debroy <[email protected]>

* Clarify scope to volumes with file system

Signed-off-by: Deep Debroy <[email protected]>

* Change the format of EBS and Cinder CSI Migration sections to follow the GCE template

Signed-off-by: Deep Debroy <[email protected]>

* Windows documentation updates for 1.14 (#12929)

* Updated the note to indicate doc work for 1.14

* first attempt at md export from gdoc

* simplifyig

* big attempt

* moving DRAFT windows content to PR for review

* moving content to PR in markdown for review

* updated note tags

* Delete windows-contributing.md

deleting this file as it is already ported to the github contributor guide

* fixed formatting in intro and cluster setup guide

* updating formatting for running containers guide

* rejiggered end of troubleshooting

* fixed minor typos

* Clarified the windows binary download step

* Update _index.md

making updates based on feedback

* Update _index.md

updating ovn-kubernetes docs

* Update _index.md

* Update _index.md

* updating relative docs links

updating all the links to be relative links to /docs

* Update _index.md

* Update _index.md

updates for windows services and ovn-kubernetes

* formatted for correct step numbering

* fix typos

* Update _index.md

updates for flannel PR in troubleshooting

* Update _index.md

* Update _index.md

updating a few sections like roadmap, services, troubleshooting/filing tickets

* Update _index.md

* Update _index.md

* Update _index.md

* Fixed a few whitespace issues

* Update _index.md

* Update _index.md

* Update _index.md

* add section on upgrading CoreDNS (#12909)

* documentation for kubelet resource metrics endpoint (#12934)

* windows docs updates for 1.14 (#13279)

* Delete sample-l2bridge-wincni-config.json

this file is not used anywhere

* Update _index.md

* Update _index.md

* Update _index.md

* Update _index.md

* Update _index.md

* Rename content/en/docs/getting-started-guides/windows/_index.md to content/en/docs/setup/windows/_index.md

moving to new location

* Delete flannel-master-kubectl-get-ds.png

* Delete flannel-master-kubeclt-get-pods.png

* Delete windows-docker-error.png

* Add files via upload

* Rename _index.md to add-windows-nodes.md

* Create _index.md

* Update _index.md

* Update add-windows-nodes.md

* Update add-windows-nodes.md

* Create user-guide-windows-nodes.md

* Create user-guide-windows-containers.md

* Update and rename add-windows-nodes.md to intro-windows-nodes.md

* Update user-guide-windows-containers.md

* Rename intro-windows-nodes.md to intro-windows-in-kubernetes.md

* Update user-guide-windows-nodes.md

* Update user-guide-windows-containers.md

* Update user-guide-windows-containers.md

* Update user-guide-windows-nodes.md

* Update user-guide-windows-containers.md

* Update _index.md

* Update intro-windows-in-kubernetes.md

* Update intro-windows-in-kubernetes.md

fixing the pause image

* Update intro-windows-in-kubernetes.md

changing tables from html to MD

* Update user-guide-windows-nodes.md

converting tables from HTML to MD

* Update intro-windows-in-kubernetes.md

* Update user-guide-windows-nodes.md

* Update user-guide-windows-nodes.md

* Update user-guide-windows-nodes.md

updating the numbering , even though it messes up the notes a little bit. Jim will file a ticket to follow up

* Update user-guide-windows-nodes.md

* update to windows docs for 1.14 (#13322)

* Update intro-windows-in-kubernetes.md

* Update intro-windows-in-kubernetes.md

* Update intro-windows-in-kubernetes.md

* Update intro-windows-in-kubernetes.md

* Update intro-windows-in-kubernetes.md

* Update user-guide-windows-containers.md

* Update user-guide-windows-nodes.md

* Update intro-windows-in-kubernetes.md (#13344)

* server side apply followup (#13321)

* change some parts of serverside apply docs in response to comments

* fix typos and wording

* Update config.toml (#13365)
@deepak-vij
Copy link

Hi @anvithks, the following link seems to be broken now, any idea?

See here. https://kubernetes.io/docs/concepts/extend-kubernetes/poseidon-firmament-alternate-scheduler/

@anvithks
Copy link
Author

anvithks commented Dec 1, 2020

@deepak-vij

The documentation is versioned.
The URL above is for the latest version of K8S.
The docs are still available at https://v1-15.docs.kubernetes.io/docs/concepts/extend-kubernetes/poseidon-firmament-alternate-scheduler/

@deepak-vij
Copy link

@anvithks, does this change happened recently? Just curious.

@anvithks
Copy link
Author

anvithks commented Dec 1, 2020

@anvithks, does this change happened recently? Just curious.

I am not sure. I think Poseidon must be qualified for later versions of K8S.
Was it?

@deepak-vij
Copy link

@anvithks , in any case I will let you fix the links in the blog when you have time. Thanks.

@deepak-vij
Copy link

Hi @anvithks, a friendly ping, did you get a chance to fix the broken links in the blog entry. thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chenopis chenopis chenopis approved these changes

@jimangel jimangel Awaiting requested review from jimangel

@xiangpengzhao xiangpengzhao Awaiting requested review from xiangpengzhao

Assignees

@jimangel jimangel

@chenopis chenopis

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/en Issues or PRs related to English language lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@anvithks @k8sio-netlify-preview-bot @kbhawkey @tfogo @deepak-vij @jimangel @chenopis @cody-clark @k8s-ci-robot