Skip to content

Commit c9ec539

Browse files
feat(addons): add extraEnvs field to addons to add envvars to containers
Signed-off-by: Sébastien Masset <86793256+smasset-orange@users.noreply.github.com>
1 parent c031695 commit c9ec539

13 files changed

Lines changed: 3243 additions & 180 deletions

File tree

api/v1alpha1/tenantcontrolplane_types.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ type ServiceSpec struct {
258258
// AddonSpec defines the spec for every addon.
259259
type AddonSpec struct {
260260
ImageOverrideTrait `json:",inline"`
261+
ExtraEnvs []corev1.EnvVar `json:"extraEnvs,omitempty"`
261262
}
262263

263264
type ImageOverrideTrait struct {
@@ -289,6 +290,7 @@ type KonnectivityServerSpec struct {
289290
// Resources define the amount of CPU and memory to allocate to the Konnectivity server.
290291
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
291292
ExtraArgs ExtraArgs `json:"extraArgs,omitempty"`
293+
ExtraEnvs []corev1.EnvVar `json:"extraEnvs,omitempty"`
292294
}
293295

294296
type KonnectivityAgentMode string
@@ -314,6 +316,7 @@ type KonnectivityAgentSpec struct {
314316
//+kubebuilder:default={{key: "CriticalAddonsOnly", operator: "Exists"}}
315317
Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
316318
ExtraArgs ExtraArgs `json:"extraArgs,omitempty"`
319+
ExtraEnvs []corev1.EnvVar `json:"extraEnvs,omitempty"`
317320
// HostNetwork enables the konnectivity agent to use the Host network namespace.
318321
// By enabling this mode, the Agent doesn't need to wait for the CNI initialisation,
319322
// enabling a sort of out-of-band access to nodes for troubleshooting scenarios,

api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 23 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

charts/kamaji-crds/hack/kamaji.clastix.io_tenantcontrolplanes_spec.yaml

Lines changed: 584 additions & 0 deletions
Large diffs are not rendered by default.

charts/kamaji/crds/kamaji.clastix.io_tenantcontrolplanes.yaml

Lines changed: 584 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)