From bed738f888f5a96f831d51d32f1c100ac31fe09a Mon Sep 17 00:00:00 2001 From: fredrikssongustav Date: Mon, 11 Nov 2019 17:37:53 +0100 Subject: [PATCH 1/3] Update all-in-one-template in accordance with k8s 1.16 Signed-off-by: fredrikssongustav Signed-off-by: Gustav Fredriksson --- all-in-one/jaeger-all-in-one-template.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/all-in-one/jaeger-all-in-one-template.yml b/all-in-one/jaeger-all-in-one-template.yml index d1f2ef0..0202eb3 100644 --- a/all-in-one/jaeger-all-in-one-template.yml +++ b/all-in-one/jaeger-all-in-one-template.yml @@ -15,7 +15,7 @@ apiVersion: v1 kind: List items: -- apiVersion: extensions/v1beta1 +- apiVersion: apps/v1 kind: Deployment metadata: name: jaeger @@ -25,6 +25,9 @@ items: app.kubernetes.io/component: all-in-one spec: replicas: 1 + selector: + matchLabels: + app: jaeger strategy: type: Recreate template: @@ -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 @@ -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 @@ -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 @@ -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 - From e31f32f7ef65fc31847154264ee972b981b3712e Mon Sep 17 00:00:00 2001 From: Gustav Fredriksson Date: Sun, 15 Dec 2019 17:55:15 +0100 Subject: [PATCH 2/3] Update minikube and kubectl version Signed-off-by: Gustav Fredriksson --- travis/install-start-minikube.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/travis/install-start-minikube.sh b/travis/install-start-minikube.sh index dd8d867..ae618ab 100755 --- a/travis/install-start-minikube.sh +++ b/travis/install-start-minikube.sh @@ -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 From cc2e03335d8fe88eeef46648cff39151215ca97f Mon Sep 17 00:00:00 2001 From: fredrikssongustav Date: Sun, 9 Feb 2020 17:36:56 +0100 Subject: [PATCH 3/3] Update copyright headers to 2020 --- all-in-one/jaeger-all-in-one-template.yml | 2 +- travis/install-start-minikube.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/all-in-one/jaeger-all-in-one-template.yml b/all-in-one/jaeger-all-in-one-template.yml index 0202eb3..f797a15 100644 --- a/all-in-one/jaeger-all-in-one-template.yml +++ b/all-in-one/jaeger-all-in-one-template.yml @@ -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 diff --git a/travis/install-start-minikube.sh b/travis/install-start-minikube.sh index ae618ab..4a995d5 100755 --- a/travis/install-start-minikube.sh +++ b/travis/install-start-minikube.sh @@ -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