feat(intelAMT): add support for HTTPS connections

Signed-off-by: Léonard Suslian (synthe102) <[email protected]>
tinkerbell · May 24, 2024 · f72a47d · f72a47d
1 parent 736ddc0
commit f72a47d
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/api/v1alpha1/provider_opts.go b/api/v1alpha1/provider_opts.go
@@ -26,6 +26,12 @@ type IPMITOOLOptions struct {
 type IntelAMTOptions struct {
 	// Port that intelAMT will use for calls.
 	Port int `json:"port"`
+
+	// UseHttp determines whether to use http or https for intelAMT calls.
+	// +optional
+	// +kubebuilder:validation:Enum=http;https
+	// +kubebuilder:default:=http
+	HostScheme string `json:"hostScheme"`
 }
 
 // HMACAlgorithm is a type for HMAC algorithms.

diff --git a/config/crd/bases/bmc.tinkerbell.org_machines.yaml b/config/crd/bases/bmc.tinkerbell.org_machines.yaml
@@ -74,6 +74,14 @@ spec:
                         description: IntelAMT contains the options to customize the
                           IntelAMT provider.
                         properties:
+                          hostScheme:
+                            default: http
+                            description: UseHttp determines whether to use http or
+                              https for intelAMT calls.
+                            enum:
+                            - http
+                            - https
+                            type: string
                           port:
                             description: Port that intelAMT will use for calls.
                             type: integer

diff --git a/config/crd/bases/bmc.tinkerbell.org_tasks.yaml b/config/crd/bases/bmc.tinkerbell.org_tasks.yaml
@@ -75,6 +75,14 @@ spec:
                         description: IntelAMT contains the options to customize the
                           IntelAMT provider.
                         properties:
+                          hostScheme:
+                            default: http
+                            description: UseHttp determines whether to use http or
+                              https for intelAMT calls.
+                            enum:
+                            - http
+                            - https
+                            type: string
                           port:
                             description: Port that intelAMT will use for calls.
                             type: integer

diff --git a/controller/client.go b/controller/client.go
@@ -77,8 +77,9 @@ func (b BMCOptions) Translate(host string) []bmclib.Option {
 
 	// intelAmt options
 	if b.IntelAMT != nil {
-		amt := bmclib.WithIntelAMTPort(uint32(b.IntelAMT.Port))
-		o = append(o, amt)
+		amtPort := bmclib.WithIntelAMTPort(uint32(b.IntelAMT.Port))
+		amtScheme := bmclib.WithIntelAMTHostScheme(b.IntelAMT.HostScheme)
+		o = append(o, amtPort, amtScheme)
 	}
 
 	// rpc options