From 21e19a57bed2c70bcbef01f3106f1a75b9450db6 Mon Sep 17 00:00:00 2001 From: Philipp Plotnikov Date: Fri, 18 Nov 2022 14:36:42 +0400 Subject: [PATCH 01/19] [BE]:Up version (#126) * Up version * Up version * Up proxy version * Wip * Back version * Wip --- .../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 863411a3..f5c6fc57 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 @@ -3,7 +3,7 @@ kind: Component images: - name: quay.io/codefresh/cap-app-proxy newName: quay.io/codefresh/cap-app-proxy - newTag: 1.1973.1 + newTag: 1.1979.3 resources: - app-proxy.deploy.yaml - app-proxy.svc.yaml From aab1ea6431ff4ef25fe3264f79a3c6ee703811f9 Mon Sep 17 00:00:00 2001 From: Daniel Maizel Date: Fri, 18 Nov 2022 16:59:42 +0200 Subject: [PATCH 02/19] add applications to app-proxy rbac (#124) * add applications to app-proxy rbac * bump * remove version bump --- .../_components/codefresh-base/app-proxy.role.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/csdp/base_components/apps/app-proxy/_components/codefresh-base/app-proxy.role.yaml b/csdp/base_components/apps/app-proxy/_components/codefresh-base/app-proxy.role.yaml index 66c1ca51..3542a406 100644 --- a/csdp/base_components/apps/app-proxy/_components/codefresh-base/app-proxy.role.yaml +++ b/csdp/base_components/apps/app-proxy/_components/codefresh-base/app-proxy.role.yaml @@ -27,3 +27,11 @@ rules: verbs: - get - list + - apiGroups: + - argoproj.io + resources: + - applications + verbs: + - get + - list + - watch From bbb568cd6f7f1b2fda2c18aea012dafda890260f Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Sun, 20 Nov 2022 09:39:59 +0200 Subject: [PATCH 03/19] CR-15471-insecure-git-providers (#130) * add initContainer to app-proxy --- .../codefresh-base/app-proxy.deploy.yaml | 52 ++++++++++++++++--- 1 file changed, 46 insertions(+), 6 deletions(-) diff --git a/csdp/base_components/apps/app-proxy/_components/codefresh-base/app-proxy.deploy.yaml b/csdp/base_components/apps/app-proxy/_components/codefresh-base/app-proxy.deploy.yaml index 035e3ccf..9989a8ad 100644 --- a/csdp/base_components/apps/app-proxy/_components/codefresh-base/app-proxy.deploy.yaml +++ b/csdp/base_components/apps/app-proxy/_components/codefresh-base/app-proxy.deploy.yaml @@ -14,6 +14,34 @@ spec: app: cap-app-proxy spec: serviceAccountName: cap-app-proxy + initContainers: + - name: init-certs + image: alpine:3.16 + imagePullPolicy: Always + command: + - sh + - -c + - | + /bin/sh <<'EOF' + if [ $(ls /app/config/tls) ]; then + echo "concatenating certs into /app/config/all/all.cer" + cat /app/config/tls/* >> /app/config/all/all.cer + else + echo "no certs to concatenate" + fi + EOF + volumeMounts: + - mountPath: /app/config/tls + name: tls-certs + - mountPath: /app/config/all + name: all-certs + resources: + limits: + memory: 512Mi + cpu: '1' + requests: + memory: 256Mi + cpu: '0.2' containers: - env: - name: ARGO_CD_URL @@ -120,6 +148,8 @@ spec: name: cap-app-proxy-cm key: stripPrefix optional: true + - name: NODE_EXTRA_CA_CERTS + value: /app/config/all/all.cer image: quay.io/codefresh/cap-app-proxy imagePullPolicy: Always name: cap-app-proxy @@ -141,12 +171,22 @@ spec: containerPort: 80 resources: requests: - memory: "512Mi" - ephemeral-storage: "2Gi" - cpu: "100m" + memory: '512Mi' + ephemeral-storage: '2Gi' + cpu: '100m' limits: - memory: "1Gi" - ephemeral-storage: "6Gi" - cpu: "1500m" + memory: '1Gi' + ephemeral-storage: '6Gi' + cpu: '1500m' securityContext: allowPrivilegeEscalation: false + volumeMounts: + - mountPath: /app/config/all + name: all-certs + volumes: + - name: all-certs + emptyDir: {} + - configMap: + defaultMode: 420 + name: argocd-tls-certs-cm + name: tls-certs From 22f5ef5b059e64ef110431da6d7e2b8053d7a8b5 Mon Sep 17 00:00:00 2001 From: pasha-codefresh Date: Sun, 20 Nov 2022 17:13:28 +0200 Subject: [PATCH 04/19] move hosted to 2.4 (#129) Co-authored-by: Daniel Maizel --- VERSION | 2 +- .../argo-cd/_components/base-manifests/kustomization.yaml | 2 +- .../argo-cd/_components/codefresh-base/kustomization.yaml | 2 +- csdp/base_components/bootstrap/kustomization.yaml | 4 ++-- csdp/hybrid/basic/runtime.yaml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/VERSION b/VERSION index 7ac4e5e3..71d6a66e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.13 +0.1.14 diff --git a/csdp/base_components/apps/argo-cd/_components/base-manifests/kustomization.yaml b/csdp/base_components/apps/argo-cd/_components/base-manifests/kustomization.yaml index 68340126..a63d3d10 100644 --- a/csdp/base_components/apps/argo-cd/_components/base-manifests/kustomization.yaml +++ b/csdp/base_components/apps/argo-cd/_components/base-manifests/kustomization.yaml @@ -1,4 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1alpha1 kind: Component resources: -- https://raw.githubusercontent.com/codefresh-io/argo-cd/release-2.3/manifests/install.yaml \ No newline at end of file +- https://raw.githubusercontent.com/codefresh-io/argo-cd/release-2.4/manifests/install.yaml diff --git a/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml b/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml index 23dcf61b..ff539b94 100644 --- a/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml +++ b/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml @@ -5,7 +5,7 @@ resources: images: - name: quay.io/codefresh/argocd - newTag: v2.3.4-cap-CR-15024-resource-tree-labels + newTag: v2.4.15-cap-CR-15028-last-changes - name: quay.io/codefresh/applicationset newTag: v0.4.2-CR-13254-remove-private-logs diff --git a/csdp/base_components/bootstrap/kustomization.yaml b/csdp/base_components/bootstrap/kustomization.yaml index 6192f611..76b29f91 100644 --- a/csdp/base_components/bootstrap/kustomization.yaml +++ b/csdp/base_components/bootstrap/kustomization.yaml @@ -9,8 +9,8 @@ configMapGenerator: - name: codefresh-cm behavior: create literals: # order matters - DO NOT change - - version=0.1.13 # Runtime version - - bootstrapRevision=0.1.13 # Tag to use for bootstrap (change this to the name of your branch if you want to test changes) + - version=0.1.14 # Runtime version + - bootstrapRevision=0.1.14 # Tag to use for bootstrap (change this to the name of your branch if you want to test changes) - appsetRequeueTime=15 replacements: # template the version from the configmap into the applicationset generators diff --git a/csdp/hybrid/basic/runtime.yaml b/csdp/hybrid/basic/runtime.yaml index 14ef8f59..2be919f5 100644 --- a/csdp/hybrid/basic/runtime.yaml +++ b/csdp/hybrid/basic/runtime.yaml @@ -5,7 +5,7 @@ metadata: namespace: "{{ namespace }}" spec: requiredCLIVersion: ^0.1.0 - version: 0.1.13 + version: 0.1.14 bootstrapSpecifier: github.com/codefresh-io/csdp-official/csdp/hybrid/basic/apps/argo-cd components: - name: events From 9913fae3833dfcb7535b0353646837f192b54f43 Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Sun, 20 Nov 2022 20:02:09 +0200 Subject: [PATCH 05/19] bumped app-proxy to 1.1982.0 (#132) --- .../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 f5c6fc57..b663eeae 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 @@ -3,7 +3,7 @@ kind: Component images: - name: quay.io/codefresh/cap-app-proxy newName: quay.io/codefresh/cap-app-proxy - newTag: 1.1979.3 + newTag: 1.1982.0 resources: - app-proxy.deploy.yaml - app-proxy.svc.yaml From aeeeb3a623e87ae03b61b767ebd7e40d197df144 Mon Sep 17 00:00:00 2001 From: pasha-codefresh Date: Thu, 24 Nov 2022 11:53:25 +0200 Subject: [PATCH 06/19] fix appset (#133) * fix appset * fix hosted installation * fix hybrid install * argocd 2.4 install * Debug * Revert "Debug" This reverts commit c02c9afc9f5977927cdbd6af63e53db0e6f75354. Co-authored-by: danielm-codefresh --- .../argo-cd/_components/codefresh-base/kustomization.yaml | 2 +- .../apps/argo-cd/codefresh-hybrid/kustomization.yaml | 5 ----- csdp/hybrid/basic/apps/argo-cd/kustomization.yaml | 5 +---- 3 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 csdp/hybrid/_components/apps/argo-cd/codefresh-hybrid/kustomization.yaml diff --git a/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml b/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml index ff539b94..9429460a 100644 --- a/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml +++ b/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml @@ -5,7 +5,7 @@ resources: images: - name: quay.io/codefresh/argocd - newTag: v2.4.15-cap-CR-15028-last-changes + newTag: v2.4.15-cap-fix-applicationset - name: quay.io/codefresh/applicationset newTag: v0.4.2-CR-13254-remove-private-logs diff --git a/csdp/hybrid/_components/apps/argo-cd/codefresh-hybrid/kustomization.yaml b/csdp/hybrid/_components/apps/argo-cd/codefresh-hybrid/kustomization.yaml deleted file mode 100644 index d216f483..00000000 --- a/csdp/hybrid/_components/apps/argo-cd/codefresh-hybrid/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1alpha1 -kind: Component -images: - - name: quay.io/codefresh/argocd - newTag: v2.4.15-cap-CR-15028-last-changes diff --git a/csdp/hybrid/basic/apps/argo-cd/kustomization.yaml b/csdp/hybrid/basic/apps/argo-cd/kustomization.yaml index c5ebb618..fed45edc 100644 --- a/csdp/hybrid/basic/apps/argo-cd/kustomization.yaml +++ b/csdp/hybrid/basic/apps/argo-cd/kustomization.yaml @@ -1,8 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: argocd -resources: - - https://raw.githubusercontent.com/codefresh-io/argo-cd/release-2.4/manifests/install.yaml components: - - ../../../../base_components/apps/argo-cd/_components/codefresh-base - - ../../../_components/apps/argo-cd/codefresh-hybrid + - ../../../../base_components/apps/argo-cd/_bundles/basic From 27d6d60094f0b8d2810fcf5a30cc6c5256d15648 Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Tue, 29 Nov 2022 14:51:05 +0200 Subject: [PATCH 07/19] bump app-proxy to 1.1991.1 (#138) * bump app-proxy to 1.1991.1 --- .../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 b663eeae..a8de604c 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 @@ -3,7 +3,7 @@ kind: Component images: - name: quay.io/codefresh/cap-app-proxy newName: quay.io/codefresh/cap-app-proxy - newTag: 1.1982.0 + newTag: 1.1991.1 resources: - app-proxy.deploy.yaml - app-proxy.svc.yaml From e1341d11c78c5427e6d9227ff129bdead8d8cb6d Mon Sep 17 00:00:00 2001 From: Oleksandr Saulyak Date: Tue, 29 Nov 2022 16:07:54 +0200 Subject: [PATCH 08/19] CR-14423 (#136) app proxy update --- .../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 a8de604c..6a40db6d 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 @@ -3,7 +3,7 @@ kind: Component images: - name: quay.io/codefresh/cap-app-proxy newName: quay.io/codefresh/cap-app-proxy - newTag: 1.1991.1 + newTag: 1.1991.3 resources: - app-proxy.deploy.yaml - app-proxy.svc.yaml From b63acd370d980475357e745110ac66bd11a0c39f Mon Sep 17 00:00:00 2001 From: Daniel Maizel Date: Wed, 30 Nov 2022 18:53:48 +0200 Subject: [PATCH 09/19] Revert hosted move to argocd 2.4 (#139) * Revert "move hosted to 2.4 (#129)" This reverts commit 22f5ef5b059e64ef110431da6d7e2b8053d7a8b5. * Revert "fix appset (#133)" This reverts commit aeeeb3a623e87ae03b61b767ebd7e40d197df144. * fix --- .../argo-cd/_components/base-manifests/kustomization.yaml | 2 +- .../argo-cd/_components/codefresh-base/kustomization.yaml | 2 +- .../apps/argo-cd/codefresh-hybrid/kustomization.yaml | 5 +++++ csdp/hybrid/basic/apps/argo-cd/kustomization.yaml | 6 +++++- 4 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 csdp/hybrid/_components/apps/argo-cd/codefresh-hybrid/kustomization.yaml diff --git a/csdp/base_components/apps/argo-cd/_components/base-manifests/kustomization.yaml b/csdp/base_components/apps/argo-cd/_components/base-manifests/kustomization.yaml index a63d3d10..68340126 100644 --- a/csdp/base_components/apps/argo-cd/_components/base-manifests/kustomization.yaml +++ b/csdp/base_components/apps/argo-cd/_components/base-manifests/kustomization.yaml @@ -1,4 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1alpha1 kind: Component resources: -- https://raw.githubusercontent.com/codefresh-io/argo-cd/release-2.4/manifests/install.yaml +- https://raw.githubusercontent.com/codefresh-io/argo-cd/release-2.3/manifests/install.yaml \ No newline at end of file diff --git a/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml b/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml index 9429460a..23dcf61b 100644 --- a/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml +++ b/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml @@ -5,7 +5,7 @@ resources: images: - name: quay.io/codefresh/argocd - newTag: v2.4.15-cap-fix-applicationset + newTag: v2.3.4-cap-CR-15024-resource-tree-labels - name: quay.io/codefresh/applicationset newTag: v0.4.2-CR-13254-remove-private-logs 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..d216f483 --- /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.4.15-cap-CR-15028-last-changes diff --git a/csdp/hybrid/basic/apps/argo-cd/kustomization.yaml b/csdp/hybrid/basic/apps/argo-cd/kustomization.yaml index fed45edc..dbf7fd53 100644 --- a/csdp/hybrid/basic/apps/argo-cd/kustomization.yaml +++ b/csdp/hybrid/basic/apps/argo-cd/kustomization.yaml @@ -1,5 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: argocd +resources: + - https://raw.githubusercontent.com/codefresh-io/argo-cd/release-2.4/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 + From 30f438e582f1aaca53884ea05b374725bf8a6485 Mon Sep 17 00:00:00 2001 From: Andrii Shaforostov Date: Fri, 2 Dec 2022 14:10:23 +0200 Subject: [PATCH 10/19] update app-proxy (#141) * update app-proxy * hybrid test * Revert "hybrid test" This reverts commit e656ba816328066caf1691399e45a828246391c8. --- .../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 6a40db6d..181a8260 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 @@ -3,7 +3,7 @@ kind: Component images: - name: quay.io/codefresh/cap-app-proxy newName: quay.io/codefresh/cap-app-proxy - newTag: 1.1991.3 + newTag: 1.1995.2 resources: - app-proxy.deploy.yaml - app-proxy.svc.yaml From b82f6ea010c6410717cfea6c158980840330269b Mon Sep 17 00:00:00 2001 From: Daniel Maizel Date: Sun, 4 Dec 2022 10:47:07 +0200 Subject: [PATCH 11/19] fix appProtocol for argocd-server to support Istio (#140) --- .../argo-cd/_components/codefresh-base/kustomization.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml b/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml index 23dcf61b..2f1768f0 100644 --- a/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml +++ b/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml @@ -30,6 +30,9 @@ patches: - op: replace path: /subjects/0/namespace value: default + + # Istio protocol selection: https://istio.io/latest/docs/ops/configuration/traffic-management/protocol-selection/ + # Ovveride the default protocol selection which is done by the port name (http), since this port is being used for both http and grpc. - target: version: v1 kind: Service @@ -37,10 +40,7 @@ patches: patch: | - op: add path: /spec/ports/0/appProtocol - value: grpc - - op: add - path: /spec/ports/1/appProtocol - value: grpc + value: tcp - target: name: argocd-repo-server From 31cc7364a5510aa2696b06a88e6c1797cac718cf Mon Sep 17 00:00:00 2001 From: pasha-codefresh Date: Sun, 4 Dec 2022 13:10:18 +0200 Subject: [PATCH 12/19] Cr 24 hosted (#142) * Release 0.1.16 (#134) releasing 0.1.16 * Revert "Revert hosted move to argocd 2.4 (#139)" This reverts commit b63acd37 * hosted 2.4 * hosted 2.4 * runtime.yaml * fix hybrid * fix hybrid * revert VERSION Co-authored-by: Daniel Maizel --- .../argo-cd/_components/base-manifests/kustomization.yaml | 2 +- .../argo-cd/_components/codefresh-base/kustomization.yaml | 2 +- .../apps/argo-cd/codefresh-hybrid/kustomization.yaml | 5 ----- csdp/hybrid/basic/apps/argo-cd/kustomization.yaml | 6 +----- 4 files changed, 3 insertions(+), 12 deletions(-) delete mode 100644 csdp/hybrid/_components/apps/argo-cd/codefresh-hybrid/kustomization.yaml diff --git a/csdp/base_components/apps/argo-cd/_components/base-manifests/kustomization.yaml b/csdp/base_components/apps/argo-cd/_components/base-manifests/kustomization.yaml index 68340126..a63d3d10 100644 --- a/csdp/base_components/apps/argo-cd/_components/base-manifests/kustomization.yaml +++ b/csdp/base_components/apps/argo-cd/_components/base-manifests/kustomization.yaml @@ -1,4 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1alpha1 kind: Component resources: -- https://raw.githubusercontent.com/codefresh-io/argo-cd/release-2.3/manifests/install.yaml \ No newline at end of file +- https://raw.githubusercontent.com/codefresh-io/argo-cd/release-2.4/manifests/install.yaml diff --git a/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml b/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml index 2f1768f0..94ea81b0 100644 --- a/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml +++ b/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml @@ -5,7 +5,7 @@ resources: images: - name: quay.io/codefresh/argocd - newTag: v2.3.4-cap-CR-15024-resource-tree-labels + newTag: v2.4.15-cap-fix-applicationset - name: quay.io/codefresh/applicationset newTag: v0.4.2-CR-13254-remove-private-logs diff --git a/csdp/hybrid/_components/apps/argo-cd/codefresh-hybrid/kustomization.yaml b/csdp/hybrid/_components/apps/argo-cd/codefresh-hybrid/kustomization.yaml deleted file mode 100644 index d216f483..00000000 --- a/csdp/hybrid/_components/apps/argo-cd/codefresh-hybrid/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1alpha1 -kind: Component -images: - - name: quay.io/codefresh/argocd - newTag: v2.4.15-cap-CR-15028-last-changes diff --git a/csdp/hybrid/basic/apps/argo-cd/kustomization.yaml b/csdp/hybrid/basic/apps/argo-cd/kustomization.yaml index dbf7fd53..fed45edc 100644 --- a/csdp/hybrid/basic/apps/argo-cd/kustomization.yaml +++ b/csdp/hybrid/basic/apps/argo-cd/kustomization.yaml @@ -1,9 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namespace: argocd -resources: - - https://raw.githubusercontent.com/codefresh-io/argo-cd/release-2.4/manifests/install.yaml components: - - ../../../../base_components/apps/argo-cd/_components/codefresh-base - - ../../../_components/apps/argo-cd/codefresh-hybrid - + - ../../../../base_components/apps/argo-cd/_bundles/basic From ce2330bda66d12c2a0deb2c795865cc30af7c82c Mon Sep 17 00:00:00 2001 From: Denis Melnik Date: Tue, 13 Dec 2022 11:26:08 +0200 Subject: [PATCH 13/19] upgrade argo-workflows to 3.4 (#144) * =upgrade argo-workflows * fix changed ns * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * prepare for merge * wip * prepare for merge * update tag to 3.4.4 --- .../codefresh-base/kustomization.yaml | 56 +++++++------------ 1 file changed, 20 insertions(+), 36 deletions(-) diff --git a/csdp/base_components/apps/argo-workflows/_components/codefresh-base/kustomization.yaml b/csdp/base_components/apps/argo-workflows/_components/codefresh-base/kustomization.yaml index a52213dd..89346242 100644 --- a/csdp/base_components/apps/argo-workflows/_components/codefresh-base/kustomization.yaml +++ b/csdp/base_components/apps/argo-workflows/_components/codefresh-base/kustomization.yaml @@ -1,18 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1alpha1 kind: Component resources: -- https://github.com/codefresh-io/argo-workflows/releases/download/v3.2.6-cap-CR-8697/install.yaml -patches: - # reset the crbs to `subject.namespace: default`, so that argo-cd will later change them to the actual ns - - target: - group: rbac.authorization.k8s.io - version: v1 - kind: ClusterRoleBinding - patch: |- - - op: replace - path: /subjects/0/namespace - value: default + - https://github.com/codefresh-io/argo-workflows/releases/download/v3.4.4-cf/install.yaml +patches: - target: group: apps version: v1 @@ -22,29 +13,22 @@ patches: - op: add path: /spec/template/spec/containers/0/args/- value: --auth-mode=server - -patchesStrategicMerge: - - | - apiVersion: v1 - kind: ConfigMap - metadata: + - target: + version: v1 + kind: ConfigMap name: workflow-controller-configmap - data: - # Fields reference can be found here: https://argoproj.github.io/argo-workflows/workflow-controller-configmap.yaml - workflowDefaults: | - spec: - ttlStrategy: - secondsAfterCompletion: 86400 - secondsAfterSuccess: 86400 - secondsAfterFailure: 86400 - podGC: - strategy: OnWorkflowCompletion - labelSelector: - matchLabels: - should-be-deleted: "true" - -configMapGenerator: - - name: workflow-controller-configmap - behavior: merge - literals: - - containerRuntimeExecutor=emissary \ No newline at end of file + patch: |- + - op: add + path: /data + value: + workflowDefaults: | + spec: + ttlStrategy: + secondsAfterCompletion: 86400 + secondsAfterSuccess: 86400 + secondsAfterFailure: 86400 + podGC: + strategy: OnWorkflowCompletion + labelSelector: + matchLabels: + should-be-deleted: "true" From cf57c76107aa40971ba52ed4f229a9f29bed49e1 Mon Sep 17 00:00:00 2001 From: Denis Melnik Date: Sun, 18 Dec 2022 10:07:05 +0200 Subject: [PATCH 14/19] Cr 15967 bb enr rc (#147) * mount argocd-token to app-proxy env * bumped app-proxy to 1.2016.2 Co-authored-by: Noam Gal Co-authored-by: andrii-codefresh --- .../codefresh-base/app-proxy.crb.yaml | 6 +++--- .../codefresh-base/app-proxy.deploy.yaml | 18 +++++++----------- .../codefresh-base/kustomization.yaml | 2 +- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/csdp/base_components/apps/app-proxy/_components/codefresh-base/app-proxy.crb.yaml b/csdp/base_components/apps/app-proxy/_components/codefresh-base/app-proxy.crb.yaml index 91d5d357..63e1e8e5 100644 --- a/csdp/base_components/apps/app-proxy/_components/codefresh-base/app-proxy.crb.yaml +++ b/csdp/base_components/apps/app-proxy/_components/codefresh-base/app-proxy.crb.yaml @@ -7,6 +7,6 @@ roleRef: kind: ClusterRole name: argo-server-cluster-role subjects: -- kind: ServiceAccount - name: cap-app-proxy - namespace: default + - kind: ServiceAccount + name: cap-app-proxy + namespace: default diff --git a/csdp/base_components/apps/app-proxy/_components/codefresh-base/app-proxy.deploy.yaml b/csdp/base_components/apps/app-proxy/_components/codefresh-base/app-proxy.deploy.yaml index 9989a8ad..0799f221 100644 --- a/csdp/base_components/apps/app-proxy/_components/codefresh-base/app-proxy.deploy.yaml +++ b/csdp/base_components/apps/app-proxy/_components/codefresh-base/app-proxy.deploy.yaml @@ -33,6 +33,7 @@ spec: volumeMounts: - mountPath: /app/config/tls name: tls-certs + readOnly: true - mountPath: /app/config/all name: all-certs resources: @@ -50,17 +51,11 @@ spec: name: cap-app-proxy-cm key: argoCdUrl optional: true - - name: ARGO_CD_USERNAME - valueFrom: - configMapKeyRef: - name: cap-app-proxy-cm - key: argoCdUsername - optional: true - - name: ARGO_CD_PASSWORD + - name: ARGO_CD_TOKEN valueFrom: secretKeyRef: - name: argocd-initial-admin-secret - key: password + name: argocd-token + key: token - name: ARGO_WORKFLOWS_INSECURE valueFrom: configMapKeyRef: @@ -183,10 +178,11 @@ spec: volumeMounts: - mountPath: /app/config/all name: all-certs + readOnly: true volumes: - name: all-certs emptyDir: {} - - configMap: + - name: tls-certs + configMap: defaultMode: 420 name: argocd-tls-certs-cm - name: tls-certs 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 181a8260..e78dbd6b 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 @@ -3,7 +3,7 @@ kind: Component images: - name: quay.io/codefresh/cap-app-proxy newName: quay.io/codefresh/cap-app-proxy - newTag: 1.1995.2 + newTag: 1.2016.2 resources: - app-proxy.deploy.yaml - app-proxy.svc.yaml From 57eee662350fe610ad6324a6631157788b9281af Mon Sep 17 00:00:00 2001 From: Oleksandr Saulyak Date: Mon, 19 Dec 2022 15:01:03 +0200 Subject: [PATCH 15/19] CR-15900-argo-cd-version-update (#149) argo-cd version update with rollback query --- .../apps/argo-cd/_components/codefresh-base/kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml b/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml index 94ea81b0..8f835096 100644 --- a/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml +++ b/csdp/base_components/apps/argo-cd/_components/codefresh-base/kustomization.yaml @@ -5,7 +5,7 @@ resources: images: - name: quay.io/codefresh/argocd - newTag: v2.4.15-cap-fix-applicationset + newTag: v2.4.15-cap-CR-15677-rollout-rollback - name: quay.io/codefresh/applicationset newTag: v0.4.2-CR-13254-remove-private-logs From 7f5929bc34e51b37355e74dcf1c24b0f3fb47095 Mon Sep 17 00:00:00 2001 From: danielm-codefresh Date: Wed, 21 Dec 2022 16:42:05 +0200 Subject: [PATCH 16/19] Revert "upgrade argo-workflows to 3.4 (#144)" This reverts commit ce2330bda66d12c2a0deb2c795865cc30af7c82c. --- .../codefresh-base/kustomization.yaml | 56 ++++++++++++------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/csdp/base_components/apps/argo-workflows/_components/codefresh-base/kustomization.yaml b/csdp/base_components/apps/argo-workflows/_components/codefresh-base/kustomization.yaml index 89346242..a52213dd 100644 --- a/csdp/base_components/apps/argo-workflows/_components/codefresh-base/kustomization.yaml +++ b/csdp/base_components/apps/argo-workflows/_components/codefresh-base/kustomization.yaml @@ -1,9 +1,18 @@ apiVersion: kustomize.config.k8s.io/v1alpha1 kind: Component resources: - - https://github.com/codefresh-io/argo-workflows/releases/download/v3.4.4-cf/install.yaml - +- https://github.com/codefresh-io/argo-workflows/releases/download/v3.2.6-cap-CR-8697/install.yaml patches: + # reset the crbs to `subject.namespace: default`, so that argo-cd will later change them to the actual ns + - target: + group: rbac.authorization.k8s.io + version: v1 + kind: ClusterRoleBinding + patch: |- + - op: replace + path: /subjects/0/namespace + value: default + - target: group: apps version: v1 @@ -13,22 +22,29 @@ patches: - op: add path: /spec/template/spec/containers/0/args/- value: --auth-mode=server - - target: - version: v1 - kind: ConfigMap + +patchesStrategicMerge: + - | + apiVersion: v1 + kind: ConfigMap + metadata: name: workflow-controller-configmap - patch: |- - - op: add - path: /data - value: - workflowDefaults: | - spec: - ttlStrategy: - secondsAfterCompletion: 86400 - secondsAfterSuccess: 86400 - secondsAfterFailure: 86400 - podGC: - strategy: OnWorkflowCompletion - labelSelector: - matchLabels: - should-be-deleted: "true" + data: + # Fields reference can be found here: https://argoproj.github.io/argo-workflows/workflow-controller-configmap.yaml + workflowDefaults: | + spec: + ttlStrategy: + secondsAfterCompletion: 86400 + secondsAfterSuccess: 86400 + secondsAfterFailure: 86400 + podGC: + strategy: OnWorkflowCompletion + labelSelector: + matchLabels: + should-be-deleted: "true" + +configMapGenerator: + - name: workflow-controller-configmap + behavior: merge + literals: + - containerRuntimeExecutor=emissary \ No newline at end of file From 339f028a8a833ac4069248d077ff03ba3e2f33ed Mon Sep 17 00:00:00 2001 From: Daniel Maizel Date: Mon, 2 Jan 2023 17:28:45 +0200 Subject: [PATCH 17/19] upgrade argo-rollouts to 1.4.0 (#152) --- .../argo-rollouts/_components/codefresh-base/kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csdp/base_components/apps/argo-rollouts/_components/codefresh-base/kustomization.yaml b/csdp/base_components/apps/argo-rollouts/_components/codefresh-base/kustomization.yaml index 49c9c502..015ca99f 100644 --- a/csdp/base_components/apps/argo-rollouts/_components/codefresh-base/kustomization.yaml +++ b/csdp/base_components/apps/argo-rollouts/_components/codefresh-base/kustomization.yaml @@ -1,7 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1alpha1 kind: Component resources: - - https://github.com/codefresh-io/argo-rollouts/releases/download/v1.2.0-cap-CR-10626/install.yaml + - https://github.com/codefresh-io/argo-rollouts/releases/download/v1.4.0-cap-CR-10626/install.yaml patches: - target: group: apiextensions.k8s.io From 6d8e32bab2d6c82f38a9baded194277033e7f543 Mon Sep 17 00:00:00 2001 From: Daniel Maizel Date: Tue, 3 Jan 2023 09:33:09 +0200 Subject: [PATCH 18/19] bump app-proxy (#155) --- .../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 e78dbd6b..29cac758 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 @@ -3,7 +3,7 @@ kind: Component images: - name: quay.io/codefresh/cap-app-proxy newName: quay.io/codefresh/cap-app-proxy - newTag: 1.2016.2 + newTag: 1.2033.0 resources: - app-proxy.deploy.yaml - app-proxy.svc.yaml From 05d750f70cfaa732641eb7a9a129e0701435b574 Mon Sep 17 00:00:00 2001 From: ilia-medvedev-codefresh Date: Thu, 5 Jan 2023 11:21:54 +0200 Subject: [PATCH 19/19] update tunnel client --- csdp/hybrid/basic/runtime.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csdp/hybrid/basic/runtime.yaml b/csdp/hybrid/basic/runtime.yaml index 459d4aa7..0b9c8592 100644 --- a/csdp/hybrid/basic/runtime.yaml +++ b/csdp/hybrid/basic/runtime.yaml @@ -31,5 +31,5 @@ spec: url: github.com/codefresh-io/csdp-official/csdp/hybrid/basic/apps/sealed-secrets - name: codefresh-tunnel-client type: helm - url: github.com/codefresh-io/codefresh-tunnel-charts/codefresh-tunnel-client?ref=0.1.8 + url: github.com/codefresh-io/codefresh-tunnel-charts/codefresh-tunnel-client?ref=0.1.11 feature: ingressless