Skip to content

Commit

Permalink
bump manifests apiVersion to apps/v1
Browse files Browse the repository at this point in the history
Since k8s 1.16 will remove support for extensions/v1beta1 API version we
should bump the manifests that we use in our tests to accommodate for
the upcoming k8s version.

Signed-off-by: André Martins <andre@cilium.io>
  • Loading branch information
aanm committed Sep 3, 2019
1 parent f1c5760 commit f4ec8ea
Show file tree
Hide file tree
Showing 34 changed files with 264 additions and 66 deletions.
15 changes: 12 additions & 3 deletions examples/kubernetes-cassandra/cass-sw-app.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: cass-server
spec:
selector:
matchLabels:
app: cass-server
replicas: 1
template:
metadata:
Expand Down Expand Up @@ -32,11 +35,14 @@ spec:
app: cass-server
clusterIP: None
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: empire-hq
spec:
selector:
matchLabels:
app: empire-hq
replicas: 1
template:
metadata:
Expand All @@ -49,11 +55,14 @@ spec:
command: ["sleep"]
args: ["30000"]
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: empire-outpost
spec:
selector:
matchLabels:
app: empire-outpost
replicas: 1
template:
metadata:
Expand Down
2 changes: 1 addition & 1 deletion examples/kubernetes-grpc/cc-door-app.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
Expand Down
6 changes: 5 additions & 1 deletion examples/kubernetes-istio/authaudit-logger-v1.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: authaudit-logger-v1
spec:
selector:
matchLabels:
app: authaudit-logger
version: v1
replicas: 1
template:
metadata:
Expand Down
6 changes: 5 additions & 1 deletion examples/kubernetes-istio/bookinfo-details-v1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,15 @@ specs:
- method: GET
path: "/details/[0-9]*"
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: details-v1
spec:
selector:
matchLabels:
app: details
version: v1
replicas: 1
template:
metadata:
Expand Down
6 changes: 5 additions & 1 deletion examples/kubernetes-istio/bookinfo-productpage-v1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,15 @@ specs:
- method: GET
path: "/api/v1/products/[0-9]*/ratings"
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: productpage-v1
spec:
selector:
matchLabels:
app: productpage
version: v1
replicas: 1
template:
metadata:
Expand Down
6 changes: 5 additions & 1 deletion examples/kubernetes-istio/bookinfo-productpage-v2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,15 @@ specs:
- method: GET
path: "/api/v1/products/[0-9]*"
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: productpage-v2
spec:
selector:
matchLabels:
app: productpage
version: v2
replicas: 1
template:
metadata:
Expand Down
6 changes: 5 additions & 1 deletion examples/kubernetes-istio/bookinfo-ratings-v1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,15 @@ specs:
- method: GET
path: "/ratings/[0-9]*"
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: ratings-v1
spec:
selector:
matchLabels:
app: ratings
version: v1
replicas: 1
template:
metadata:
Expand Down
6 changes: 5 additions & 1 deletion examples/kubernetes-istio/bookinfo-reviews-v1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,15 @@ specs:
- method: GET
path: "/reviews/[0-9]*"
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: reviews-v1
spec:
selector:
matchLabels:
app: reviews
version: v1
replicas: 1
template:
metadata:
Expand Down
6 changes: 5 additions & 1 deletion examples/kubernetes-istio/bookinfo-reviews-v2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,15 @@ specs:
- method: GET
path: "/reviews/[0-9]*"
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: reviews-v2
spec:
selector:
matchLabels:
app: reviews
version: v2
replicas: 1
template:
metadata:
Expand Down
32 changes: 26 additions & 6 deletions examples/kubernetes-kafka/kafka-sw-app.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: kafka-broker
spec:
selector:
matchLabels:
app: kafka
replicas: 1
template:
metadata:
Expand All @@ -29,11 +32,14 @@ spec:
- name: KAFKA_ZOOKEEPER_CONNECTION_TIMEOUT_MS
value: "60000"
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: zookeeper
spec:
selector:
matchLabels:
app: zook
replicas: 1
template:
metadata:
Expand Down Expand Up @@ -77,11 +83,14 @@ spec:
app: kafka
clusterIP: None
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: empire-hq
spec:
selector:
matchLabels:
app: empire-hq
replicas: 1
template:
metadata:
Expand All @@ -92,11 +101,15 @@ spec:
- name: empire-hq
image: docker.io/cilium/kafkaclient
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: empire-outpost-8888
spec:
selector:
matchLabels:
app: empire-outpost
outpostid: "8888"
replicas: 1
template:
metadata:
Expand All @@ -108,11 +121,15 @@ spec:
- name: empire-outpost-8888
image: docker.io/cilium/kafkaclient
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: empire-outpost-9999
spec:
selector:
matchLabels:
app: empire-outpost
outpostid: "9999"
replicas: 1
template:
metadata:
Expand All @@ -124,11 +141,14 @@ spec:
- name: empire-outpost-9999
image: docker.io/cilium/kafkaclient
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: empire-backup
spec:
selector:
matchLabels:
app: empire-backup
replicas: 1
template:
metadata:
Expand Down
20 changes: 16 additions & 4 deletions examples/kubernetes-memcached/memcd-sw-app.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: memcached-server
spec:
selector:
matchLabels:
app: memcd-server
replicas: 1
template:
metadata:
Expand Down Expand Up @@ -32,11 +35,14 @@ spec:
app: memcd-server
clusterIP: None
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: a-wing
spec:
selector:
matchLabels:
app: a-wing
replicas: 1
template:
metadata:
Expand All @@ -49,11 +55,14 @@ spec:
command: ["sleep"]
args: ["30000"]
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: x-wing
spec:
selector:
matchLabels:
app: x-wing
replicas: 1
template:
metadata:
Expand All @@ -66,11 +75,14 @@ spec:
command: ["sleep"]
args: ["30000"]
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: alliance-tracker
spec:
selector:
matchLabels:
name: fleet-tracker
replicas: 1
template:
metadata:
Expand Down
6 changes: 5 additions & 1 deletion examples/kubernetes/addons/flannel/flannel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ data:
}
}
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: kube-flannel-ds-amd64
Expand All @@ -88,6 +88,10 @@ metadata:
tier: node
app: flannel
spec:
selector:
matchLabels:
tier: node
app: flannel
template:
metadata:
labels:
Expand Down
4 changes: 2 additions & 2 deletions examples/kubernetes/addons/prometheus/monitoring-example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ data:
target_label: __metrics_path__
replacement: /api/v1/nodes/${1}/proxy/metrics/cadvisor
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
Expand Down Expand Up @@ -230,7 +230,7 @@ spec:
app: prometheus
type: ClusterIP
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ data:
target_label: __metrics_path__
replacement: /api/v1/nodes/${1}/proxy/metrics/cadvisor
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
Expand Down

0 comments on commit f4ec8ea

Please sign in to comment.