Upgrade argocd,sealed secrets,app-proxy and switch to appVersion (#22)

* upgrade argocd,sealed secrets,app-proxy and switch to appVersion

Co-authored-by: danielm-codefresh <daniel.maizel@codefresh.io>

Author: ilia-medvedev-codefresh

charts/gitops-runtime/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: v0.0.1
+appVersion: 0.1.27-helm-alpha
 description: A Helm chart for Codefresh gitops runtime
 name: gitops-runtime
-version: 0.2.0-alpha-12
+version: 0.2.0-alpha-14
 home: https://github.com/codefresh-io/gitops-runtime-helm
 keywords:
   - codefresh
@@ -13,7 +13,7 @@ maintainers:
 dependencies:
 - name: argo-cd
   repository: https://codefresh-io.github.io/argo-helm
-  version: 5.16.0-2-cap-CR-16950
+  version: 5.27.1-1-cap-CR-17237
 - name: argo-events
   repository: https://codefresh-io.github.io/argo-helm
   version: 2.0.5-1-cf-init
@@ -27,7 +27,7 @@ dependencies:
   condition: argo-rollouts.enabled
 - name: sealed-secrets
   repository: https://bitnami-labs.github.io/sealed-secrets/
-  version: 2.1.6
+  version: 2.7.3
 - name: codefresh-tunnel-client
   repository: https://chartmuseum.codefresh.io/codefresh-tunnel-client
   version: "0.1.12"

charts/gitops-runtime/README.md

@@ -1,6 +1,6 @@
 # gitops-runtime
 
-![Version: 0.2.0-alpha-12](https://img.shields.io/badge/Version-0.2.0--alpha--12-informational?style=flat-square) ![AppVersion: v0.0.1](https://img.shields.io/badge/AppVersion-v0.0.1-informational?style=flat-square)
+![Version: 0.2.0-alpha-14](https://img.shields.io/badge/Version-0.2.0--alpha--14-informational?style=flat-square) ![AppVersion: 0.1.27-helm-alpha](https://img.shields.io/badge/AppVersion-0.1.27--helm--alpha-informational?style=flat-square)
 
 A Helm chart for Codefresh gitops runtime
 
@@ -16,9 +16,9 @@ A Helm chart for Codefresh gitops runtime
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://bitnami-labs.github.io/sealed-secrets/ | sealed-secrets | 2.1.6 |
+| https://bitnami-labs.github.io/sealed-secrets/ | sealed-secrets | 2.7.3 |
 | https://chartmuseum.codefresh.io/codefresh-tunnel-client | tunnel-client(codefresh-tunnel-client) | 0.1.12 |
-| https://codefresh-io.github.io/argo-helm | argo-cd | 5.16.0-2-cap-CR-16950 |
+| https://codefresh-io.github.io/argo-helm | argo-cd | 5.27.1-1-cap-CR-17237 |
 | https://codefresh-io.github.io/argo-helm | argo-events | 2.0.5-1-cf-init |
 | https://codefresh-io.github.io/argo-helm | argo-rollouts | 2.22.1-1-cap-sw |
 | https://codefresh-io.github.io/argo-helm | argo-workflows | 0.22.8-1-cf-init |
@@ -28,8 +28,10 @@ A Helm chart for Codefresh gitops runtime
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | app-proxy.affinity | object | `{}` |  |
-| app-proxy.config.argoCdUsername | string | `"admin"` |  |
+| app-proxy.config.argoCdUrl | string | `nil` | ArgoCD Url. determined by chart logic. Do not change unless you are certain you need to |
+| app-proxy.config.argoCdUsername | string | `"admin"` | ArgoCD user to be used by app-proxy |
 | app-proxy.config.argoWorkflowsInsecure | string | `"true"` |  |
+| app-proxy.config.argoWorkflowsUrl | string | `nil` | Workflows server url. Determined by chart logic. Do not change unless you are certain you need to |
 | app-proxy.config.env | string | `"production"` |  |
 | app-proxy.config.logLevel | string | `"info"` | Log Level |
 | app-proxy.config.skipGitPermissionValidation | string | `"false"` | Skit git permissions validation |
@@ -50,13 +52,13 @@ A Helm chart for Codefresh gitops runtime
 | app-proxy.image-enrichment.serviceAccount.name | string | `"codefresh-image-enrichment-sa"` | Name of the service account to create or the name of the existing one to use |
 | app-proxy.image.pullPolicy | string | `"IfNotPresent"` |  |
 | app-proxy.image.repository | string | `"quay.io/codefresh/cap-app-proxy"` |  |
-| app-proxy.image.tag | string | `"CR-17702-fix-runtime-name-crash"` |  |
+| app-proxy.image.tag | string | `"1.2170.0"` |  |
 | app-proxy.imagePullSecrets | list | `[]` |  |
 | app-proxy.initContainer.command[0] | string | `"./init.sh"` |  |
 | app-proxy.initContainer.env | object | `{}` |  |
 | app-proxy.initContainer.image.pullPolicy | string | `"IfNotPresent"` |  |
 | app-proxy.initContainer.image.repository | string | `"quay.io/codefresh/cap-app-proxy-init"` |  |
-| app-proxy.initContainer.image.tag | string | `"CR-17702-fix-runtime-name-crash"` |  |
+| app-proxy.initContainer.image.tag | string | `"1.2170.0"` |  |
 | app-proxy.initContainer.resources.limits.cpu | string | `"1"` |  |
 | app-proxy.initContainer.resources.limits.memory | string | `"512Mi"` |  |
 | app-proxy.initContainer.resources.requests.cpu | string | `"0.2"` |  |
@@ -172,7 +174,7 @@ A Helm chart for Codefresh gitops runtime
 | internal-router.serviceAccount.create | bool | `true` |  |
 | internal-router.serviceAccount.name | string | `""` |  |
 | internal-router.tolerations | list | `[]` |  |
-| sealed-secrets | object | `{"fullnameOverride":"sealed-secrets-controller","image":{"registry":"quay.io","repository":"codefresh/sealed-secrets-controller","tag":"v0.17.5"},"keyrenewperiod":"720h","resources":{"limits":{"cpu":"500m","memory":"1Gi"},"requests":{"cpu":"200m","memory":"512Mi"}}}` | --------------------------------------------------------------------------------------------------------------------- |
+| sealed-secrets | object | `{"fullnameOverride":"sealed-secrets-controller","image":{"registry":"quay.io","repository":"codefresh/sealed-secrets-controller","tag":"v0.19.4"},"keyrenewperiod":"720h","resources":{"limits":{"cpu":"500m","memory":"1Gi"},"requests":{"cpu":"200m","memory":"512Mi"}}}` | --------------------------------------------------------------------------------------------------------------------- |
 | tunnel-client | object | `{"libraryMode":true,"tunnelServer":{"host":"register-tunnels.cf-cd.com","subdomainHost":"tunnels.cf-cd.com"}}` | Tunnel based runtime. Only relevant when runtime.ingress.enabled = false |
 | tunnel-client.libraryMode | bool | `true` | Do not change this value! Breaks chart logic |
 

charts/gitops-runtime/templates/_helpers.tpl

@@ -200,18 +200,18 @@ Output comma separated list of installed runtime components
   {{- $argoCD := dict "name" "argocd" "version" (get .Subcharts "argo-cd").Chart.AppVersion }}
   {{- $argoEvents := dict "name" "argo-events" "version" (get .Subcharts "argo-events").Chart.AppVersion }}
   {{- $sealedSecrets := dict "name" "sealed-secrets" "version" (get .Subcharts "sealed-secrets").Chart.AppVersion }}
-  {{- $internalRouter := dict "name" "internal-router" "version" .Chart.Version }}
-  {{- $eventsReporter := dict "name" "events-reporter" "version" .Chart.Version }}
+  {{- $internalRouter := dict "name" "internal-router" "version" .Chart.AppVersion }}
+  {{- $eventsReporter := dict "name" "events-reporter" "version" .Chart.AppVersion }}
   {{- $appProxy := dict "name" "app-proxy" "version" (index (get .Values "app-proxy") "image" "tag") }}
   {{- $comptList := list $argoCD $argoEvents $appProxy $eventsReporter $sealedSecrets $internalRouter}}
   {{- if index (get .Values "argo-rollouts") "enabled" }}
-    {{- $rolloutReporter := dict "name" "rollout-reporter" "version" .Chart.Version }}
+    {{- $rolloutReporter := dict "name" "rollout-reporter" "version" .Chart.AppVersion }}
     {{- $argoRollouts := dict "name" "argo-rollouts" "version" (get .Subcharts "argo-rollouts").Chart.AppVersion }}
     {{- $comptList = append $comptList $argoRollouts }}
     {{- $comptList = append $comptList $rolloutReporter }}
   {{- end }}
   {{- if index (get .Values "argo-workflows") "enabled" }}
-    {{- $workflowReporter := dict "name" "workflow-reporter" "version" .Chart.Version }}
+    {{- $workflowReporter := dict "name" "workflow-reporter" "version" .Chart.AppVersion }}
     {{- $argoWorkflows := dict "name" "argo-workflows" "version" (get .Subcharts "argo-workflows").Chart.AppVersion }}
     {{- $comptList = append $comptList $workflowReporter}}
     {{- $comptList = append $comptList $argoWorkflows }}

charts/gitops-runtime/templates/app-proxy/config.yaml

@@ -3,9 +3,13 @@
 {{ $appProxyContext := deepCopy . }}
 {{ $_ := set $appProxyContext "Values" (get .Values "app-proxy") }}
 {{ $_ := set $appProxyContext.Values "global" (get .Values "global") }}
-{{ $_ := set $appProxyContext.Values.config "argoCdUrl" $argoCdUrl }}
+{{- if not $appProxyContext.Values.config.argoCdUrl }}
+  {{ $_ := set $appProxyContext.Values.config "argoCdUrl" $argoCdUrl }}
+{{- end }}
 {{- if index (get .Values "argo-workflows") "enabled" }}
-  {{- $argoWorkflowsUrl := include "codefresh-gitops-runtime.argo-workflows.server.url" . }}
-  {{- $_ := set $appProxyContext.Values.config "argoWorkflowsUrl" $argoWorkflowsUrl }}
+  {{- if not $appProxyContext.Values.config.argoWorkflowsUrl }}
+    {{- $argoWorkflowsUrl := include "codefresh-gitops-runtime.argo-workflows.server.url" . }}
+    {{- $_ := set $appProxyContext.Values.config "argoWorkflowsUrl" $argoWorkflowsUrl }}
+  {{- end }}
 {{- end}}
 {{- include "cap-app-proxy.resources.configmap" $appProxyContext }}

charts/gitops-runtime/templates/codefresh-cm.yaml

@@ -6,12 +6,12 @@ metadata:
     {{- include "codefresh-gitops-runtime.labels" . | nindent 4 }}
 data:
   base-url: {{ .Values.global.codefresh.url }}
-  bootstrapRevision: {{ .Chart.Version }}
+  bootstrapRevision: {{ .Chart.AppVersion }}
   helmReleaseName: {{ .Release.Name }}
   cluster: {{ .Values.global.runtime.cluster }}
   components: |-
     {{- include "codefresh-gitops-runtime.component-list" . | nindent 4}}
   ingressClassName: {{ .Values.global.runtime.ingress.className | default "" | quote }}
   ingressController: {{ .Values.global.runtime.ingress.className | default "" | quote }}
   ingressHost: {{ include "codefresh-gitops-runtime.ingress-url" . }}
-  version: {{ .Chart.Version }}
+  version: {{ .Chart.AppVersion }}

charts/gitops-runtime/templates/enforce-runtime-name.yaml

@@ -15,6 +15,20 @@ tests:
       content:
         name: PORT
         value: 8787
+- it: overriding of argoCD and workflows Url through values
+  template: 'app-proxy/config.yaml'
+  values:
+  - ./values/mandatory-values.yaml
+  set:
+    app-proxy.config.argoCdUrl: 'https://test-argocd'
+    app-proxy.config.argoWorkflowsUrl: 'https://test-workflows'
+  asserts:
+  - equal:
+      path: data.argoCdUrl
+      value: https://test-argocd
+  - equal:
+      path: data.argoWorkflowsUrl
+      value: https://test-workflows
 - it: setting security context on main container
   template: 'app-proxy/deployment.yaml'
   values:

charts/gitops-runtime/tests/app-proxy-misc_test.yaml

@@ -88,7 +88,7 @@ sealed-secrets:
   image:
     registry: 'quay.io'
     repository: 'codefresh/sealed-secrets-controller'
-    tag: 'v0.17.5'
+    tag: 'v0.19.4'
   resources:
     limits:
       cpu: 500m
@@ -280,14 +280,14 @@ app-proxy:
   image:
     repository: quay.io/codefresh/cap-app-proxy
     # Overrides the image tag whose default is the chart appVersion.
-    tag: CR-17702-fix-runtime-name-crash
+    tag: 1.2170.0
     pullPolicy: IfNotPresent
 
   initContainer:
     image:
       repository: quay.io/codefresh/cap-app-proxy-init
       # Overrides the image tag whose default is the chart appVersion.
-      tag: CR-17702-fix-runtime-name-crash
+      tag: 1.2170.0
       pullPolicy: IfNotPresent
     command:
       - ./init.sh
@@ -307,7 +307,12 @@ app-proxy:
   fullnameOverride: "cap-app-proxy"
 
   config:
+    # -- ArgoCD user to be used by app-proxy
     argoCdUsername: "admin"
+    # -- ArgoCD Url. determined by chart logic. Do not change unless you are certain you need to
+    argoCdUrl:
+    # -- Workflows server url. Determined by chart logic. Do not change unless you are certain you need to
+    argoWorkflowsUrl:
     argoWorkflowsInsecure: "true"
     env: "production"
     # -- Skit git permissions validation