Skip to content

Commit 103c222

Browse files
authored
Update Kind to v0.17.0 (#164)
* Update Kind to v0.17.0 * Add make path for deleting kind cluster
1 parent fd775a8 commit 103c222

File tree

8 files changed

+21
-52
lines changed

8 files changed

+21
-52
lines changed

.github/actions/start-k8s-cluster/action.yaml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,19 @@ description: Creates and configures a k8s cluster for all things TNF-related
33
inputs:
44
working_directory:
55
default: .
6-
kind_version:
7-
default: v0.14.0
86
oc_kcm_timeout:
97
default: 5m
108

119
runs:
1210
using: 'composite'
1311
steps:
14-
- name: Download cluster bootstrap executable
15-
run: |
16-
curl -Lo kind https://github.com/kubernetes-sigs/kind/releases/download/${{ inputs.kind_version }}/kind-linux-amd64
17-
working-directory: ${{ inputs.working_directory }}
18-
shell: bash
19-
20-
- name: Install cluster bootstrap executable
21-
run: chmod +x kind; sudo cp kind /usr/bin/kind
12+
- name: Run Bootstrap Cluster
13+
run: make bootstrap-cluster-fedora-local
2214
working-directory: ${{ inputs.working_directory }}
2315
shell: bash
2416

25-
- name: Configure docker
26-
run: make new-docker-config
17+
- name: Run Bootstrap Cluster
18+
run: make bootstrap-docker-fedora-local
2719
working-directory: ${{ inputs.working_directory }}
2820
shell: bash
2921

Makefile

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,12 @@ bootstrap-cluster-fedora-local:
3333
cd config/vagrant/scripts; ./bootstrap-cluster.sh
3434

3535
# creates a k8s cluster instance
36-
rebuild-cluster:
36+
rebuild-cluster: delete-cluster
3737
./scripts/deploy-k8s-cluster.sh
3838

39+
delete-cluster:
40+
./scripts/delete-k8s-cluster.sh
41+
3942
# launch Vagrant env
4043
vagrant-build:
4144
mkdir -p config/vagrant/kubeconfig
@@ -64,10 +67,6 @@ vagrant-recreate:
6467
cd config/vagrant;vagrant destroy -f
6568
make vagrant-build
6669

67-
# create a new docker configuration
68-
new-docker-config:
69-
./scripts/configure-docker.sh
70-
7170
# deploys the partner pods
7271
install-partner-pods:
7372
./scripts/deploy-debug-ds.sh
@@ -89,16 +88,16 @@ install-crds:
8988
install-litmus:
9089
./scripts/install-litmus-operator.sh
9190

92-
install-prometheus :
91+
install-prometheus:
9392
./scripts/install-prometheus-operator.sh
9493

95-
delete-prometheus :
94+
delete-prometheus:
9695
./scripts/delete-prometheus-operator.sh
9796

98-
install-istio :
97+
install-istio:
9998
./scripts/install-istio.sh
10099

101-
delete-istio :
100+
delete-istio:
102101
./scripts/delete-istio.sh
103102

104103
# delete deployment pods

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ sudo systemctl restart docker
136136

137137
Download and install Kubernetes In Docker (Kind):
138138
```shell-script
139-
curl -Lo kind https://github.com/kubernetes-sigs/kind/releases/download/v0.14.0/kind-linux-amd64
139+
curl -Lo kind https://github.com/kubernetes-sigs/kind/releases/download/v0.17.0/kind-linux-amd64
140140
```
141141

142142
Configure a cluster with 4 worker nodes and one master node ( dual stack ):

config/k8s-cluster/config.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
kind: Cluster
22
apiVersion: kind.x-k8s.io/v1alpha4
3-
featureGates:
4-
LocalStorageCapacityIsolation: false
53
networking:
64
ipFamily: dual
75
disableDefaultCNI: true
86
apiServerAddress: "0.0.0.0"
97
apiServerPort: 6443
108
nodes:
119
- role: control-plane
12-
image: kindest/node:v1.24.4@sha256:ba6a8a1bc35139cc0947a9269a6db577cf7a6ba37cab8088fd04142546dc0c21
10+
image: kindest/node:v1.25.3@sha256:f1de3b0670462f43280114eccceab8bf1b9576d2afe0582f8f74529da6fd0365
1311
- role: worker
14-
image: kindest/node:v1.24.4@sha256:ba6a8a1bc35139cc0947a9269a6db577cf7a6ba37cab8088fd04142546dc0c21
12+
image: kindest/node:v1.25.3@sha256:f1de3b0670462f43280114eccceab8bf1b9576d2afe0582f8f74529da6fd0365
1513
- role: worker
16-
image: kindest/node:v1.24.4@sha256:ba6a8a1bc35139cc0947a9269a6db577cf7a6ba37cab8088fd04142546dc0c21
14+
image: kindest/node:v1.25.3@sha256:f1de3b0670462f43280114eccceab8bf1b9576d2afe0582f8f74529da6fd0365
1715
- role: worker
18-
image: kindest/node:v1.24.4@sha256:ba6a8a1bc35139cc0947a9269a6db577cf7a6ba37cab8088fd04142546dc0c21
16+
image: kindest/node:v1.25.3@sha256:f1de3b0670462f43280114eccceab8bf1b9576d2afe0582f8f74529da6fd0365

config/vagrant/scripts/bootstrap-cluster.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# shellcheck disable=SC2207
33

44
# Download and install Kubernetes In Docker (Kind):
5-
sudo curl -Lo /usr/bin/kind https://github.com/kubernetes-sigs/kind/releases/download/v0.14.0/kind-linux-amd64
5+
sudo curl -Lo /usr/bin/kind https://github.com/kubernetes-sigs/kind/releases/download/v0.17.0/kind-linux-amd64
66
sudo chmod +x /usr/bin/kind
77

88
# download the latest openshift client at a certain release level

scripts/configure-docker.sh

Lines changed: 0 additions & 22 deletions
This file was deleted.

scripts/delete-k8s-cluster.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/env bash
2+
set -x
3+
kind delete cluster

scripts/deploy-k8s-cluster.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#!/usr/bin/env bash
22
set -x
3-
kind delete cluster
43

54
# Kind base with kindnetcni and ipv4/ipv6
65
kind create cluster --config=config/k8s-cluster/config.yaml

0 commit comments

Comments
 (0)