-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
98 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
{ | ||
"$schema": "https://docs.renovatebot.com/renovate-schema.json", | ||
"packageRules": [ | ||
{ | ||
"matchPackageNames": ["argocd", "argo-cd", "/argo-?cd/"], | ||
"allowedVersions": "/^[0-9]+\\.[0-9]+\\.[0-9]+(\\.[0-9]+)?$/", | ||
"versioning": "regex:^v?(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)?$" | ||
} | ||
] | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
ARG TARGETPLATFORM | ||
ARG VERSION | ||
|
||
FROM ghcr.io/deedee-ops/ubuntu:22.04 AS builder | ||
|
||
WORKDIR /usr/src | ||
|
||
#hadolint ignore=DL3008 | ||
RUN apt-get update \ | ||
&& apt-get install --yes --no-install-recommends bash build-essential git gnupg2 software-properties-common \ | ||
&& add-apt-repository ppa:longsleep/golang-backports -y \ | ||
&& apt-get update \ | ||
&& apt-get install --yes --no-install-recommends golang-go \ | ||
&& git clone --depth 1 --branch release-3.16 https://github.com/helm/helm | ||
|
||
WORKDIR /usr/src/helm | ||
|
||
COPY nullify-subchart-values.patch /usr/src/helm/ | ||
|
||
RUN patch -p1 < nullify-subchart-values.patch \ | ||
&& make | ||
|
||
FROM quay.io/argoproj/argocd:v${VERSION} | ||
|
||
COPY --chmod=0755 --chown=0:0 --from=builder /usr/src/helm/bin/helm /usr/local/bin/helm | ||
|
||
ENTRYPOINT ["/usr/bin/tini", "--"] | ||
|
||
LABEL org.opencontainers.image.source="https://github.com/argoproj/argo-cd/" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
{ | ||
"app": "argocd", | ||
"base": false, | ||
"testMuteCmd": true, | ||
"channels": [ | ||
{ | ||
"name": "stable", | ||
"renovate::dataSource": "docker", | ||
"renovate::depName": "quay.io/argoproj/argocd", | ||
"version": "2.12.4", | ||
"platforms": [ | ||
"linux/amd64", | ||
"linux/arm64" | ||
] | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
From 5a58751a053ea59b88399487a5f0f8f5c27b9461 Mon Sep 17 00:00:00 2001 | ||
From: Ryan Hockstad <[email protected]> | ||
Date: Wed, 13 Mar 2024 18:17:00 -0400 | ||
Subject: [PATCH] merge null child chart objects | ||
|
||
Signed-off-by: Ryan Hockstad <[email protected]> | ||
--- | ||
pkg/chartutil/coalesce.go | 12 ++++++++++++ | ||
1 file changed, 12 insertions(+) | ||
|
||
diff --git a/pkg/chartutil/coalesce.go b/pkg/chartutil/coalesce.go | ||
index f0272fd6abc..40bce2a68e4 100644 | ||
--- a/pkg/chartutil/coalesce.go | ||
+++ b/pkg/chartutil/coalesce.go | ||
@@ -237,6 +237,9 @@ func coalesceValues(printf printFn, c *chart.Chart, v map[string]interface{}, pr | ||
printf("warning: skipped value for %s.%s: Not a table.", subPrefix, key) | ||
} | ||
} else { | ||
+ // If the key is a child chart, coalesce tables with Merge set to true | ||
+ merge := childChartMergeTrue(c, key, merge) | ||
+ | ||
// Because v has higher precedence than nv, dest values override src | ||
// values. | ||
coalesceTablesFullKey(printf, dest, src, concatPrefix(subPrefix, key), merge) | ||
@@ -249,6 +252,15 @@ func coalesceValues(printf printFn, c *chart.Chart, v map[string]interface{}, pr | ||
} | ||
} | ||
|
||
+func childChartMergeTrue(chrt *chart.Chart, key string, merge bool) bool { | ||
+ for _, subchart := range chrt.Dependencies() { | ||
+ if subchart.Name() == key { | ||
+ return true | ||
+ } | ||
+ } | ||
+ return merge | ||
+} | ||
+ | ||
// CoalesceTables merges a source map into a destination map. | ||
// | ||
// dest is considered authoritative. |