suse-edge/Factory
SHA256
11
0
Fork 5
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[3.2] Use manifest_repo var to allow for release manifest in separate repo #64

Open
nbelouin wants to merge 1 commits from nbelouin/Factory:backport-manifest-repo into 3.2
pull from: nbelouin/Factory:backport-manifest-repo
merge into: suse-edge:3.2
Conversation 0 Commits 1 Files Changed 3 +4 -3
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release-manifest-image/_service
View File

@ -4,7 +4,7 @@
<param name="file">Dockerfile</param> <param name="file">Dockerfile</param>
<param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix})</param> <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix})</param>
<param name="var">IMG_PREFIX</param> <param name="var">IMG_PREFIX</param>
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param> <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %manifest_repo)</param>
<param name="var">IMG_REPO</param> <param name="var">IMG_REPO</param>
<param name="eval">SUPPORT_LEVEL=$(rpm --macros=/root/.rpmmacros -E %support_level)</param> <param name="eval">SUPPORT_LEVEL=$(rpm --macros=/root/.rpmmacros -E %support_level)</param>
<param name="var">SUPPORT_LEVEL</param> <param name="var">SUPPORT_LEVEL</param>

3
upgrade-controller-chart/_service
View File

@ -6,6 +6,8 @@
<param name="var">IMG_PREFIX</param> <param name="var">IMG_PREFIX</param>
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param> <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
<param name="var">IMG_REPO</param> <param name="var">IMG_REPO</param>
<param name="eval">MANIFEST_REPO=$(rpm --macros=/root/.rpmmacros -E %manifest_repo)</param>
<param name="var">MANIFEST_REPO</param>
</service> </service>
<service name="replace_using_env" mode="buildtime"> <service name="replace_using_env" mode="buildtime">
<param name="file">Chart.yaml</param> <param name="file">Chart.yaml</param>
@ -15,4 +17,3 @@
<param name="var">CHART_MAJOR</param> <param name="var">CHART_MAJOR</param>
</service> </service>
</services> </services>

2
upgrade-controller-chart/values.yaml
View File

@ -12,7 +12,7 @@ image:
env: env:
releaseManifest: releaseManifest:
image: %%IMG_REPO%%/%%IMG_PREFIX%%release-manifest image: %%MANIFEST_REPO%%/%%IMG_PREFIX%%release-manifest
kubectl: kubectl:
image: %%IMG_REPO%%/%%IMG_PREFIX%%kubectl image: %%IMG_REPO%%/%%IMG_PREFIX%%kubectl
version: 1.30.3 version: 1.30.3