Skip to content

Commit

Permalink
fix(helm-chart): fix missing values in the KLT helm chart (#1082)
Browse files Browse the repository at this point in the history
  • Loading branch information
mowies authored Mar 22, 2023
1 parent 71e9073 commit 52311c1
Show file tree
Hide file tree
Showing 9 changed files with 90 additions and 73 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ jobs:
run: make helm-package

- name: Copy charts from klt to helm repo
run: rsync -av --exclude='charts/*.tgz' ./helm/chart/ ./helm-charts-repository/charts/keptn-lifecycle-toolkit/
run: rsync -av --delete --exclude='charts/*.tgz' ./helm/chart/ ./helm-charts-repository/charts/keptn-lifecycle-toolkit/

- name: Create Pull Request
uses: peter-evans/create-pull-request@v4
Expand Down
6 changes: 4 additions & 2 deletions helm/chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,14 @@ kubeVersion: ">= 1.24.0-0"
# a dependency of application charts to inject those utilities and functions into the rendering
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
type: application

# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.0
version: 0.2.1

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "0.5.0" # x-release-please-version
appVersion: "v0.7.0" # x-release-please-version
105 changes: 53 additions & 52 deletions helm/chart/README.md

Large diffs are not rendered by default.

9 changes: 8 additions & 1 deletion helm/chart/doc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,14 @@

## @param lifecycleOperator.replicas customize number of installed lifecycle operator replicas

## @extra Mutating Webhook Configurations for lifecycle Operator
## @extra lifecycleOperatorMetricsService Adjust settings here to change the k8s service for scraping Prometheus metrics
## @skip lifecycleOperatorMetricsService.ports[0].name
## @skip lifecycleOperatorMetricsService.ports[0].port
## @skip lifecycleOperatorMetricsService.ports[0].protocol
## @skip lifecycleOperatorMetricsService.ports[0].targetPort
## @skip lifecycleOperatorMetricsService.type

## @extra lifecycleWebhookService Mutating Webhook Configurations for lifecycle Operator
## @param lifecycleWebhookService.ports[0].port
## @param lifecycleWebhookService.ports[0].protocol
## @param lifecycleWebhookService.ports[0].targetPort
Expand Down
25 changes: 16 additions & 9 deletions helm/chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ certificateOperator:
seccompProfile:
type: RuntimeDefault
image:
repository: ghcr.io/keptn/certificate-operator
tag: 0.6.0
repository: ghcr.keptn.sh/keptn/certificate-operator
tag: v0.7.0
imagePullPolicy: Always
livenessProbe:
httpGet:
Expand Down Expand Up @@ -64,7 +64,7 @@ lifecycleOperator:
seccompProfile:
type: RuntimeDefault
env:
functionRunnerImage: ghcr.keptn.sh/keptn/functions-runtime:v0.6.0
functionRunnerImage: ghcr.keptn.sh/keptn/functions-runtime:v0.7.0
keptnAppControllerLogLevel: "0"
keptnAppVersionControllerLogLevel: "0"
keptnEvaluationControllerLogLevel: "0"
Expand All @@ -75,8 +75,8 @@ lifecycleOperator:
optionsControllerLogLevel: "0"
otelCollectorUrl: otel-collector:4317
image:
repository: ghcr.io/keptn/lifecycle-operator
tag: 0.6.0
repository: ghcr.keptn.sh/keptn/lifecycle-operator
tag: v0.7.0
imagePullPolicy: Always
livenessProbe:
httpGet:
Expand All @@ -101,6 +101,13 @@ lifecycleOperator:
replicas: 1
tolerations: []
topologySpreadConstraints: []
lifecycleOperatorMetricsService:
ports:
- name: metrics
port: 2222
protocol: TCP
targetPort: metrics
type: ClusterIP
lifecycleWebhookService:
ports:
- port: 443
Expand Down Expand Up @@ -129,8 +136,8 @@ metricsOperator:
exposeKeptnMetrics: "true"
metricsControllerLogLevel: "0"
image:
repository: ghcr.io/keptn/metrics-operator
tag: 0.6.0
repository: ghcr.keptn.sh/keptn/metrics-operator
tag: v0.7.0
livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -192,8 +199,8 @@ scheduler:
env:
otelCollectorUrl: otel-collector:4317
image:
repository: ghcr.io/keptn/scheduler
tag: 0.6.0
repository: ghcr.keptn.sh/keptn/scheduler
tag: v0.7.0
imagePullPolicy: Always
livenessProbe:
httpGet:
Expand Down
4 changes: 2 additions & 2 deletions klt-cert-manager/config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: controller
newName: ghcr.io/keptn/certificate-operator
newTag: 0.6.0
newName: ghcr.keptn.sh/keptn/certificate-operator
newTag: v0.7.0
4 changes: 2 additions & 2 deletions metrics-operator/config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: controller
newName: ghcr.io/keptn/metrics-operator
newTag: 0.6.0
newName: ghcr.keptn.sh/keptn/metrics-operator
newTag: v0.7.0
4 changes: 2 additions & 2 deletions operator/config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: controller
newName: ghcr.io/keptn/lifecycle-operator
newTag: 0.6.0
newName: ghcr.keptn.sh/keptn/lifecycle-operator
newTag: v0.7.0
4 changes: 2 additions & 2 deletions scheduler/manifests/install/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: scheduler
newName: ghcr.io/keptn/scheduler
newTag: 0.6.0
newName: ghcr.keptn.sh/keptn/scheduler
newTag: v0.7.0

0 comments on commit 52311c1

Please sign in to comment.