Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(operator): polish KeptnConfig and use Env Var for initial configuration #1097

Merged
merged 12 commits into from
Mar 27, 2023
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ YAMLLINT_VERSION ?= alpine-1-0.14

# RELEASE_REGISTRY is the container registry to push
# into.
RELEASE_REGISTRY?=ghcr.io/keptn
RELEASE_REGISTRY?=ghcr.keptn.sh/keptn
thisthat marked this conversation as resolved.
Show resolved Hide resolved
ARCH?=amd64
TAG ?= "$(shell date +%Y%m%d%s)"
TAG := $(TAG)
Expand Down
1 change: 0 additions & 1 deletion helm/chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ lifecycleOperator:
keptnWorkloadControllerLogLevel: "0"
keptnWorkloadInstanceControllerLogLevel: "0"
optionsControllerLogLevel: "0"
otelCollectorUrl: otel-collector:4317
image:
repository: ghcr.keptn.sh/keptn/lifecycle-operator
tag: v0.7.0
Expand Down
15 changes: 15 additions & 0 deletions operator/config/manager/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
apiVersion: options.keptn.sh/v1alpha1
kind: KeptnConfig
metadata:
labels:
app.kubernetes.io/name: keptnconfig
app.kubernetes.io/instance: keptnconfig-sample
app.kubernetes.io/part-of: keptn-lifecycle-toolkit
app.kuberentes.io/managed-by: kustomize
app.kubernetes.io/created-by: keptn-lifecycle-toolkit
control-plane: lifecycle-operator
name: keptnconfig
namespace: system
spec:
OTelCollectorUrl: 'otel-collector:4317'
KeptnAppCreationRequestTimeout: 30
1 change: 1 addition & 0 deletions operator/config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
resources:
- manager.yaml
- service.yaml
- config.yaml
generatorOptions:
disableNameSuffixHash: true
configMapGenerator:
Expand Down
2 changes: 0 additions & 2 deletions operator/config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: OTEL_COLLECTOR_URL
value: otel-collector:4317
- name: FUNCTION_RUNNER_IMAGE
value: ghcr.keptn.sh/keptn/functions-runtime:v0.7.0 #x-release-please-version
- name: KEPTN_APP_CONTROLLER_LOG_LEVEL
Expand Down