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

Improvements to kubernetes-basics/expose-intro.html #3103

Merged
merged 14 commits into from
Apr 10, 2017

Conversation

mkorejo
Copy link
Contributor

@mkorejo mkorejo commented Mar 29, 2017

I was looking at issue 2907 and I thought this was something I could help with. I'm interested in contributing to the docs as I can. I couldn't do anything with the interactive part as that content seems auto-generated by katacoda. I assume I have to login at their site and do edits there once given the right access. Happy to do that too. In the meantime, take a look at these changes to the static part and see them running here:
http://104.198.206.107:9080/docs/tutorials/kubernetes-basics/expose-intro/

NOTE: Please check the “Allow edits from maintainers” box below to allow
reviewers fix problems on your patch and speed up the review process.
Please delete this note before submitting the pull request.


This change is Reviewable

Updates to the non-interactive tutorial on exposing apps via services
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 29, 2017
@chenopis chenopis self-assigned this Mar 29, 2017
@mkorejo mkorejo changed the title Patch 2907 Improvements to kubernetes-basics/expose-intro.html Mar 30, 2017
@mkorejo
Copy link
Contributor Author

mkorejo commented Mar 31, 2017

The travis-ci build may need to be restarted. This was opened a few days ago in the middle of their DB issue.

@chenopis
Copy link
Contributor

@mkorejo Might as well fix the merge conflict. That should kick off a new travis-ci build. If it happens again, I'll try to restart it via the travis-ci.org site.

@mkorejo
Copy link
Contributor Author

mkorejo commented Mar 31, 2017

@chenopis not following. I can't mark the conflict resolved as a I don't have the access. The changes in the PR are basically an overhaul of the page so there will always be a conflict that has to be merged manually by a contributor, if I understand correctly.

Am I doing this right or am I missing something? Thanks.

@chenopis
Copy link
Contributor

@mkorejo TL;DR: You many not have write privileges to master but you can pull from that into your branch and resolve the conflicts there.

If you're using the git command line or a git client, you'll need to pull master into your mkorejo:patch-2907 branch. It will give you a warning that there is a conflict, you can then go in and find which lines are in conflict and manually fix them. Then mark the conflict as resolved, do a commit, and then push the changes back up to your branch in GitHub.

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.

I just have one small nit. Looks good overall. Thanks for your contribution!

</div>
<div class="col-md-4">
<div class="content__box content__box_fill">
<p><i>You can create a Service at the same time you create a Deployment by using `--expose` in kubectl.</i></p>
Copy link
Contributor

Choose a reason for hiding this comment

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

Since markdown won't work here, you might want to remove the back ticks and try <code></code>. Also, currently, "--expose" is being wrapped, so I recommend putting a newline before the double hyphen.

screen shot 2017-04-03 at 11 00 57 am

<a class="btn btn-lg btn-success" href="/docs/tutorials/kubernetes-basics/expose-interactive/" role="button">Start Interactive Tutorial<span class="btn__next">›</span></a>
</div>
</div>
</main>
</div>
Copy link
Contributor

Choose a reason for hiding this comment

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

@chenopis
Copy link
Contributor

chenopis commented Apr 4, 2017

@jaredbhatti This ready to be merged now?

@mkorejo
Copy link
Contributor Author

mkorejo commented Apr 10, 2017

@jaredbhatti @chenopis still looking for a tech review? thanks for shuffling this along.

@chenopis chenopis merged commit 19305b4 into kubernetes:master Apr 10, 2017
chenopis added a commit that referenced this pull request Apr 11, 2017
…hub.io into migration-concepts-container-lifecycle-hooks

* 'master' of https://github.com/kubernetes/kubernetes.github.io: (374 commits)
  Move Guide topic: ConfigMap. (#3333)
  Move Guide topic: H Pod Autoscaling Walkthrough. (#3332)
  Deprecation phase 2: kubefed. (#3331)
  Deprecation phase 2: admin/index ... (#3330)
  Deprecation phase 2: config-best-practices ... (#3328)
  Deprecation phase 2: container-environment ... (#3326)
  Deprecation phase 2: jobs (#3323)
  Deprecation phase 2: managing-deployments ... (#3309)
  Deprecation phase 2: kubectl binary_release ... (#3308)
  Improvements to kubernetes-basics/expose-intro.html (#3103)
  test/examples_test.go: validate docs/user-guide/pod-security-policy/psp.yaml (#3100)
  Move cron jobs to keep glossary in alphabetical order.
  Fix API server args
  Remove /redirects.rb (#3305)
  Move Guide topic: kubelet Garbage Collection. (#3301)
  Move Guide topic: Salt. (#3306)
  Fix tilte. (#3304)
  WIP: Cleanup /docs/contribute/ migration (#3278)
  Move Guide topic: HA Master. (#3303)
  Move Guide topic: Addons. (#3302)
  ...

# Conflicts:
#	docs/api-reference/apps/v1beta1/definitions.html
#	docs/api-reference/batch/v1/definitions.html
#	docs/concepts/containers/container-lifecycle-hooks.md
gyliu513 pushed a commit to gyliu513/kubernetes.github.io that referenced this pull request Apr 26, 2017
* Massive updates to expose-intro.html

Updates to the non-interactive tutorial on exposing apps via services

* more updates to expose-intro

* fixed broken link

* fixed some wording

* removed extra space

* sub backticks for code and newline

* added small legend to fist svg

* fixed svg scaling

* removed extra div
@mkorejo mkorejo deleted the patch-2907 branch January 29, 2018 02:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants