github-personal/kamaji
1
0
Fork 0
mirror of https://github.com/outbackdingo/kamaji.git synced 2026-01-27 10:19:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: konnectivity extra args override

Browse Source 
Co-authored-by: Jason Witkowski <jwitkowski@zscaler.com>
This commit is contained in:
Jason Witkowski
2024-03-04 05:31:10 -05:00
committed by GitHub
parent 4299b72d7f
commit cec4f9136d
5 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/v1alpha1/tenantcontrolplane_types.go
View File

@@ -189,6 +189,9 @@ type ImageOverrideTrait struct {
}
// ExtraArgs allows adding additional arguments to said component.
// WARNING - This option can override existing konnectivity
// parameters and cause konnectivity components to misbehave in
// unxpected ways. Only modify if you know what you are doing.
type ExtraArgs []string
type KonnectivityServerSpec struct {

10
config/crd/bases/kamaji.clastix.io_tenantcontrolplanes.yaml
View File

@@ -92,7 +92,10 @@ spec:
properties:
extraArgs:
description: ExtraArgs allows adding additional arguments
to said component.
to said component. WARNING - This option can override
existing konnectivity parameters and cause konnectivity
components to misbehave in unxpected ways. Only modify
if you know what you are doing.
items:
type: string
type: array
@@ -114,7 +117,10 @@ spec:
properties:
extraArgs:
description: ExtraArgs allows adding additional arguments
to said component.
to said component. WARNING - This option can override
existing konnectivity parameters and cause konnectivity
components to misbehave in unxpected ways. Only modify
if you know what you are doing.
items:
type: string
type: array

4
config/install.yaml
View File

@@ -340,7 +340,7 @@ spec:
version: v0.0.32
properties:
extraArgs:
description: ExtraArgs allows adding additional arguments to said component.
description: ExtraArgs allows adding additional arguments to said component. WARNING - This option can override existing konnectivity parameters and cause konnectivity components to misbehave in unxpected ways. Only modify if you know what you are doing.
items:
type: string
type: array
@@ -360,7 +360,7 @@ spec:
version: v0.0.32
properties:
extraArgs:
description: ExtraArgs allows adding additional arguments to said component.
description: ExtraArgs allows adding additional arguments to said component. WARNING - This option can override existing konnectivity parameters and cause konnectivity components to misbehave in unxpected ways. Only modify if you know what you are doing.
items:
type: string
type: array

4
docs/content/reference/api.md
View File

@@ -11304,7 +11304,7 @@ Enables the Konnectivity addon in the Tenant Cluster, required if the worker nod
<td><b>extraArgs</b></td>
<td>[]string</td>
<td>
ExtraArgs allows adding additional arguments to said component.<br/>
ExtraArgs allows adding additional arguments to said component. WARNING - This option can override existing konnectivity parameters and cause konnectivity components to misbehave in unxpected ways. Only modify if you know what you are doing.<br/>
</td>
<td>false</td>
</tr><tr>
@@ -11357,7 +11357,7 @@ Enables the Konnectivity addon in the Tenant Cluster, required if the worker nod
<td><b>extraArgs</b></td>
<td>[]string</td>
<td>
ExtraArgs allows adding additional arguments to said component.<br/>
ExtraArgs allows adding additional arguments to said component. WARNING - This option can override existing konnectivity parameters and cause konnectivity components to misbehave in unxpected ways. Only modify if you know what you are doing.<br/>
</td>
<td>false</td>
</tr><tr>

9
internal/resources/konnectivity/agent.go
View File

@@ -164,8 +164,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 +174,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{
{