Skip to content

Commit aabc69f

Browse files
committed
chore: env var name updates
1 parent 57263dc commit aabc69f

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ spec:
5555
- name: MAX_CONCURRENT_RECONCILES
5656
value: "5"
5757

58-
- name: HELM_JOB_IMAGE
58+
- name: HELM_JOB_RUNNER_IMAGE
5959
value: "ghcr.io/kloudlite/plugin-helm-chart/helm-job-runner:v1.0.0"
6060

6161
livenessProbe:

internal/controller/helm_chart/env.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package helm_chart
33
import "github.com/codingconcepts/env"
44

55
type Env struct {
6-
MaxConcurrentReconciles int `env:"MAX_CONCURRENT_RECONCILES" default:"1"`
7-
HelmJobImage string `env:"HELM_JOB_IMAGE" default:"ghcr.io/kloudlite/kloudlite/operator/workers/helm-job-runner:v1.1.4"`
6+
MaxConcurrentReconciles int `env:"MAX_CONCURRENT_RECONCILES" default:"5"`
7+
HelmJobRunnerImage string `env:"HELM_JOB_RUNNER_IMAGE" required:"true"`
88
}
99

1010
func LoadEnv() (*Env, error) {

internal/controller/helm_chart/helmchart_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ func (r *HelmChartReconciler) startInstallJob(req *rApi.Request[*v1.HelmChart])
299299
ObservabilityAnnotations: fn.MapFilterWithPrefix(obj.GetAnnotations(), "kloudlite.io/observability."),
300300
ReleaseName: obj.Name,
301301
ReleaseNamespace: obj.Namespace,
302-
Image: r.Env.HelmJobImage,
302+
Image: r.Env.HelmJobRunnerImage,
303303
ImagePullPolicy: "",
304304
BackOffLimit: 1,
305305
ServiceAccountName: JobServiceAccountName,
@@ -435,7 +435,7 @@ func (r *HelmChartReconciler) startUninstallJob(req *rApi.Request[*v1.HelmChart]
435435
ObservabilityAnnotations: fn.MapFilterWithPrefix(obj.GetAnnotations(), "kloudlite.io/observability."),
436436
ReleaseName: obj.Name,
437437
ReleaseNamespace: obj.Namespace,
438-
Image: r.Env.HelmJobImage,
438+
Image: r.Env.HelmJobRunnerImage,
439439
ImagePullPolicy: "",
440440
BackOffLimit: 0,
441441
ServiceAccountName: JobServiceAccountName,

internal/controller/helm_pipeline/controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ func (r *HelmPipelineReconciler) createInstallJob(req *reconciler.Request[*v1.He
318318
PodTolerations: obj.Spec.HelmJobVars.Tolerations,
319319
NodeSelector: obj.Spec.HelmJobVars.NodeSelector,
320320
ServiceAccountName: JobServiceAccountName,
321-
Image: r.Env.HelmPipelineJobImage,
321+
Image: r.Env.HelmJobRunnerImage,
322322
Pipeline: pipelineSteps,
323323
BackOffLimit: 1,
324324
})
@@ -339,7 +339,7 @@ func (r *HelmPipelineReconciler) createUninstallJob(req *reconciler.Request[*v1.
339339
PodTolerations: obj.Spec.HelmJobVars.Tolerations,
340340
NodeSelector: obj.Spec.HelmJobVars.NodeSelector,
341341
ServiceAccountName: JobServiceAccountName,
342-
Image: r.Env.HelmPipelineJobImage,
342+
Image: r.Env.HelmJobRunnerImage,
343343
BackOffLimit: 1,
344344
})
345345
if err != nil {

internal/controller/helm_pipeline/env.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import "github.com/codingconcepts/env"
44

55
type Env struct {
66
MaxConcurrentReconciles int `env:"MAX_CONCURRENT_RECONCILES" default:"5"`
7-
HelmPipelineJobImage string `env:"HELM_PIPELINE_JOB_IMAGE"`
7+
HelmJobRunnerImage string `env:"HELM_JOB_RUNNER_IMAGE" required:"true"`
88
}
99

1010
func LoadEnv() (*Env, error) {

0 commit comments

Comments
 (0)