From 83867167a36cebc301c1681bbe0e688c82b76e06 Mon Sep 17 00:00:00 2001
From: Mitch Hulscher <mitch.hulscher@lib.io>
Date: Sat, 17 Sep 2022 14:28:20 +0200
Subject: [PATCH] fix(gitlab-ci): update kind/kubectl, alias dind service to
 kubernetes

Signed-off-by: Mitch Hulscher <mitch.hulscher@lib.io>
---
 .gitlab-ci.yml          | 9 +++++----
 gitlab/kind-config.yaml | 9 ---------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index afca931..d8a747a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,10 @@
 image: docker:stable
 variables:
-  KUBECTL: v1.17.0
-  KIND: v0.8.1
+  KUBECTL: v1.25.1
+  KIND: v0.15.0
 services:
-  - docker:dind
+  - name: docker:dind
+    alias: kubernetes
 stages:
   - test
 test:
@@ -15,7 +16,7 @@ test:
     - wget -O /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL}/bin/linux/amd64/kubectl
     - chmod +x /usr/local/bin/kubectl
     - kind create cluster --config=./gitlab/kind-config.yaml
-    - sed -i -E -e 's/localhost|0\.0\.0\.0/docker/g' "$HOME/.kube/config"
+    - sed -i -E -e 's/localhost|0\.0\.0\.0/kubernetes/g' "$HOME/.kube/config"
     - kubectl get nodes -o wide
     - kubectl get pods --all-namespaces -o wide
     - kubectl get services --all-namespaces -o wide
diff --git a/gitlab/kind-config.yaml b/gitlab/kind-config.yaml
index 2ec8698..0c7292c 100644
--- a/gitlab/kind-config.yaml
+++ b/gitlab/kind-config.yaml
@@ -3,15 +3,6 @@ kind: Cluster
 networking:
   apiServerAddress: "0.0.0.0"
 
-# add to the apiServer certSANs the name of the docker (dind) service in order to be able to reach the cluster through it
-kubeadmConfigPatchesJSON6902:
-  - group: kubeadm.k8s.io
-    version: v1beta2
-    kind: ClusterConfiguration
-    patch: |
-      - op: add
-        path: /apiServer/certSANs/-
-        value: docker
 nodes:
   - role: control-plane
   - role: worker