Skip to content

Commit

Permalink
Update deprecated APIs in Docs
Browse files Browse the repository at this point in the history
Signed-off-by: Ricardo Pchevuzinske Katz <[email protected]>
  • Loading branch information
rikatz committed Jul 5, 2020
1 parent 36cc7f8 commit 9a9db62
Show file tree
Hide file tree
Showing 17 changed files with 25 additions and 21 deletions.
2 changes: 1 addition & 1 deletion docs/content/en/docs/configuration/command-line.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ remove old configuration files. If `0`, the default value, a single `haproxy.cfg
Some infrastructure tools like `external-DNS` relay in the ingress status to created access routes to the services exposed with ingress object.

```
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
...
status:
Expand Down
2 changes: 1 addition & 1 deletion docs/content/en/docs/examples/blue-green.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Configure the ingress resource. No need to change the host below, `bluegreen.exa

```
$ kubectl create -f - <<EOF
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
annotations:
Expand Down
2 changes: 1 addition & 1 deletion docs/content/en/docs/examples/metrics.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Create the ingress which will expose Grafana. Change `HOST` below to a domain of
```
HOST=grafana.192.168.1.1.nip.io
kubectl create -f - <<EOF
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
name: grafana
Expand Down
2 changes: 1 addition & 1 deletion docs/content/en/docs/examples/metrics/whoami-ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
annotations:
Expand Down
2 changes: 1 addition & 1 deletion docs/content/en/docs/examples/modsecurity.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ No need to use a valid domain, `echo.domain` below is fine:

```console
$ kubectl create -f - <<EOF
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
annotations:
Expand Down
2 changes: 1 addition & 1 deletion docs/content/en/docs/getting-started/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ Obs.: `nip.io` is a convenient service which converts a valid domain name to any
```shell
$ HOST=nginx.192.168.1.1.nip.io
$ kubectl create -f - <<EOF
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
name: nginx
Expand Down
2 changes: 2 additions & 0 deletions docs/haproxy-ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ rules:
- watch
- apiGroups:
- "extensions"
- "networking.k8s.io" # Extensions is dreprecated in newer versions
resources:
- ingresses
verbs:
Expand All @@ -57,6 +58,7 @@ rules:
- patch
- apiGroups:
- "extensions"
- "networking.k8s.io" # Extensions is dreprecated in newer versions
resources:
- ingresses/status
verbs:
Expand Down
10 changes: 6 additions & 4 deletions docs/static/resources/haproxy-ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
name: ingress-controller
namespace: ingress-controller
---
apiVersion: rbac.authorization.k8s.io/v1beta1
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: ingress-controller
Expand Down Expand Up @@ -41,6 +41,7 @@ rules:
- watch
- apiGroups:
- "extensions"
- "networking.k8s.io" # Extensions is dreprecated in newer versions
resources:
- ingresses
verbs:
Expand All @@ -56,12 +57,13 @@ rules:
- patch
- apiGroups:
- "extensions"
- "networking.k8s.io" # Extensions is dreprecated in newer versions
resources:
- ingresses/status
verbs:
- update
---
apiVersion: rbac.authorization.k8s.io/v1beta1
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: ingress-controller
Expand Down Expand Up @@ -98,7 +100,7 @@ rules:
- create
- update
---
apiVersion: rbac.authorization.k8s.io/v1beta1
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: ingress-controller
Expand All @@ -114,7 +116,7 @@ subjects:
kind: User
name: ingress-controller
---
apiVersion: rbac.authorization.k8s.io/v1beta1
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: ingress-controller
Expand Down
6 changes: 3 additions & 3 deletions examples/auth/oauth/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ After editing, create the oauth2-proxy deployment and service:

```
$ kubectl create -f oauth2-proxy.yaml
deployment.extensions "oauth2-proxy" created
service "oauth2-proxy" exposed
ingress.networking.k8s.io/app "oauth2-proxy" created
service/oauth2-proxy created
```

## Deploy the application
Expand Down Expand Up @@ -93,7 +93,7 @@ After editing, create the ingress resource:

```
$ kubectl create -f app.yaml
ingress.extensions "app" created
ingress.networking.k8s.io/app "app" created
```

Fire a request to your domain and an optional `/uri`. Your OAuth2
Expand Down
2 changes: 1 addition & 1 deletion examples/auth/oauth/app.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
annotations:
Expand Down
2 changes: 1 addition & 1 deletion examples/blue-green/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Configure the ingress resource. No need to change the host below, `bluegreen.exa

```
$ kubectl create -f - <<EOF
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
annotations:
Expand Down
2 changes: 1 addition & 1 deletion examples/deployment/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ From now the optional web app should be deployed. Deploy an ingress resource to

```console
$ kubectl --namespace=ingress-controller create -f - <<EOF
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
name: app
Expand Down
2 changes: 1 addition & 1 deletion examples/deployment/haproxy-ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# see https://kubernetes.io/docs/reference/workloads-18-19
apiVersion: apps/v1beta2
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
Expand Down
2 changes: 1 addition & 1 deletion examples/modsecurity/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ No need to use a valid domain, `echo.domain` below is fine:

```console
$ kubectl create -f - <<EOF
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
annotations:
Expand Down
2 changes: 1 addition & 1 deletion examples/multi-tls/ingress-multi-tls.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
name: app
Expand Down
2 changes: 1 addition & 1 deletion examples/tls-termination/ingress-tls-default.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
name: app
Expand Down
2 changes: 1 addition & 1 deletion examples/tls-termination/ingress-tls-foobar.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
name: app
Expand Down

0 comments on commit 9a9db62

Please sign in to comment.