Skip to content

Commit ff4d079

Browse files
kuritkakuritka
authored
Merge pull request #33 from AbsaOSS/removing-network
Removing network configuration
2 parents 4110f64 + d4558a9 commit ff4d079

14 files changed

+91
-259
lines changed

‎.github/workflows/assets/1.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ kind: Simple
33
image: docker.io/rancher/k3s:v1.21.2-k3s1
44
servers: 1
55
agents: 3
6+
network: nw01
67
ports:
78
- port: 0.0.0.0:80:80
89
nodeFilters:

‎.github/workflows/assets/2.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ kind: Simple
33
image: docker.io/rancher/k3s:v1.21.2-k3s1
44
servers: 1
55
agents: 3
6+
network: nw01
67
ports:
78
- port: 0.0.0.0:81:80
89
nodeFilters:

‎.github/workflows/assets/3.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ kind: Simple
33
image: docker.io/rancher/k3s:v1.21.2-k3s1
44
servers: 1
55
agents: 3
6+
network: nw02
67
ports:
78
- port: 0.0.0.0:82:80
89
nodeFilters:

‎.github/workflows/assets/4.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ kind: Simple
33
# image: default k3s version
44
servers: 1
55
agents: 3
6+
network: nw02
67
ports:
78
- port: 0.0.0.0:83:80
89
nodeFilters:

‎.github/workflows/multi-cluster-config.yaml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,26 @@
1-
name: Multi cluster; two clusters on default network with config
1+
name: Two clusters on default networks with config
22

33
on:
44
[workflow_dispatch, push]
55
jobs:
66
k3d-multicluster-demo:
7-
name: Two clusters on default network with config
7+
name: Two clusters on default networks with config
88
runs-on: ubuntu-20.04
99
steps:
1010
- uses: actions/checkout@v2
1111
- uses: ./
12-
id: test-cluster-1
1312
name: "Create 1st k3d Cluster"
1413
with:
1514
cluster-name: "test-cluster-1"
1615
args: --config=.github/workflows/assets/1.yaml
1716
- uses: ./
18-
id: test-cluster-2
1917
name: "Create 2nd k3d Cluster"
2018
with:
2119
cluster-name: "test-cluster-2"
22-
args: --config=.github/workflows/assets/2.yaml # test: k3s version is different from 1.yaml
20+
args: --config=.github/workflows/assets/3.yaml # test: k3s version is different from 1.yaml
2321

2422
- name: Cluster info
2523
run: |
26-
echo test-cluster-1: ${{ steps.test-cluster-1.outputs.network }} ${{ steps.test-cluster-1.outputs.subnet-CIDR }}
27-
echo test-cluster-2: ${{ steps.test-cluster-2.outputs.network }} ${{ steps.test-cluster-2.outputs.subnet-CIDR }}
28-
echo
2924
kubectl cluster-info --context k3d-test-cluster-1 && kubectl cluster-info --context k3d-test-cluster-2
3025
- name: Nodes
3126
run: |
@@ -35,4 +30,7 @@ jobs:
3530
kubectl config use-context k3d-test-cluster-2
3631
kubectl get nodes -o wide
3732
- name: Network
38-
run: docker network inspect k3d-action-bridge-network
33+
run: |
34+
docker network inspect nw01
35+
docker network inspect nw02
36+

‎.github/workflows/multi-cluster-on-isolated-networks.yaml‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Multi cluster; two clusters on two isolated networks
1+
name: Two clusters on two isolated networks
22

33
on:
44
[workflow_dispatch, push]
@@ -9,40 +9,31 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v2
1111
- uses: ./
12-
id: test-cluster-1
13-
name: "Create 1st k3d Cluster in 172.20.0.0/24"
12+
name: "Create 1st k3d Cluster in 172.18.0.0/16"
1413
with:
1514
cluster-name: "test-cluster-1"
16-
network: "nw01"
17-
subnet-CIDR: "172.20.0.0/24"
1815
args: >-
1916
-p "80:80@agent:0:direct"
2017
-p "443:443@agent:0:direct"
2118
-p "5053:53/udp@agent:0:direct"
2219
--agents 3
2320
--no-lb
2421
--k3s-arg "--no-deploy=traefik,servicelb,metrics-server@server:*"
25-
22+
--network nw01
2623
- uses: ./
27-
id: test-cluster-2
28-
name: "Create 1nd k3d Cluster in 172.20.1.0/24"
24+
name: "Create 1nd k3d Cluster in 172.19.0.0/16"
2925
with:
3026
cluster-name: "test-cluster-2"
31-
network: "nw02"
32-
subnet-CIDR: "172.20.1.0/24"
3327
args: >-
3428
-p "81:80@agent:0:direct"
3529
-p "444:443@agent:0:direct"
3630
-p "5054:53/udp@agent:0:direct"
3731
--agents 3
3832
--no-lb
3933
--k3s-arg "--no-deploy=traefik,servicelb,metrics-server@server:*"
40-
34+
--network nw02
4135
- name: Cluster info
4236
run: |
43-
echo test-cluster-1: ${{ steps.test-cluster-1.outputs.network }} ${{ steps.test-cluster-1.outputs.subnet-CIDR }}
44-
echo test-cluster-2: ${{ steps.test-cluster-2.outputs.network }} ${{ steps.test-cluster-2.outputs.subnet-CIDR }}
45-
echo
4637
kubectl cluster-info --context k3d-test-cluster-1 && kubectl cluster-info --context k3d-test-cluster-2
4738
- name: Nodes
4839
run: |

‎.github/workflows/multi-cluster-two-piars.yaml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -9,74 +9,74 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v2
1111
- uses: ./
12-
id: test-cluster-1-a
13-
name: "Create 1st k3d Cluster in 172.20.0.0/24"
12+
name: "Create 1st Cluster in 172.18.0.0/16"
1413
with:
15-
cluster-name: "test-cluster-1-a"
16-
network: "nw01"
17-
subnet-CIDR: "172.20.0.0/24"
14+
cluster-name: "test-cluster-1"
1815
args: >-
16+
-p "80:80@agent:0:direct"
17+
-p "443:443@agent:0:direct"
18+
-p "5053:53/udp@agent:0:direct"
1919
--agents 3
2020
--no-lb
2121
--k3s-arg "--no-deploy=traefik,servicelb,metrics-server@server:*"
22+
--network "nw01"
2223
2324
- uses: ./
24-
id: test-cluster-1-b
25-
name: "Create 2nd k3d Cluster in 172.20.0.0/24"
25+
name: "Create 2nd Cluster in 172.18.0.0/16"
2626
with:
27-
cluster-name: "test-cluster-2-a"
28-
network: "nw01"
27+
cluster-name: "test-cluster-2"
2928
args: >-
29+
-p "81:80@agent:0:direct"
30+
-p "444:443@agent:0:direct"
31+
-p "5054:53/udp@agent:0:direct"
3032
--agents 3
3133
--no-lb
3234
--k3s-arg "--no-deploy=traefik,servicelb,metrics-server@server:*"
35+
--network "nw01"
3336
3437
- uses: ./
35-
id: test-cluster-2-a
36-
name: "Create 1st k3d Cluster in 172.20.1.0/24"
38+
name: "Create 1st Cluster in 172.19.0.0/16"
3739
with:
38-
cluster-name: "test-cluster-1-b"
39-
network: "nw02"
40-
subnet-CIDR: "172.20.1.0/24"
40+
cluster-name: "test-cluster-3"
4141
args: >-
42+
-p "82:80@agent:0:direct"
43+
-p "445:443@agent:0:direct"
44+
-p "5055:53/udp@agent:0:direct"
4245
--agents 3
4346
--no-lb
4447
--k3s-arg "--no-deploy=traefik,servicelb,metrics-server@server:*"
48+
--network "nw02"
4549
4650
- uses: ./
47-
id: test-cluster-2-b
48-
name: "Create 2nd k3d Cluster in 172.20.1.0/24"
51+
name: "Create 2nd Cluster in 172.19.0.0/16"
4952
with:
50-
cluster-name: "test-cluster-2-b"
51-
network: "nw02"
53+
cluster-name: "test-cluster-4"
5254
args: >-
55+
-p "83:80@agent:0:direct"
56+
-p "446:443@agent:0:direct"
57+
-p "5056:53/udp@agent:0:direct"
5358
--agents 3
5459
--no-lb
5560
--k3s-arg "--no-deploy=traefik,servicelb,metrics-server@server:*"
61+
--network "nw02"
5662
5763
- name: Cluster info
5864
run: |
59-
echo
60-
echo test-cluster-1-a: ${{ steps.test-cluster-1-a.outputs.network }} ${{ steps.test-cluster-1-a.outputs.subnet-CIDR }}
61-
echo test-cluster-1-b: ${{ steps.test-cluster-1-b.outputs.network }} ${{ steps.test-cluster-1-b.outputs.subnet-CIDR }}
62-
echo test-cluster-2-a: ${{ steps.test-cluster-2-a.outputs.network }} ${{ steps.test-cluster-2-a.outputs.subnet-CIDR }}
63-
echo test-cluster-2-b: ${{ steps.test-cluster-2-b.outputs.network }} ${{ steps.test-cluster-2-b.outputs.subnet-CIDR }}
64-
echo
65-
kubectl cluster-info --context k3d-test-cluster-1-a
66-
kubectl cluster-info --context k3d-test-cluster-2-a
67-
kubectl cluster-info --context k3d-test-cluster-1-b
68-
kubectl cluster-info --context k3d-test-cluster-2-b
65+
kubectl cluster-info --context k3d-test-cluster-1
66+
kubectl cluster-info --context k3d-test-cluster-2
67+
kubectl cluster-info --context k3d-test-cluster-3
68+
kubectl cluster-info --context k3d-test-cluster-4
6969
7070
- name: Nodes
7171
run: |
7272
docker ps -a
73-
kubectl config use-context k3d-test-cluster-1-a
73+
kubectl config use-context k3d-test-cluster-1
7474
kubectl get nodes -o wide
75-
kubectl config use-context k3d-test-cluster-1-b
75+
kubectl config use-context k3d-test-cluster-2
7676
kubectl get nodes -o wide
77-
kubectl config use-context k3d-test-cluster-2-a
77+
kubectl config use-context k3d-test-cluster-3
7878
kubectl get nodes -o wide
79-
kubectl config use-context k3d-test-cluster-2-b
79+
kubectl config use-context k3d-test-cluster-4
8080
kubectl get nodes -o wide
8181
8282
- name: Network

‎.github/workflows/multi-cluster.yaml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
name: Multi cluster; two clusters on default network
1+
name: Two clusters on default networks
22

33
on:
44
[workflow_dispatch, push]
55
jobs:
66
k3d-multicluster-demo:
7-
name: Two clusters on default network
7+
name: Two clusters on default networks
88
runs-on: ubuntu-20.04
99
steps:
1010
- uses: actions/checkout@v2
1111
- uses: ./
12-
id: test-cluster-1
1312
name: "Create 1st k3d Cluster"
1413
with:
1514
cluster-name: "test-cluster-1"
@@ -21,7 +20,6 @@ jobs:
2120
--no-lb
2221
--k3s-arg "--no-deploy=traefik,servicelb,metrics-server@server:*"
2322
- uses: ./
24-
id: test-cluster-2
2523
name: "Create 2nd k3d Cluster"
2624
with:
2725
cluster-name: "test-cluster-2"
@@ -32,12 +30,8 @@ jobs:
3230
--agents 3
3331
--no-lb
3432
--k3s-arg "--no-deploy=traefik,servicelb,metrics-server@server:*"
35-
3633
- name: Cluster info
3734
run: |
38-
echo test-cluster-1: ${{ steps.test-cluster-1.outputs.network }} ${{ steps.test-cluster-1.outputs.subnet-CIDR }}
39-
echo test-cluster-2: ${{ steps.test-cluster-2.outputs.network }} ${{ steps.test-cluster-2.outputs.subnet-CIDR }}
40-
echo
4135
kubectl cluster-info --context k3d-test-cluster-1 && kubectl cluster-info --context k3d-test-cluster-2
4236
- name: Nodes
4337
run: |
@@ -47,4 +41,6 @@ jobs:
4741
kubectl config use-context k3d-test-cluster-2
4842
kubectl get nodes -o wide
4943
- name: Network
50-
run: docker network inspect k3d-action-bridge-network
44+
run: |
45+
docker network inspect k3d-test-cluster-1
46+
docker network inspect k3d-test-cluster-2

‎.github/workflows/single-cluster-config.yaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v2
1111
- uses: ./
12-
id: single-cluster
1312
name: "Create single k3d Cluster"
1413
with:
1514
cluster-name: "test-cluster-1"
@@ -18,13 +17,11 @@ jobs:
1817
--config=.github/workflows/assets/1.yaml
1918
- name: Cluster info
2019
run: |
21-
echo ${{ steps.single-cluster.outputs.network }} ${{ steps.single-cluster.outputs.subnet-CIDR }}
22-
echo
2320
kubectl cluster-info --context k3d-test-cluster-1
2421
- name: Nodes
2522
run: |
2623
docker ps -a
2724
kubectl config use-context k3d-test-cluster-1
2825
kubectl get nodes -o wide
2926
- name: Network
30-
run: docker network inspect k3d-action-bridge-network
27+
run: docker network inspect nw01

‎.github/workflows/single-cluster-import-registry.yaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v2
1111
- uses: ./
12-
id: single-cluster
1312
name: "Create single k3d Cluster with imported Registry"
1413
with:
1514
cluster-name: test-cluster-1
@@ -24,13 +23,11 @@ jobs:
2423
kubectl apply -f .github/workflows/assets/pod.yaml
2524
- name: Cluster info
2625
run: |
27-
echo ${{ steps.single-cluster.outputs.network }} ${{ steps.single-cluster.outputs.subnet-CIDR }}
28-
echo
2926
kubectl cluster-info --context k3d-test-cluster-1
3027
- name: Nodes
3128
run: |
3229
docker ps -a
3330
kubectl config use-context k3d-test-cluster-1
3431
kubectl get nodes -o wide
3532
- name: Network
36-
run: docker network inspect k3d-action-bridge-network
33+
run: docker network inspect k3d-test-cluster-1

0 commit comments

Comments
 (0)