From b9109abaa1c7add509561dff7e908dccaff0f331 Mon Sep 17 00:00:00 2001
From: "codefresh-v2-pipelines[bot]"
 <109073600+codefresh-v2-pipelines[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2026 07:52:17 +0000
Subject: [PATCH 1/3] [gitops-operator]chore: Apply CVE fixes on new main (tip
 of stable/0.26)

---
 charts/gitops-runtime/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml
index c24ea892..1f1dbc1a 100644
--- a/charts/gitops-runtime/values.yaml
+++ b/charts/gitops-runtime/values.yaml
@@ -647,7 +647,7 @@ gitops-operator:
   image:
     registry: quay.io
     repository: codefresh/codefresh-gitops-operator
-    tag: b9540c4
+    tag: bc5c4eb
   env:
     !!merge <<:
       - *otel-config

From 347ad020dfa76c6b01b579ce2fdf8297d2d92572 Mon Sep 17 00:00:00 2001
From: scme0 <scott.merchant@octopus.com>
Date: Mon, 13 Apr 2026 10:24:34 +0200
Subject: [PATCH 2/3] re-enable component test

---
 .github/workflows/component-test.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/component-test.yaml b/.github/workflows/component-test.yaml
index 7a9a134a..2b97bfeb 100644
--- a/.github/workflows/component-test.yaml
+++ b/.github/workflows/component-test.yaml
@@ -15,7 +15,6 @@ on:
 
 jobs:
   component-test:
-    if : false # temporarily disable component tests
     runs-on: ubuntu-latest
 
     env:

From 1feca0b8331490a310e23631ee68fcc204bc505b Mon Sep 17 00:00:00 2001
From: scme0 <scott.merchant@octopus.com>
Date: Mon, 13 Apr 2026 10:24:46 +0200
Subject: [PATCH 3/3] update restrictedgitsources crd

---
 .../crds/restrictedgitsources.yaml            | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/charts/gitops-runtime/templates/_components/gitops-operator/crds/restrictedgitsources.yaml b/charts/gitops-runtime/templates/_components/gitops-operator/crds/restrictedgitsources.yaml
index 395e0952..bb0c5f59 100644
--- a/charts/gitops-runtime/templates/_components/gitops-operator/crds/restrictedgitsources.yaml
+++ b/charts/gitops-runtime/templates/_components/gitops-operator/crds/restrictedgitsources.yaml
@@ -286,6 +286,14 @@ spec:
                         description: SkipCrds skips custom resource definition installation
                           step (Helm's --skip-crds)
                         type: boolean
+                      skipSchemaValidation:
+                        description: SkipSchemaValidation skips JSON schema validation
+                          (Helm's --skip-schema-validation)
+                        type: boolean
+                      skipTests:
+                        description: SkipTests skips test manifest installation step
+                          (Helm's --skip-tests).
+                        type: boolean
                       valueFiles:
                         description: ValuesFiles is a list of Helm value files to
                           use when generating a template
@@ -348,6 +356,11 @@ spec:
                         description: ForceCommonLabels specifies whether to force
                           applying common labels to resources for Kustomize apps
                         type: boolean
+                      ignoreMissingComponents:
+                        description: IgnoreMissingComponents prevents kustomize from
+                          failing when components do not exist locally by not appending
+                          them to kustomization file
+                        type: boolean
                       images:
                         description: Images is a list of Kustomize image override
                           specifications
@@ -361,6 +374,10 @@ spec:
                           KubeVersion specifies the Kubernetes API version to pass to Helm when templating manifests. By default, Argo CD
                           uses the Kubernetes version of the target cluster.
                         type: string
+                      labelIncludeTemplates:
+                        description: LabelIncludeTemplates specifies whether to apply
+                          common labels to resource templates or not
+                        type: boolean
                       labelWithoutSelector:
                         description: LabelWithoutSelector specifies whether to apply
                           common labels to resource selectors or not
@@ -432,6 +449,10 @@ spec:
                           use for rendering manifests
                         type: string
                     type: object
+                  name:
+                    description: Name is used to refer to a source and is displayed
+                      in the UI. It is used in multi-source Applications.
+                    type: string
                   path:
                     description: Path is a directory path within the Git repository,
                       and is only valid for applications sourced from Git.
@@ -519,6 +540,10 @@ spec:
                         description: 'AllowEmpty allows apps have zero live resources
                           (default: false)'
                         type: boolean
+                      enabled:
+                        description: Enable allows apps to explicitly control automated
+                          sync
+                        type: boolean
                       prune:
                         description: 'Prune specifies whether to delete resources
                           from the cluster that are not found in the sources anymore
@@ -570,6 +595,10 @@ spec:
                           a failed sync. If set to 0, no retries will be performed.
                         format: int64
                         type: integer
+                      refresh:
+                        description: 'Refresh indicates if the latest revision should
+                          be used on retry instead of the initial one (default: false)'
+                        type: boolean
                     type: object
                   syncOptions:
                     description: Options allow you to specify whole app sync-options