From 87d249c461b97af847d5265a4236083b3be62aab Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Sun, 18 May 2025 16:47:30 +0300 Subject: [PATCH 1/9] feat: update codefresh-gitops-operator to 0.7.8 - improve task handling efficiency --- charts/gitops-runtime/Chart.yaml | 2 +- charts/gitops-runtime/values.yaml | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/charts/gitops-runtime/Chart.yaml b/charts/gitops-runtime/Chart.yaml index 701ff86e..82ef5115 100644 --- a/charts/gitops-runtime/Chart.yaml +++ b/charts/gitops-runtime/Chart.yaml @@ -39,7 +39,7 @@ dependencies: condition: tunnel-client.enabled - name: codefresh-gitops-operator repository: oci://quay.io/codefresh/charts - version: 0.7.8 + version: 0.7.9 alias: gitops-operator condition: gitops-operator.enabled - name: garage diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index a6ae7fd0..3e90e864 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -674,9 +674,21 @@ gitops-operator: # -- Additional labels for gitops operator CRDs additionalLabels: {} - env: { - TASK_PULLING_INTERVAL: 10s - } + config: + # -- Task polling interval + taskPollingInterval: 10s + # -- Commit status polling interval + commitStatusPollingInterval: 10s + # -- Workflow monitor polling interval + workflowMonitorPollingInterval: 10s + # -- Maximum number of concurrent releases being processed by the operator (this will not affect the number of releases being processed by the gitops runtime) + maxConcurrentReleases: 100 + # -- An optional template for the promotion wrapper (empty default will use the embedded one) + promotionWrapperTemplate: '' + + env: + GITOPS_OPERATOR_VERSION: 0.7.7 + image: {} # -- defaults # repository: quay.io/codefresh/codefresh-gitops-operator From a4866e08ebe07f8a610eacddfbd906712c5315f7 Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Sun, 18 May 2025 17:19:34 +0300 Subject: [PATCH 2/9] feat: update gitops-operator image tag for improved efficiency --- charts/gitops-runtime/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index 3e90e864..4b6f6615 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -689,10 +689,10 @@ gitops-operator: env: GITOPS_OPERATOR_VERSION: 0.7.7 - image: {} + image: # -- defaults # repository: quay.io/codefresh/codefresh-gitops-operator - # tag: 'v{{ .Chart.AppVersion }}' + tag: cr-28267-improve-efficiency-700fa36 serviceAccount: create: true From 6ea54122eb4a830f54966f660693bfcf36b91bb8 Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Mon, 19 May 2025 15:10:23 +0300 Subject: [PATCH 3/9] feat: add http-metrics port to cap-app-proxy service for monitoring --- .../templates/_components/cap-app-proxy/_service.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/gitops-runtime/templates/_components/cap-app-proxy/_service.yaml b/charts/gitops-runtime/templates/_components/cap-app-proxy/_service.yaml index 63da1d24..f29ccda4 100644 --- a/charts/gitops-runtime/templates/_components/cap-app-proxy/_service.yaml +++ b/charts/gitops-runtime/templates/_components/cap-app-proxy/_service.yaml @@ -12,6 +12,10 @@ spec: targetPort: http protocol: TCP name: http + - port: 9100 + targetPort: http + protocol: TCP + name: http-metrics selector: {{- include "cap-app-proxy.selectorLabels" . | nindent 4 }} {{- end }} \ No newline at end of file From 4cf979b323892e350e701ee59a0d6bdfe2bc335e Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Mon, 19 May 2025 16:03:46 +0300 Subject: [PATCH 4/9] added missing port to deployment --- .../templates/_components/cap-app-proxy/_deployment.yaml | 2 ++ .../templates/_components/cap-app-proxy/_service.yaml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/gitops-runtime/templates/_components/cap-app-proxy/_deployment.yaml b/charts/gitops-runtime/templates/_components/cap-app-proxy/_deployment.yaml index 617ac91a..6437c6c0 100644 --- a/charts/gitops-runtime/templates/_components/cap-app-proxy/_deployment.yaml +++ b/charts/gitops-runtime/templates/_components/cap-app-proxy/_deployment.yaml @@ -57,6 +57,8 @@ spec: ports: - name: http containerPort: 8080 + - name: http-metrics + containerPort: 9100 readinessProbe: initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.readinessProbe.periodSeconds }} diff --git a/charts/gitops-runtime/templates/_components/cap-app-proxy/_service.yaml b/charts/gitops-runtime/templates/_components/cap-app-proxy/_service.yaml index f29ccda4..151c90f9 100644 --- a/charts/gitops-runtime/templates/_components/cap-app-proxy/_service.yaml +++ b/charts/gitops-runtime/templates/_components/cap-app-proxy/_service.yaml @@ -13,9 +13,9 @@ spec: protocol: TCP name: http - port: 9100 - targetPort: http + targetPort: http-metrics protocol: TCP name: http-metrics selector: {{- include "cap-app-proxy.selectorLabels" . | nindent 4 }} -{{- end }} \ No newline at end of file +{{- end }} From 161bda321cb44f98b62a9926e4e061fd2f333173 Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Tue, 20 May 2025 14:14:56 +0300 Subject: [PATCH 5/9] use released gitops-operator chart and image --- charts/gitops-runtime/values.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index 4b6f6615..eb20acbd 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -686,13 +686,10 @@ gitops-operator: # -- An optional template for the promotion wrapper (empty default will use the embedded one) promotionWrapperTemplate: '' - env: - GITOPS_OPERATOR_VERSION: 0.7.7 - image: # -- defaults # repository: quay.io/codefresh/codefresh-gitops-operator - tag: cr-28267-improve-efficiency-700fa36 + tag: 'v{{ .Chart.AppVersion }}' serviceAccount: create: true From 60aeef521549389b8aeb90092c9aa1c45f939857 Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Tue, 20 May 2025 15:36:01 +0300 Subject: [PATCH 6/9] bump From d83e94bba8165e0170842bd2d33e8fece96b724e Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Tue, 20 May 2025 22:13:48 +0300 Subject: [PATCH 7/9] fixed values --- charts/gitops-runtime/values.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index eb20acbd..6af30479 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -487,6 +487,7 @@ tunnel-client: nodeSelector: {} tolerations: [] affinity: {} + #----------------------------------------------------------------------------------------------------------------------- # app-proxy #----------------------------------------------------------------------------------------------------------------------- @@ -686,10 +687,10 @@ gitops-operator: # -- An optional template for the promotion wrapper (empty default will use the embedded one) promotionWrapperTemplate: '' - image: + image: {} # -- defaults # repository: quay.io/codefresh/codefresh-gitops-operator - tag: 'v{{ .Chart.AppVersion }}' + # tag: 'v{{ .Chart.AppVersion }}' serviceAccount: create: true @@ -712,6 +713,7 @@ gitops-operator: requests: cpu: 100m memory: 128Mi + #----------------------------------------------------------------------------------------------------------------------- # Garage #----------------------------------------------------------------------------------------------------------------------- From de69bf78ca55b2e0a756db981c62c264692c5021 Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Wed, 21 May 2025 08:35:38 +0300 Subject: [PATCH 8/9] Revert "added missing port to deployment" This reverts commit d7d3a51012d01790526ef1d79240e29a9caa5189. --- .../templates/_components/cap-app-proxy/_deployment.yaml | 2 -- .../templates/_components/cap-app-proxy/_service.yaml | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/charts/gitops-runtime/templates/_components/cap-app-proxy/_deployment.yaml b/charts/gitops-runtime/templates/_components/cap-app-proxy/_deployment.yaml index 6437c6c0..617ac91a 100644 --- a/charts/gitops-runtime/templates/_components/cap-app-proxy/_deployment.yaml +++ b/charts/gitops-runtime/templates/_components/cap-app-proxy/_deployment.yaml @@ -57,8 +57,6 @@ spec: ports: - name: http containerPort: 8080 - - name: http-metrics - containerPort: 9100 readinessProbe: initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.readinessProbe.periodSeconds }} diff --git a/charts/gitops-runtime/templates/_components/cap-app-proxy/_service.yaml b/charts/gitops-runtime/templates/_components/cap-app-proxy/_service.yaml index 151c90f9..f29ccda4 100644 --- a/charts/gitops-runtime/templates/_components/cap-app-proxy/_service.yaml +++ b/charts/gitops-runtime/templates/_components/cap-app-proxy/_service.yaml @@ -13,9 +13,9 @@ spec: protocol: TCP name: http - port: 9100 - targetPort: http-metrics + targetPort: http protocol: TCP name: http-metrics selector: {{- include "cap-app-proxy.selectorLabels" . | nindent 4 }} -{{- end }} +{{- end }} \ No newline at end of file From fc8d4a986686d21503147eb43d37cb282296a07e Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Wed, 21 May 2025 08:35:43 +0300 Subject: [PATCH 9/9] Revert "feat: add http-metrics port to cap-app-proxy service for monitoring" This reverts commit b5be302fb7edf06b30f32d0d38b4adde30e5effa. --- .../templates/_components/cap-app-proxy/_service.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/charts/gitops-runtime/templates/_components/cap-app-proxy/_service.yaml b/charts/gitops-runtime/templates/_components/cap-app-proxy/_service.yaml index f29ccda4..63da1d24 100644 --- a/charts/gitops-runtime/templates/_components/cap-app-proxy/_service.yaml +++ b/charts/gitops-runtime/templates/_components/cap-app-proxy/_service.yaml @@ -12,10 +12,6 @@ spec: targetPort: http protocol: TCP name: http - - port: 9100 - targetPort: http - protocol: TCP - name: http-metrics selector: {{- include "cap-app-proxy.selectorLabels" . | nindent 4 }} {{- end }} \ No newline at end of file