Skip to content
This repository has been archived by the owner on May 18, 2020. It is now read-only.

Update all-in-one-template in accordance with k8s 1.16 #122

Closed
wants to merge 3 commits into from
Closed
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
20 changes: 17 additions & 3 deletions all-in-one/jaeger-all-in-one-template.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2017-2019 The Jaeger Authors
# Copyright 2017-2020 The Jaeger Authors
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
# in compliance with the License. You may obtain a copy of the License at
Expand All @@ -15,7 +15,7 @@
apiVersion: v1
kind: List
items:
- apiVersion: extensions/v1beta1
- apiVersion: apps/v1
kind: Deployment
metadata:
name: jaeger
Expand All @@ -25,6 +25,9 @@ items:
app.kubernetes.io/component: all-in-one
spec:
replicas: 1
selector:
matchLabels:
app: jaeger
strategy:
type: Recreate
template:
Expand Down Expand Up @@ -75,6 +78,9 @@ items:
port: 80
protocol: TCP
targetPort: 16686
selector:
matchLabels:
app: jaeger-query
selector:
app.kubernetes.io/name: jaeger
app.kubernetes.io/component: all-in-one
Expand All @@ -101,6 +107,9 @@ items:
port: 9411
protocol: TCP
targetPort: 9411
selector:
matchLabels:
app: jaeger-collector
selector:
app.kubernetes.io/name: jaeger
app.kubernetes.io/component: all-in-one
Expand Down Expand Up @@ -132,6 +141,9 @@ items:
protocol: TCP
targetPort: 5778
clusterIP: None
selector:
matchLabels:
app: jaeger-agent
selector:
app.kubernetes.io/name: jaeger
app.kubernetes.io/component: all-in-one
Expand All @@ -150,7 +162,9 @@ items:
protocol: TCP
targetPort: 9411
clusterIP: None
selector:
matchLabels:
app: zipkin
selector:
app.kubernetes.io/name: jaeger
app.kubernetes.io/component: all-in-one

6 changes: 3 additions & 3 deletions travis/install-start-minikube.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Copyright 2017-2018 The Jaeger Authors
# Copyright 2017-2020 The Jaeger Authors
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
# in compliance with the License. You may obtain a copy of the License at
Expand All @@ -13,8 +13,8 @@
# the License.
#

curl -Lo minikube https://storage.googleapis.com/minikube/releases/v0.25.0/minikube-linux-amd64 && chmod +x minikube
curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.9.0/bin/linux/amd64/kubectl && chmod +x kubectl
curl -Lo minikube https://storage.googleapis.com/minikube/releases/v1.5.2/minikube-linux-amd64 && chmod +x minikube
curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.16.2/bin/linux/amd64/kubectl && chmod +x kubectl

export MINIKUBE_WANTUPDATENOTIFICATION=false
export MINIKUBE_WANTREPORTERRORPROMPT=false
Expand Down