From 159ac0566e76fa59a09a0f2ba78667c5fe77479e Mon Sep 17 00:00:00 2001
From: Kanika Rana <krana@redhat.com>
Date: Tue, 13 Oct 2026 09:53:57 -0400
Subject: [PATCH 1/2] update gitops-backend 1.20

Signed-off-by: Kanika Rana <krana@redhat.com>
---
 .idea/.gitignore                             |  8 ++++++
 .idea/inspectionProfiles/Project_Default.xml |  6 +++++
 .idea/modules.xml                            |  8 ++++++
 .idea/rh-gitops-midstream-release.iml        | 10 ++++++++
 .idea/vcs.xml                                | 26 ++++++++++++++++++++
 config.yaml                                  |  2 +-
 containers/gitops/Dockerfile                 |  2 +-
 sources/gitops-backend                       |  2 +-
 8 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/inspectionProfiles/Project_Default.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/rh-gitops-midstream-release.iml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 000000000..13566b81b
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 000000000..ca3c807fa
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="GoLinter" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 000000000..c762a6f99
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/rh-gitops-midstream-release.iml" filepath="$PROJECT_DIR$/.idea/rh-gitops-midstream-release.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/rh-gitops-midstream-release.iml b/.idea/rh-gitops-midstream-release.iml
new file mode 100644
index 000000000..9c408ccfb
--- /dev/null
+++ b/.idea/rh-gitops-midstream-release.iml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="Go" enabled="true" />
+  <component name="GoModuleSettings" enabled="true" />
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 000000000..4327d7d76
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/sources/argo-cd" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/sources/argo-rollouts" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/sources/argocd-agent" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/sources/argocd-extension-installer" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/sources/argocd-image-updater" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/sources/dex" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/sources/git-lfs" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/sources/gitops-backend" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/sources/gitops-console-plugin" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/sources/gitops-must-gather" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/sources/gitops-operator" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/sources/helm" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/sources/kustomize" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/sources/kustomize/site/themes/docsy" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/sources/kustomize/site/themes/docsy/assets/vendor/Font-Awesome" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/sources/kustomize/site/themes/docsy/assets/vendor/bootstrap" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/sources/rollout-extension" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/sources/rollouts-plugin-trafficrouter-openshift" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/sources/ssh-connect" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/sources/tini" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/config.yaml b/config.yaml
index 82bb88684..088be21b3 100644
--- a/config.yaml
+++ b/config.yaml
@@ -80,7 +80,7 @@ sources:
   - path: sources/gitops-backend
     url: https://github.com/redhat-developer/gitops-backend.git
     ref: master
-    commit: 2c16e0c8eaa6923ac35d9256a36f13349e10d339
+    commit: f91b189b909df1bc247607cf3d289b79b5e13943
     auto-update: false
   - path: sources/rollouts-plugin-trafficrouter-openshift
     url: https://github.com/argoproj-labs/rollouts-plugin-trafficrouter-openshift.git
diff --git a/containers/gitops/Dockerfile b/containers/gitops/Dockerfile
index 9b697d03f..81b9ba565 100644
--- a/containers/gitops/Dockerfile
+++ b/containers/gitops/Dockerfile
@@ -1,5 +1,5 @@
 # Build Stage
-FROM  registry.redhat.io/rhel9/go-toolset:1.25 AS builder
+FROM  registry.redhat.io/rhel9/go-toolset:1.26 AS builder
 USER root
 
 COPY sources/gitops-backend /workspace
diff --git a/sources/gitops-backend b/sources/gitops-backend
index 2c16e0c8e..f91b189b9 160000
--- a/sources/gitops-backend
+++ b/sources/gitops-backend
@@ -1 +1 @@
-Subproject commit 2c16e0c8eaa6923ac35d9256a36f13349e10d339
+Subproject commit f91b189b909df1bc247607cf3d289b79b5e13943

From be72d1ecdaf41749d90574e45588cf8927e55005 Mon Sep 17 00:00:00 2001
From: Kanika Rana <krana@redhat.com>
Date: Tue, 13 Oct 2026 10:01:34 -0400
Subject: [PATCH 2/2] remove .idea file, add to gitignore

Signed-off-by: Kanika Rana <krana@redhat.com>
---
 .gitignore                                   |  1 +
 .idea/.gitignore                             |  8 ------
 .idea/inspectionProfiles/Project_Default.xml |  6 -----
 .idea/modules.xml                            |  8 ------
 .idea/rh-gitops-midstream-release.iml        | 10 --------
 .idea/vcs.xml                                | 26 --------------------
 6 files changed, 1 insertion(+), 58 deletions(-)
 delete mode 100644 .idea/.gitignore
 delete mode 100644 .idea/inspectionProfiles/Project_Default.xml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/rh-gitops-midstream-release.iml
 delete mode 100644 .idea/vcs.xml

diff --git a/.gitignore b/.gitignore
index af8666572..550e30462 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ bin/
 catalog/
 dist/
 .claude/*
+.idea
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 13566b81b..000000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index ca3c807fa..000000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="GoLinter" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index c762a6f99..000000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/rh-gitops-midstream-release.iml" filepath="$PROJECT_DIR$/.idea/rh-gitops-midstream-release.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/rh-gitops-midstream-release.iml b/.idea/rh-gitops-midstream-release.iml
deleted file mode 100644
index 9c408ccfb..000000000
--- a/.idea/rh-gitops-midstream-release.iml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="Go" enabled="true" />
-  <component name="GoModuleSettings" enabled="true" />
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 4327d7d76..000000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/sources/argo-cd" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/sources/argo-rollouts" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/sources/argocd-agent" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/sources/argocd-extension-installer" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/sources/argocd-image-updater" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/sources/dex" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/sources/git-lfs" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/sources/gitops-backend" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/sources/gitops-console-plugin" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/sources/gitops-must-gather" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/sources/gitops-operator" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/sources/helm" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/sources/kustomize" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/sources/kustomize/site/themes/docsy" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/sources/kustomize/site/themes/docsy/assets/vendor/Font-Awesome" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/sources/kustomize/site/themes/docsy/assets/vendor/bootstrap" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/sources/rollout-extension" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/sources/rollouts-plugin-trafficrouter-openshift" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/sources/ssh-connect" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/sources/tini" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file