Fix assignment of a configured IP to the DHCP server

23technologies · Nov 21, 2021 · 6c7b999 · 6c7b999
1 parent 97f9006
commit 6c7b999
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 17 deletions.
diff --git a/example/30-infrastructure.yaml b/example/30-infrastructure.yaml
@@ -78,6 +78,7 @@ spec:
         version: "20.04"
       cores: 1
       memory: 1024
+      ip: 10.15.100.254
       userData: |-
         #cloud-config
         package_update: true

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/23technologies/gardener-extension-provider-ionos
 go 1.16
 
 require (
-	github.com/23technologies/ionos-api-wrapper v0.1.3
+	github.com/23technologies/ionos-api-wrapper v0.1.4
 	github.com/Masterminds/semver v1.5.0
 	github.com/ahmetb/gen-crd-api-reference-docs v0.2.0
 	github.com/coreos/go-systemd/v22 v22.1.0

diff --git a/go.sum b/go.sum
@@ -22,8 +22,8 @@ cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiy
 cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
 cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/23technologies/ionos-api-wrapper v0.1.3 h1:xGsqzWil8LDXgkGN3+Q98/Coq+nhFdlgTb+Uu8XSyF0=
-github.com/23technologies/ionos-api-wrapper v0.1.3/go.mod h1:zJ7H+q07Y72JTvunLRz6oMA7vPvXEojKkAxrxzZ7tvg=
+github.com/23technologies/ionos-api-wrapper v0.1.4 h1:xYqYnQue6Qawxr6yzvCdviqa5nph8n47kFye+zh6FIA=
+github.com/23technologies/ionos-api-wrapper v0.1.4/go.mod h1:zJ7H+q07Y72JTvunLRz6oMA7vPvXEojKkAxrxzZ7tvg=
 github.com/Azure/azure-sdk-for-go v39.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go v42.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=

diff --git a/pkg/controller/infrastructure/ensurer/dhcp_server.go b/pkg/controller/infrastructure/ensurer/dhcp_server.go
@@ -21,8 +21,10 @@ import (
 	"context"
 	"encoding/base64"
 	"errors"
+	"fmt"
 	"math"
 	"math/rand"
+	"net"
 	"strings"
 	"time"
 
@@ -143,7 +145,12 @@ func createDHCPServer(ctx context.Context, client *ionossdk.APIClient, datacente
 		return "", err
 	}
 
-	err = ionosapiwrapper.AttachLANToServerWithoutDHCP(ctx, client, datacenterID, serverID, networkID)
+	dhcpIP := net.ParseIP(configuration.IP)
+	if nil == dhcpIP {
+		return "", fmt.Errorf("IP %q given is invalid", configuration.IP)
+	}
+
+	err = ionosapiwrapper.AttachLANToServerWithIP(ctx, client, datacenterID, serverID, networkID, &dhcpIP)
 	if nil != err {
 		return "", err
 	}

diff --git a/pkg/ionos/apis/mock/infrastructure.go b/pkg/ionos/apis/mock/infrastructure.go
@@ -197,8 +197,8 @@ const (
 				"name": "test",
 				"version": "1.0"
 			},
-			"sshKey": "ssh-rsa invalid",
-			"userData": ""
+			"ip": "10.250.31.254",
+			"userData": "#cloud-config"
 		},
 		"floatingPoolName": "MY-FLOATING-POOL",
 		"networks": {"workers": "10.250.0.0/19"}

diff --git a/pkg/ionos/apis/types_infrastructure.go b/pkg/ionos/apis/types_infrastructure.go
@@ -46,6 +46,8 @@ type DHCPServerConfiguration struct {
 	//
 	Memory   uint          `json:"memory"`
 	//
+	IP       string        `json:"ip"`
+	//
 	UserData string        `json:"userData"`
 
 	//

diff --git a/pkg/ionos/apis/v1alpha1/types_infrastructure.go b/pkg/ionos/apis/v1alpha1/types_infrastructure.go
@@ -45,6 +45,8 @@ type DHCPServerConfiguration struct {
 	//
 	Memory   uint          `json:"memory"`
 	//
+	IP       string        `json:"ip"`
+	//
 	UserData string        `json:"userData"`
 
 	//

diff --git a/pkg/ionos/apis/v1alpha1/zz_generated.conversion.go b/pkg/ionos/apis/v1alpha1/zz_generated.conversion.go
diff --git a/vendor/github.com/23technologies/ionos-api-wrapper/pkg/lan.go b/vendor/github.com/23technologies/ionos-api-wrapper/pkg/lan.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1,4 +1,4 @@
-# github.com/23technologies/ionos-api-wrapper v0.1.3
+# github.com/23technologies/ionos-api-wrapper v0.1.4
 ## explicit
 github.com/23technologies/ionos-api-wrapper/pkg
 # github.com/BurntSushi/toml v0.3.1
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,6 +46,8 @@ type DHCPServerConfiguration struct { @@
     	//
     	Memory   uint          `json:"memory"`
     	//
+    	IP       string        `json:"ip"`
+    	//
     	UserData string        `json:"userData"`
     	//
@@ Expand Down @@