From a605f2e2c55af8e41f796c4e57b3b0351cb20b53 Mon Sep 17 00:00:00 2001 From: Daniel Maizel Date: Wed, 11 Jan 2023 12:34:35 +0200 Subject: [PATCH] Release 0.1.19 (#159) * [BE]:Up version (#126) * Up version * Up version * Up proxy version * Wip * Back version * Wip * add applications to app-proxy rbac (#124) * add applications to app-proxy rbac * bump * remove version bump * CR-15471-insecure-git-providers (#130) * add initContainer to app-proxy * move hosted to 2.4 (#129) Co-authored-by: Daniel Maizel * bumped app-proxy to 1.1982.0 (#132) * 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 * bump app-proxy to 1.1991.1 (#138) * bump app-proxy to 1.1991.1 * CR-14423 (#136) app proxy update * 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 * update app-proxy (#141) * update app-proxy * hybrid test * Revert "hybrid test" This reverts commit e656ba816328066caf1691399e45a828246391c8. * fix appProtocol for argocd-server to support Istio (#140) * 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 * 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 * 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 * CR-15900-argo-cd-version-update (#149) argo-cd version update with rollback query * Revert "upgrade argo-workflows to 3.4 (#144)" This reverts commit ce2330bda66d12c2a0deb2c795865cc30af7c82c. * upgrade argo-rollouts to 1.4.0 (#152) * bump app-proxy (#155) * Argo workflow 3.4 upgrade (#157) * Revert "Revert "upgrade argo-workflows to 3.4 (#144)"" * add namespace override for argo-workflows Co-authored-by: danielm-codefresh * automatically merge release branch to main to avoid version drift (#158) * automatically merge release branch to main * add component version to release notes * testing release 0.1.19 * remove pre-release postfix Co-authored-by: Philipp Plotnikov Co-authored-by: Noam Gal Co-authored-by: pasha-codefresh Co-authored-by: Oleksandr Saulyak Co-authored-by: Andrii Shaforostov Co-authored-by: Denis Melnik --- .github/workflows/release.yaml | 13 +++++ VERSION | 2 +- .../codefresh-base/kustomization.yaml | 57 +++++++------------ .../bootstrap/kustomization.yaml | 4 +- csdp/hybrid/basic/runtime.yaml | 2 +- docs/releases/release_notes.md | 6 ++ 6 files changed, 44 insertions(+), 40 deletions(-) create mode 100644 docs/releases/release_notes.md diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 884f9de8..b4334e7a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -24,6 +24,7 @@ jobs: token: ${{ secrets.RELEASE_TOKEN }} tag: ${{ env.NEW_TAG }} name: "runtime-v${{ env.NEW_TAG }}" + bodyFile: "docs/releases/release_notes.md" advance-latest-tag: runs-on: ubuntu-latest @@ -72,3 +73,15 @@ jobs: ref: "refs/tags/stable", sha: context.sha }) + + sync-main-branch: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + + - name: Merge release branch -> main + uses: devmasx/merge-branch@master + with: + type: now + target_branch: main + github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/VERSION b/VERSION index f8bc4c62..d8a023ec 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.18 +0.1.19 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..ac15e3c1 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,10 @@ apiVersion: kustomize.config.k8s.io/v1alpha1 kind: Component +namespace: default 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-cap-CR-15902/install.yaml +patches: - target: group: apps version: v1 @@ -22,29 +14,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" diff --git a/csdp/base_components/bootstrap/kustomization.yaml b/csdp/base_components/bootstrap/kustomization.yaml index d4d1ea39..8603af20 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.18 # Runtime version - - bootstrapRevision=0.1.18 # Tag to use for bootstrap (change this to the name of your branch if you want to test changes) + - version=0.1.19 # Runtime version + - bootstrapRevision=0.1.19 # 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 63ad990d..5d82d352 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.18 + version: 0.1.19 bootstrapSpecifier: github.com/codefresh-io/csdp-official/csdp/hybrid/basic/apps/argo-cd components: - name: events diff --git a/docs/releases/release_notes.md b/docs/releases/release_notes.md new file mode 100644 index 00000000..b965455b --- /dev/null +++ b/docs/releases/release_notes.md @@ -0,0 +1,6 @@ +Installed Components: +Argo CD v2.4.0 +Argo Events v1.7.2 +Argo Rollouts v1.4.0 +Argo Workflows v3.4.4 +Sealed Secrets 0.17.5