From a01fecf6793c0fbf3ef9985e196ceb4855ba347d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= <jerome.petazzoni@gmail.com>
Date: Thu, 27 Jan 2022 10:40:37 +0100
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20=20Bump=20Consul=20version?=
 =?UTF-8?q?=20and=20move=20SA=20at=20the=20beginning=20of=20the=20YAML?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It's a tiny bit easier to run through the YAML when it starts with
the ServiceAccount, I find.
---
 k8s/consul-1.yaml | 13 +++++++------
 k8s/consul-2.yaml | 13 +++++++------
 k8s/consul-3.yaml | 13 +++++++------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/k8s/consul-1.yaml b/k8s/consul-1.yaml
index f913201f..a50ea116 100644
--- a/k8s/consul-1.yaml
+++ b/k8s/consul-1.yaml
@@ -3,6 +3,12 @@
 # - no actual persistence
 # - scaling down to 1 will break the cluster
 # - pods may be colocated
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: consul
+---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
@@ -28,11 +34,6 @@ subjects:
     name: consul
 ---
 apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: consul
----
-apiVersion: v1
 kind: Service
 metadata:
   name: consul
@@ -61,7 +62,7 @@ spec:
       serviceAccountName: consul
       containers:
         - name: consul
-          image: "consul:1.8"
+          image: "consul:1.11"
           env:
             - name: NAMESPACE
               valueFrom:
diff --git a/k8s/consul-2.yaml b/k8s/consul-2.yaml
index f042770d..5df8970e 100644
--- a/k8s/consul-2.yaml
+++ b/k8s/consul-2.yaml
@@ -2,6 +2,12 @@
 # There is still no actual persistence, but:
 # - podAntiaffinity prevents pod colocation
 # - clusters works when scaling down to 1 (thanks to lifecycle hook)
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: consul
+---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
@@ -27,11 +33,6 @@ subjects:
     name: consul
 ---
 apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: consul
----
-apiVersion: v1
 kind: Service
 metadata:
   name: consul
@@ -68,7 +69,7 @@ spec:
       terminationGracePeriodSeconds: 10
       containers:
         - name: consul
-          image: "consul:1.8"
+          image: "consul:1.11"
           env:
             - name: NAMESPACE
               valueFrom:
diff --git a/k8s/consul-3.yaml b/k8s/consul-3.yaml
index f442ea30..7f192d34 100644
--- a/k8s/consul-3.yaml
+++ b/k8s/consul-3.yaml
@@ -1,5 +1,11 @@
 # Even better Consul cluster.
 # That one uses a volumeClaimTemplate to achieve true persistence.
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: consul
+---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
@@ -25,11 +31,6 @@ subjects:
     name: consul
 ---
 apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: consul
----
-apiVersion: v1
 kind: Service
 metadata:
   name: consul
@@ -75,7 +76,7 @@ spec:
       terminationGracePeriodSeconds: 10
       containers:
         - name: consul
-          image: "consul:1.8"
+          image: "consul:1.11"
           volumeMounts:
             - name: data
               mountPath: /consul/data