diff --git a/docs/toml.md b/docs/toml.md index 943e3f0de..25245c4bc 100644 --- a/docs/toml.md +++ b/docs/toml.md @@ -951,7 +951,7 @@ Annotations can be used on containers to override default behaviour for the whol - `traefik.frontend.rule.type: PathPrefixStrip`: override the default frontend rule type (Default: `PathPrefix`). -You can find here an example [ingress](https://raw.githubusercontent.com/containous/traefik/master/examples/k8s.ingress.yaml) and [replication controller](https://raw.githubusercontent.com/containous/traefik/master/examples/k8s.rc.yaml). +You can find here an example [ingress](https://raw.githubusercontent.com/containous/traefik/master/examples/k8s/cheese-ingress.yaml) and [replication controller](https://raw.githubusercontent.com/containous/traefik/master/examples/k8s/traefik.yaml). ## Consul backend diff --git a/examples/k8s.ingress.yaml b/examples/k8s.ingress.yaml deleted file mode 100644 index e340406bf..000000000 --- a/examples/k8s.ingress.yaml +++ /dev/null @@ -1,111 +0,0 @@ -# 3 Services for the 3 endpoints of the Ingress -apiVersion: v1 -kind: Service -metadata: - name: service1 - labels: - app: whoami -spec: - type: NodePort - ports: - - port: 80 - nodePort: 30283 - targetPort: 80 - protocol: TCP - name: https - selector: - app: whoami ---- -apiVersion: v1 -kind: Service -metadata: - name: service2 - labels: - app: whoami -spec: - type: NodePort - ports: - - port: 80 - nodePort: 30284 - targetPort: 80 - protocol: TCP - name: http - selector: - app: whoami ---- -apiVersion: v1 -kind: Service -metadata: - name: service3 - labels: - app: whoami -spec: - type: NodePort - ports: - - port: 80 - nodePort: 30285 - targetPort: 80 - protocol: TCP - name: http - selector: - app: whoami ---- -# A single RC matching all Services -apiVersion: v1 -kind: ReplicationController -metadata: - name: whoami -spec: - replicas: 1 - template: - metadata: - labels: - app: whoami - spec: - containers: - - name: whoami - image: emilevauge/whoami - ports: - - containerPort: 80 ---- -# An Ingress with 2 hosts and 3 endpoints -apiVersion: extensions/v1beta1 -kind: Ingress -metadata: - name: whoami-ingress -spec: - rules: - - host: foo.localhost - http: - paths: - - path: /bar - backend: - serviceName: service1 - servicePort: 80 - - host: bar.localhost - http: - paths: - - backend: - serviceName: service2 - servicePort: 80 - - backend: - serviceName: service3 - servicePort: 80 - ---- -# Another Ingress with PathPrefixStrip -apiVersion: extensions/v1beta1 -kind: Ingress -metadata: - name: whoami-ingress-stripped - annotations: - traefik.frontend.rule.type: "PathPrefixStrip" -spec: - rules: - - host: foo.localhost - http: - paths: - - path: /prefixWillBeStripped - backend: - serviceName: service1 - servicePort: 80 diff --git a/examples/k8s.rc.yaml b/examples/k8s.rc.yaml deleted file mode 100644 index 43d3029d5..000000000 --- a/examples/k8s.rc.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: v1 -kind: ReplicationController -metadata: - name: traefik-ingress-controller - labels: - k8s-app: traefik-ingress-lb -spec: - replicas: 1 - selector: - k8s-app: traefik-ingress-lb - template: - metadata: - labels: - k8s-app: traefik-ingress-lb - name: traefik-ingress-lb - spec: - terminationGracePeriodSeconds: 60 - containers: - - image: traefik - name: traefik-ingress-lb - imagePullPolicy: Always - ports: - - containerPort: 80 - hostPort: 80 - - containerPort: 443 - hostPort: 443 - - containerPort: 8080 - args: - - --web - - --kubernetes - - --logLevel=DEBUG \ No newline at end of file diff --git a/examples/k8s/traefik.yaml b/examples/k8s/traefik.yaml index 470cd235f..86e17fcea 100644 --- a/examples/k8s/traefik.yaml +++ b/examples/k8s/traefik.yaml @@ -16,11 +16,12 @@ spec: labels: k8s-app: traefik-ingress-lb name: traefik-ingress-lb - version: v1.0.0 + version: v1.1.0 spec: terminationGracePeriodSeconds: 60 + hostNetwork: true containers: - - image: traefik:v1.0.0 + - image: traefik:v1.1.0 name: traefik-ingress-lb resources: limits: