Skip to content

Commit 9f4d31b

Browse files
rawdaGastanrawdaGastan
authored
Merge pull request #1212 from threefoldtech/development_update_k8s_flist
update k8s flist in client and cli
2 parents 8cf709d + c2fceec commit 9f4d31b

File tree

7 files changed

+19
-27
lines changed

7 files changed

+19
-27
lines changed

‎grid-cli/cmd/deploy_kubernetes.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ import (
1414
"github.com/threefoldtech/tfgrid-sdk-go/grid-client/workloads"
1515
)
1616

17-
var k8sFlist = "https://hub.grid.tf/tf-official-apps/threefoldtech-k3s-latest.flist"
18-
1917
// deployKubernetesCmd represents the deploy kubernetes command
2018
var deployKubernetesCmd = &cobra.Command{
2119
Use: "kubernetes",
@@ -211,7 +209,7 @@ var deployKubernetesCmd = &cobra.Command{
211209
for i := range workers {
212210
workers[i].NodeID = uint32(workersNodes[i])
213211
}
214-
cluster, err := command.DeployKubernetesCluster(cmd.Context(), t, master, workers, string(sshKey), k8sFlist)
212+
cluster, err := command.DeployKubernetesCluster(cmd.Context(), t, master, workers, string(sshKey), workloads.K8sFlist)
215213
if err != nil {
216214
log.Fatal().Err(err).Send()
217215
}

‎grid-cli/docs/kubernetes.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ $ tfcmd get kubernetes kube
163163
"publicip": false,
164164
"publicip6": false,
165165
"planetary": true,
166-
"flist": "https://hub.grid.tf/tf-official-apps/threefoldtech-k3s-latest.flist",
166+
"flist": "https://hub.grid.tf/tf-official-apps/threefolddev-k3s-v1.31.0.flist",
167167
"flist_checksum": "c87cf57e1067d21a3e74332a64ef9723",
168168
"computedip": "",
169169
"computedip6": "",
@@ -186,7 +186,7 @@ $ tfcmd get kubernetes kube
186186
"publicip": false,
187187
"publicip6": false,
188188
"planetary": true,
189-
"flist": "https://hub.grid.tf/tf-official-apps/threefoldtech-k3s-latest.flist",
189+
"flist": "https://hub.grid.tf/tf-official-apps/threefolddev-k3s-v1.31.0.flist",
190190
"flist_checksum": "c87cf57e1067d21a3e74332a64ef9723",
191191
"computedip": "",
192192
"computedip6": "",
@@ -208,7 +208,7 @@ $ tfcmd get kubernetes kube
208208
"publicip": false,
209209
"publicip6": false,
210210
"planetary": true,
211-
"flist": "https://hub.grid.tf/tf-official-apps/threefoldtech-k3s-latest.flist",
211+
"flist": "https://hub.grid.tf/tf-official-apps/threefolddev-k3s-v1.31.0.flist",
212212
"flist_checksum": "c87cf57e1067d21a3e74332a64ef9723",
213213
"computedip": "",
214214
"computedip6": "",

‎grid-client/deployer/k8s_deployer_test.go

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ func k8sMockValidation(identity substrate.Identity, cl *mocks.RMBMockClient, sub
9090
}
9191

9292
func constructK8sCluster() (workloads.K8sCluster, error) {
93-
flist := "https://hub.grid.tf/tf-official-apps/threefoldtech-k3s-latest.flist"
94-
flistCheckSum, err := workloads.GetFlistChecksum(flist)
93+
flistCheckSum, err := workloads.GetFlistChecksum(workloads.K8sFlist)
9594
if err != nil {
9695
return workloads.K8sCluster{}, err
9796
}
@@ -138,7 +137,7 @@ func constructK8sCluster() (workloads.K8sCluster, error) {
138137
Token: "tokens",
139138
SSHKey: "",
140139
NetworkName: "network",
141-
Flist: flist,
140+
Flist: workloads.K8sFlist,
142141
FlistChecksum: flistCheckSum,
143142
NodesIPRange: make(map[uint32]gridtypes.IPNet),
144143
}
@@ -320,8 +319,7 @@ func ExampleK8sDeployer_Deploy() {
320319
const network = "<dev, test, qa, main>"
321320
const nodeID = 11 // use any node with status up, use ExampleFilterNodes to get valid nodeID
322321

323-
const flist = "https://hub.grid.tf/tf-official-apps/threefoldtech-k3s-latest.flist"
324-
flistCheckSum, err := workloads.GetFlistChecksum(flist)
322+
flistCheckSum, err := workloads.GetFlistChecksum(workloads.K8sFlist)
325323
if err != nil {
326324
fmt.Println(err)
327325
return
@@ -370,7 +368,7 @@ func ExampleK8sDeployer_Deploy() {
370368
Token: "tokens",
371369
SSHKey: "<ssh key goes here>",
372370
NetworkName: n.Name,
373-
Flist: flist,
371+
Flist: workloads.K8sFlist,
374372
FlistChecksum: flistCheckSum,
375373
NodesIPRange: make(map[uint32]gridtypes.IPNet),
376374
}
@@ -395,8 +393,7 @@ func ExampleK8sDeployer_BatchDeploy() {
395393
const network = "<dev, test, qa, main>"
396394
const nodeID = 11 // use any node with status up, use ExampleFilterNodes to get valid nodeID
397395

398-
const flist = "https://hub.grid.tf/tf-official-apps/threefoldtech-k3s-latest.flist"
399-
flistCheckSum, err := workloads.GetFlistChecksum(flist)
396+
flistCheckSum, err := workloads.GetFlistChecksum(workloads.K8sFlist)
400397
if err != nil {
401398
fmt.Println(err)
402399
return
@@ -445,7 +442,7 @@ func ExampleK8sDeployer_BatchDeploy() {
445442
Token: "tokens",
446443
SSHKey: "<ssh key goes here>",
447444
NetworkName: n.Name,
448-
Flist: flist,
445+
Flist: workloads.K8sFlist,
449446
FlistChecksum: flistCheckSum,
450447
NodesIPRange: make(map[uint32]gridtypes.IPNet),
451448
}

‎grid-client/integration_tests/batch_k8s_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ func TestBatchK8sDeployment(t *testing.T) {
4545
require.NoError(t, err)
4646
})
4747

48-
flist := "https://hub.grid.tf/tf-official-apps/threefoldtech-k3s-latest.flist"
49-
5048
master1 := workloads.K8sNode{
5149
VM: &workloads.VM{
5250
Name: generateRandString(10),
@@ -100,7 +98,7 @@ func TestBatchK8sDeployment(t *testing.T) {
10098
Workers: []workloads.K8sNode{workerNodeData1},
10199
Token: "tokens",
102100
SSHKey: publicKey,
103-
Flist: flist,
101+
Flist: workloads.K8sFlist,
104102
NetworkName: network.Name,
105103
}
106104

@@ -109,7 +107,7 @@ func TestBatchK8sDeployment(t *testing.T) {
109107
Workers: []workloads.K8sNode{workerNodeData2},
110108
Token: "tokens",
111109
SSHKey: publicKey,
112-
Flist: flist,
110+
Flist: workloads.K8sFlist,
113111
NetworkName: network.Name,
114112
}
115113

‎grid-client/integration_tests/k8s_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ func TestK8sDeployment(t *testing.T) {
7777
require.NoError(t, err)
7878
})
7979

80-
k8sFlist := "https://hub.grid.tf/tf-official-apps/threefoldtech-k3s-latest.flist"
81-
8280
master := workloads.K8sNode{
8381
VM: &workloads.VM{
8482
Name: fmt.Sprintf("master_%s", generateRandString(5)),
@@ -123,7 +121,7 @@ func TestK8sDeployment(t *testing.T) {
123121
Workers: workers,
124122
Token: "tokens",
125123
SSHKey: publicKey,
126-
Flist: k8sFlist,
124+
Flist: workloads.K8sFlist,
127125
NetworkName: network.Name,
128126
}
129127

‎grid-client/workloads/k8s.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ import (
1515
"github.com/threefoldtech/zos/pkg/gridtypes/zos"
1616
)
1717

18+
// old: https://hub.grid.tf/tf-official-apps/threefoldtech-k3s-latest.flist
19+
var K8sFlist = "https://hub.grid.tf/tf-official-apps/threefolddev-k3s-v1.31.0.flist"
20+
1821
// K8sNode kubernetes data
1922
type K8sNode struct {
2023
*VM

‎grid-client/workloads/k8s_test.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ import (
99
"github.com/threefoldtech/zos/pkg/gridtypes/zos"
1010
)
1111

12-
var flist = "https://hub.grid.tf/tf-official-apps/threefoldtech-k3s-latest.flist"
13-
1412
// K8sWorkload to be used in tests
1513
var K8sWorkload = K8sNode{
1614
VM: &VM{
@@ -20,8 +18,8 @@ var K8sWorkload = K8sNode{
2018
PublicIP: false,
2119
PublicIP6: false,
2220
Planetary: false,
23-
Flist: flist,
24-
FlistChecksum: "e71ee7421f45392fbbb92309182e3006",
21+
Flist: K8sFlist,
22+
FlistChecksum: "f25c9e75e8df3b4fab3ee4de25fa5e17",
2523
ComputedIP: "",
2624
ComputedIP6: "",
2725
PlanetaryIP: "",
@@ -52,7 +50,7 @@ func TestK8sNodeData(t *testing.T) {
5250
Token: "testToken",
5351
SSHKey: "",
5452
NetworkName: "network",
55-
Flist: flist,
53+
Flist: K8sFlist,
5654
FlistChecksum: "e71ee7421f45392fbbb92309182e3006",
5755
Entrypoint: "/sbin/zinit init",
5856
}

0 commit comments

Comments
 (0)