infrastructure/functions
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

fix: rebase conflict in kustomization
Some checks failed
functions / build (comics) (push) Successful in 1m31s
Details
functions / build (blob-proxy) (push) Failing after 1m39s
Details
functions / deploy (push) Has been skipped
Details

Browse source
This commit is contained in:
Peter 2025-01-21 17:23:39 +01:00
parent 6f60066e14
commit adaa46d144
Signed by: prskr
GPG key ID: F56BED6903BC5E37
1 changed files with 3 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
deploy/kustomization.yaml
View file

@ -3,38 +3,20 @@ kind: Kustomization
namespace: functions
images:
<<<<<<< HEAD
- name: blob-proxy
newName: code.icb4dc0.de/infrastructure/functions/blob-proxy
newTag: 8897bbe4eb0653695c5951a3dc1ec096d6ef8771
- name: comics
newName: code.icb4dc0.de/infrastructure/functions/comics
newTag: 96cf231814d27f6dc9451e4eef0b7faaa63fc3c5
resources:
- resources/namespace.yaml
- resources/executor.yaml
- resources/routes.yaml
- apps/comics.yaml
- apps/blob-proxy.yaml
=======
- name: blob-proxy
newName: code.icb4dc0.de/infrastructure/functions/blob-proxy
newTag: 96cf231814d27f6dc9451e4eef0b7faaa63fc3c5
- name: comics
newName: code.icb4dc0.de/infrastructure/functions/comics
newTag: 96cf231814d27f6dc9451e4eef0b7faaa63fc3c5
- name: blob-proxy
newName: code.icb4dc0.de/infrastructure/functions/blob-proxy
newTag: latest
resources:
- resources/namespace.yaml
- resources/executor.yaml
- resources/routes.yaml
- apps/comics.yaml
- apps/blob-proxy.yaml
>>>>>>> 6beb26c (feat: migrate blob proxy)
configurations:
- kustomizeconfig/spinapp.yaml