github-personal/cozystack
1
0
Fork 0
mirror of https://github.com/outbackdingo/cozystack.git synced 2026-01-27 18:18:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use patch with --no-backup-if-mismatch (#181)

Browse Source 
Add option `--no-backup-if-mismatch` to every patch command, so it will
not create .orig and .diff files anymore
This commit is contained in:
Andrei Kvapil
2024-06-25 14:33:07 +02:00
committed by GitHub
parent d841a20635
commit 2145f41c7f
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/fluxcd/Makefile
View File

@@ -17,4 +17,4 @@ diff:
update:
rm -rf charts
helm pull oci://ghcr.io/controlplaneio-fluxcd/charts/flux-operator --untar --untardir charts
patch -p1 --no-backup-if-mismatch < patches/kubernetesEnvs.diff
patch --no-backup-if-mismatch -p1 < patches/kubernetesEnvs.diff

2
packages/system/dashboard/Makefile
View File

@@ -19,7 +19,7 @@ update-chart:
update-dockerfiles:
tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/vmware-tanzu/kubeapps | awk -F'[/^]' 'END{print $$3}') && \
wget https://github.com/vmware-tanzu/kubeapps/raw/$${tag}/cmd/kubeapps-apis/Dockerfile -O images/kubeapps-apis/Dockerfile && \
patch images/kubeapps-apis/Dockerfile < images/kubeapps-apis/dockerfile.diff && \
patch --no-backup-if-mismatch images/kubeapps-apis/Dockerfile < images/kubeapps-apis/dockerfile.diff && \
node_image=$$(wget -O- https://github.com/vmware-tanzu/kubeapps/raw/main/dashboard/Dockerfile | awk '/FROM bitnami\/node/ {print $$2}') && \
sed -i "s|FROM .* AS build|FROM $${node_image} AS build|" images/dashboard/Dockerfile && \
version=$$(echo "$$tag" | sed 's/^v//') && \

2
packages/system/ingress-nginx/Makefile
View File

@@ -8,7 +8,7 @@ update:
helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
helm repo update ingress-nginx
helm pull ingress-nginx/ingress-nginx --untar --untardir charts
patch -p 3 < patches/add-metrics2.patch
patch --no-backup-if-mismatch -p 3 < patches/add-metrics2.patch
rm -f charts/ingress-nginx/templates/controller-deployment.yaml.orig
rm -rf charts/ingress-nginx/changelog/
#sed -i '/ type:/a \ allocateLoadBalancerNodePorts: false' charts/ingress-nginx/templates/controller-service.yaml

6
packages/system/kamaji-etcd/Makefile
View File

@@ -4,6 +4,6 @@ update:
helm repo update clastix
helm pull clastix/kamaji-etcd --untar --untardir charts
sed -i 's/hook-failed/before-hook-creation,hook-failed/' `grep -rl hook-failed charts`
patch -p4 < patches/fix-svc.diff
patch -p4 < patches/fullnameOverride.diff
patch -p4 < patches/remove-plus.patch
patch --no-backup-if-mismatch -p4 < patches/fix-svc.diff
patch --no-backup-if-mismatch -p4 < patches/fullnameOverride.diff
patch --no-backup-if-mismatch -p4 < patches/remove-plus.patch

2
packages/system/kubeovn/Makefile
View File

@@ -10,7 +10,7 @@ update:
rm -rf charts && mkdir -p charts/kube-ovn
curl -sSL https://github.com/kubeovn/kube-ovn/archive/refs/heads/master.tar.gz | \
tar xzvf - --strip 1 kube-ovn-master/charts
patch -p4 --no-backup-if-mismatch < patches/cozyconfig.diff
patch --no-backup-if-mismatch -p4 < patches/cozyconfig.diff
ln -s ../../images charts/kube-ovn/images
sed -i '/image:/ s/{{.*}}/{{ include "kubeovn.image" . }}/g' `grep -rl image: charts/kube-ovn/templates/`