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(renovate): update to new helm chart and images #864

Merged
merged 1 commit into from
Oct 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions renovate-on-prem/helm/renovate-on-prem/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: whitesource-renovate
repository: https://mend.github.io/renovate-on-prem
version: 3.1.4
digest: sha256:ca1613ad4e7fb4d4716a67e43375c635dfc14687e42e617dc3086582f9e741e8
generated: "2023-07-05T15:35:15.907830315Z"
- name: mend-renovate-ce
repository: https://mend.github.io/renovate-ce-ee
version: 6.1.1
digest: sha256:20868fbc40e77d650d51cad5e64391551852d0cb3448aa111e4900e1525f3659
generated: "2023-10-06T10:44:41.993067+02:00"
10 changes: 5 additions & 5 deletions renovate-on-prem/helm/renovate-on-prem/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ apiVersion: v2
name: renovate-on-prem
description: helm chart for renovate-on-prem
type: application
version: 0.2.1
appVersion: 4.3.0
version: 0.3.0
appVersion: 6.1.1
dependencies:
- name: whitesource-renovate
repository: https://mend.github.io/renovate-on-prem
version: 3.1.4
- name: mend-renovate-ce
repository: https://mend.github.io/renovate-ce-ee
version: 6.1.1
Binary file not shown.
Binary file not shown.
14 changes: 7 additions & 7 deletions renovate-on-prem/helm/renovate-on-prem/templates/runbooks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ spec:
prometheus:
format: cpu
legend: $pod
query: sum(rate(container_cpu_usage_seconds_total{namespace="{{ .Release.Namespace }}",pod=~"{{ template "whitesource-renovate.fullname" (index .Subcharts "whitesource-renovate") }}.+"}[5m])) by (pod)
query: sum(rate(container_cpu_usage_seconds_total{namespace="{{ .Release.Namespace }}",pod=~"{{ template "mend-renovate.fullname" (index .Subcharts "mend-renovate-ce") }}.+"}[5m])) by (pod)
- name: renovate-memory
type: prometheus
prometheus:
format: memory
legend: $pod
query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "whitesource-renovate.fullname" (index .Subcharts "whitesource-renovate") }}.+"}) by (pod)
query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "mend-renovate.fullname" (index .Subcharts "mend-renovate-ce") }}.+"}) by (pod)
- name: renovate
type: kubernetes
kubernetes:
resource: deployment
name: {{ template "whitesource-renovate.fullname" (index .Subcharts "whitesource-renovate") }}
name: {{ template "mend-renovate.fullname" (index .Subcharts "mend-renovate-ce") }}
actions:
- name: scale
action: config
Expand All @@ -36,28 +36,28 @@ spec:
updates:
- path:
- renovate-on-prem
- whitesource-renovate
- mend-renovate-ce
- resources
- requests
- cpu
valueFrom: renovate-cpu
- path:
- renovate-on-prem
- whitesource-renovate
- mend-renovate-ce
- resources
- requests
- memory
valueFrom: renovate-memory
- path:
- renovate-on-prem
- whitesource-renovate
- mend-renovate-ce
- resources
- limits
- cpu
valueFrom: renovate-cpu-limit
- path:
- renovate-on-prem
- whitesource-renovate
- mend-renovate-ce
- resources
- limits
- memory
Expand Down
8 changes: 5 additions & 3 deletions renovate-on-prem/helm/renovate-on-prem/values.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
secrets: {}

whitesource-renovate:
mend-renovate-ce:
image:
repository: dkr.plural.sh/renovate-on-prem/whitesource/renovate
tag: 4.3.0
repository: dkr.plural.sh/renovate-on-prem/mend/renovate-ce
tag: 6.1.1-full
renovate:
mendRnvAdminApiEnabled: true
ingress:
enabled: true
ingressClassName: nginx
Expand Down
23 changes: 12 additions & 11 deletions renovate-on-prem/helm/renovate-on-prem/values.yaml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ global:
- description: renovate public endpoint
url: {{ .Values.hostname }}

whitesource-renovate:
mend-renovate-ce:
ingress:
hosts:
- {{ .Values.hostname }}
Expand All @@ -14,28 +14,29 @@ whitesource-renovate:
- {{ .Values.hostname }}
renovate:
{{- if .Values.acceptTos }}
acceptWhiteSourceTos: "y"
mendRnvAcceptTos: "y"
{{- end }}
licenseKey: {{ .Values.licenseKey }}
renovatePlatform: {{ .Values.platform }}
mendRnvLicenseKey: {{ .Values.licenseKey }}
mendRnvServerApiSecret: {{ dedupe . "renovate-on-prem.mend-renovate-ce.renovate.mendRnvServerApiSecret" (randAlphaNum 32) }}
mendRnvPlatform: {{ .Values.platform }}
{{- if .Values.renovateEndpoint }}
renovateEndpoint: {{ .Values.renovateEndpoint }}
mendRnvEndpoint: {{ .Values.renovateEndpoint }}
{{- else if eq .Values.platform "github" }}
renovateEndpoint: https://api.github.com/
mendRnvEndpoint: https://api.github.com/
{{- else if eq .Values.platform "gitlab" }}
renovateEndpoint: https://gitlab.com/api/v4/
mendRnvEndpoint: https://gitlab.com/api/v4/
{{- end }}
{{- if .Values.githubAppId }}
githubAppId: {{ .Values.githubAppId | quote }}
mendRnvGithubAppId: {{ .Values.githubAppId | quote }}
{{- end }}
{{- if .Values.githubAppKey }}
githubAppKey: {{ .Values.githubAppKey | quote }}
mendRnvGithubAppKey: {{ .Values.githubAppKey | quote }}
{{- end }}
{{- if .Values.webhookSecret }}
webhookSecret: {{ .Values.webhookSecret }}
mendRnvWebhookSecret: {{ .Values.webhookSecret }}
{{- end }}
{{- if .Values.renovateToken }}
renovateToken: {{ .Values.renovateToken }}
mendRnvGitlabPat: {{ .Values.renovateToken }}
{{- end }}
{{- if .Values.githubComToken }}
githubComToken: {{ .Values.githubComToken }}
Expand Down
4 changes: 2 additions & 2 deletions renovate-on-prem/vendor_images.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
docker.io:
ghcr.io:
images-by-tag-regex:
# the below regex can be used to limit the regex range so that only versions >= 2.6.0 are matched
whitesource/renovate: (?:^v?2\.(?:(?:[^0-5]{1})?(?:[6-9]{1}|[0-9]{2}))+?\.[0-9]+$)|(?:^v?(?:(?:[^0-2]{1})?(?:[3-9]{1}|[0-9]{2}))+\.[0-9]+?\.[0-9]+$)
mend/renovate-ce: (?:^v?2\.(?:(?:[^0-5]{1})?(?:[6-9]{1}|[0-9]{2}))+?\.[0-9]+-full$)|(?:^v?(?:(?:[^0-2]{1})?(?:[3-9]{1}|[0-9]{2}))+\.[0-9]+?\.[0-9]+-full$)