From 4c211e87ed802961efad00dd22897c9aa6855d04 Mon Sep 17 00:00:00 2001 From: Daniel Maizel Date: Mon, 29 May 2023 13:42:26 +0300 Subject: [PATCH 1/2] Return ArgoCD override for hybrid (#230) Return ArgoCD override to hybrid --- .../apps/argo-cd/codefresh-hybrid/kustomization.yaml | 5 +++++ csdp/hybrid/basic/apps/argo-cd/kustomization.yaml | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 csdp/hybrid/_components/apps/argo-cd/codefresh-hybrid/kustomization.yaml diff --git a/csdp/hybrid/_components/apps/argo-cd/codefresh-hybrid/kustomization.yaml b/csdp/hybrid/_components/apps/argo-cd/codefresh-hybrid/kustomization.yaml new file mode 100644 index 00000000..0f9099d4 --- /dev/null +++ b/csdp/hybrid/_components/apps/argo-cd/codefresh-hybrid/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component +images: + - name: quay.io/codefresh/argocd + newTag: v2.6.0-cap-CR-18430-del-app diff --git a/csdp/hybrid/basic/apps/argo-cd/kustomization.yaml b/csdp/hybrid/basic/apps/argo-cd/kustomization.yaml index fed45edc..aa41dbb7 100644 --- a/csdp/hybrid/basic/apps/argo-cd/kustomization.yaml +++ b/csdp/hybrid/basic/apps/argo-cd/kustomization.yaml @@ -1,5 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: argocd +resources: + - https://raw.githubusercontent.com/codefresh-io/argo-cd/release-2.6-with-appset/manifests/install.yaml components: - - ../../../../base_components/apps/argo-cd/_bundles/basic + - ../../../../base_components/apps/argo-cd/_components/codefresh-base + - ../../../_components/apps/argo-cd/codefresh-hybrid \ No newline at end of file From 1b3ebef0317a5426e6ccb610beb00ae36d043515 Mon Sep 17 00:00:00 2001 From: danielm-codefresh Date: Mon, 29 May 2023 13:41:15 +0300 Subject: [PATCH 2/2] bump app-proxy --- .../app-proxy/_components/codefresh-base/kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csdp/base_components/apps/app-proxy/_components/codefresh-base/kustomization.yaml b/csdp/base_components/apps/app-proxy/_components/codefresh-base/kustomization.yaml index c295036e..4ec91940 100644 --- a/csdp/base_components/apps/app-proxy/_components/codefresh-base/kustomization.yaml +++ b/csdp/base_components/apps/app-proxy/_components/codefresh-base/kustomization.yaml @@ -4,7 +4,7 @@ kind: Component images: - name: quay.io/codefresh/cap-app-proxy newName: quay.io/codefresh/cap-app-proxy - newTag: 1.2264.1 + newTag: 1.2268.0 resources: - app-proxy.deploy.yaml