fix: konnectivity extra args override

Author: Jason Witkowski

api/v1alpha1/tenantcontrolplane_types.go

@@ -192,6 +192,8 @@ type ImageOverrideTrait struct {
 type ExtraArgs []string
 
 type KonnectivityServerSpec struct {
+	// The address which Konnectivity server is listening to.
+	Address string `json:"address"`
 	// The port which Konnectivity server is listening to.
 	Port int32 `json:"port"`
 	// Container image version of the Konnectivity server.

config/crd/bases/kamaji.clastix.io_tenantcontrolplanes.yaml

@@ -112,6 +112,11 @@ spec:
                           port: 8132
                           version: v0.0.32
                         properties:
+                          address:
+                            description: The address which Konnectivity server is
+                              listening will listen on.  If not set this value defaults
+                              to the address of the TenantControlPlane.
+                            type: string
                           extraArgs:
                             description: ExtraArgs allows adding additional arguments
                               to said component.

internal/resources/konnectivity/agent.go

@@ -102,7 +102,15 @@ func (r *Agent) mutate(ctx context.Context, tenantControlPlane *kamajiv1alpha1.T
 	return func() error {
 		logger := log.FromContext(ctx, "resource", r.GetName())
 
-		address, _, err := tenantControlPlane.AssignedControlPlaneAddress()
+		var address string
+		var err error
+
+		if len(tenantControlPlane.Spec.Addons.Konnectivity.KonnectivityServerSpec.Address) != 0 {
+			address = tenantControlPlane.Spec.Addons.Konnectivity.KonnectivityServerSpec.Address
+		} else {
+			address, _, err = tenantControlPlane.AssignedControlPlaneAddress()
+		}
+
 		if err != nil {
 			logger.Error(err, "unable to retrieve the Tenant Control Plane address")
 
@@ -164,8 +172,7 @@ func (r *Agent) mutate(ctx context.Context, tenantControlPlane *kamajiv1alpha1.T
 		r.resource.Spec.Template.Spec.Containers[0].Name = AgentName
 		r.resource.Spec.Template.Spec.Containers[0].Command = []string{"/proxy-agent"}
 
-		args := utilities.ArgsFromSliceToMap(tenantControlPlane.Spec.Addons.Konnectivity.KonnectivityAgentSpec.ExtraArgs)
-
+		args := make(map[string]string)
 		args["-v"] = "8"
 		args["--logtostderr"] = "true"
 		args["--ca-cert"] = "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
@@ -175,6 +182,12 @@ func (r *Agent) mutate(ctx context.Context, tenantControlPlane *kamajiv1alpha1.T
 		args["--health-server-port"] = "8134"
 		args["--service-account-token-path"] = "/var/run/secrets/tokens/konnectivity-agent-token"
 
+		extraArgs := utilities.ArgsFromSliceToMap(tenantControlPlane.Spec.Addons.Konnectivity.KonnectivityAgentSpec.ExtraArgs)
+
+		for k, v := range extraArgs {
+			args[k] = v
+		}
+
 		r.resource.Spec.Template.Spec.Containers[0].Args = utilities.ArgsFromMapToSlice(args)
 		r.resource.Spec.Template.Spec.Containers[0].VolumeMounts = []corev1.VolumeMount{
 			{