Bump version to 2.7.11 (#14933 )

Signed-off-by: GitHub <noreply@github.com> Co-authored-by: crenshaw-dev <crenshaw-dev@users.noreply.github.com>
docs: add ignoreDifferences name and namespace fields (#14741 ) (#14806 )
2026-03-31 22:08:49 +02:00 · 2023-08-07 10:01:25 -04:00 · 2023-08-03 10:28:35 -04:00 · 2023-08-03 10:27:10 -04:00 · 2023-08-01 13:56:11 -04:00 · 2023-08-01 09:07:37 -07:00
13 changed files with 51 additions and 40 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-2.7.10
+2.7.11
--- a/docs/operator-manual/application.yaml
+++ b/docs/operator-manual/application.yaml
@@ -172,6 +172,7 @@ spec:
    - CreateNamespace=true # Namespace Auto-Creation ensures that namespace specified as the application destination exists in the destination cluster.
    - PrunePropagationPolicy=foreground # Supported policies are background, foreground and orphan.
    - PruneLast=true # Allow the ability for resource pruning to happen as a final, implicit wave of a sync operation
+    - RespectIgnoreDifferences=true # When syncing changes, respect fields ignored by the ignoreDifferences configuration
    managedNamespaceMetadata: # Sets the metadata for the application namespace. Only valid if CreateNamespace=true (see above), otherwise it's a no-op.
      labels: # The labels to set on the application namespace
        any: label
@@ -190,7 +191,7 @@ spec:
        maxDuration: 3m # the maximum amount of time allowed for the backoff strategy

  # Will ignore differences between live and desired states during the diff. Note that these configurations are not
-  # used during the sync process.
+  # used during the sync process unless the `RespectIgnoreDifferences=true` sync option is enabled.
  ignoreDifferences:
  # for the specified json pointers
  - group: apps
@@ -202,6 +203,9 @@ spec:
    kind: "*"
    managedFieldsManagers:
    - kube-controller-manager
+    # Name and namespace are optional. If specified, they must match exactly, these are not glob patterns.
+    name: my-deployment
+    namespace: my-namespace

  # RevisionHistoryLimit limits the number of items kept in the application's revision history, which is used for
  # informational purposes as well as for rollbacks to previous versions. This should only be changed in exceptional
--- a/docs/operator-manual/applicationset/Generators.md
+++ b/docs/operator-manual/applicationset/Generators.md
@@ -6,7 +6,7 @@ Generators are primarily based on the data source that they use to generate the

 As of this writing there are eight generators:

- [List generator](Generators-List.md): The List generator allows you to target Argo CD Applications to clusters based on a fixed list of cluster name/URL values.
+- [List generator](Generators-List.md): The List generator allows you to target Argo CD Applications to clusters based on a fixed list of any chosen key/value element pairs.
 - [Cluster generator](Generators-Cluster.md): The Cluster generator allows you to target Argo CD Applications to clusters, based on the list of clusters defined within (and managed by) Argo CD (which includes automatically responding to cluster addition/removal events from Argo CD).
 - [Git generator](Generators-Git.md): The Git generator allows you to create Applications based on files within a Git repository, or based on the directory structure of a Git repository.
 - [Matrix generator](Generators-Matrix.md): The Matrix generator may be used to combine the generated parameters of two separate generators.
--- a/manifests/base/kustomization.yaml
+++ b/manifests/base/kustomization.yaml
@@ -5,7 +5,7 @@ kind: Kustomization
 images:
 - name: quay.io/argoproj/argocd
  newName: quay.io/argoproj/argocd
-  newTag: v2.7.10
+  newTag: v2.7.11
 resources:
 - ./application-controller
 - ./dex
--- a/manifests/core-install.yaml
+++ b/manifests/core-install.yaml
@@ -16706,7 +16706,7 @@ spec:
              key: applicationsetcontroller.enable.progressive.syncs
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        name: argocd-applicationset-controller
        ports:
@@ -16968,7 +16968,7 @@ spec:
          value: /helm-working-dir
        - name: HELM_DATA_HOME
          value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -17020,7 +17020,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        name: copyutil
        securityContext:
          allowPrivilegeEscalation: false
@@ -17233,7 +17233,7 @@ spec:
              key: controller.kubectl.parallelism.limit
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        name: argocd-application-controller
        ports:
--- a/manifests/core-install/kustomization.yaml
+++ b/manifests/core-install/kustomization.yaml
@@ -12,4 +12,4 @@ resources:
 images:
 - name: quay.io/argoproj/argocd
  newName: quay.io/argoproj/argocd
-  newTag: v2.7.10
+  newTag: v2.7.11
--- a/manifests/ha/base/kustomization.yaml
+++ b/manifests/ha/base/kustomization.yaml
@@ -12,7 +12,7 @@ patches:
 images:
 - name: quay.io/argoproj/argocd
  newName: quay.io/argoproj/argocd
-  newTag: v2.7.10
+  newTag: v2.7.11
 resources:
 - ../../base/application-controller
 - ../../base/applicationset-controller
--- a/manifests/ha/install.yaml
+++ b/manifests/ha/install.yaml
@@ -17927,7 +17927,7 @@ spec:
              key: applicationsetcontroller.enable.progressive.syncs
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        name: argocd-applicationset-controller
        ports:
@@ -18037,7 +18037,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        name: copyutil
        securityContext:
@@ -18094,7 +18094,7 @@ spec:
      containers:
      - args:
        - /usr/local/bin/argocd-notifications
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        livenessProbe:
          tcpSocket:
@@ -18399,7 +18399,7 @@ spec:
          value: /helm-working-dir
        - name: HELM_DATA_HOME
          value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -18451,7 +18451,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        name: copyutil
        securityContext:
          allowPrivilegeEscalation: false
@@ -18733,7 +18733,7 @@ spec:
              key: server.enable.proxy.extension
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
@@ -18978,7 +18978,7 @@ spec:
              key: controller.kubectl.parallelism.limit
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        name: argocd-application-controller
        ports:
--- a/manifests/ha/namespace-install.yaml
+++ b/manifests/ha/namespace-install.yaml
@@ -1587,7 +1587,7 @@ spec:
              key: applicationsetcontroller.enable.progressive.syncs
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        name: argocd-applicationset-controller
        ports:
@@ -1697,7 +1697,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        name: copyutil
        securityContext:
@@ -1754,7 +1754,7 @@ spec:
      containers:
      - args:
        - /usr/local/bin/argocd-notifications
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        livenessProbe:
          tcpSocket:
@@ -2059,7 +2059,7 @@ spec:
          value: /helm-working-dir
        - name: HELM_DATA_HOME
          value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -2111,7 +2111,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        name: copyutil
        securityContext:
          allowPrivilegeEscalation: false
@@ -2393,7 +2393,7 @@ spec:
              key: server.enable.proxy.extension
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
@@ -2638,7 +2638,7 @@ spec:
              key: controller.kubectl.parallelism.limit
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        name: argocd-application-controller
        ports:
--- a/manifests/install.yaml
+++ b/manifests/install.yaml
@@ -17044,7 +17044,7 @@ spec:
              key: applicationsetcontroller.enable.progressive.syncs
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        name: argocd-applicationset-controller
        ports:
@@ -17154,7 +17154,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        name: copyutil
        securityContext:
@@ -17211,7 +17211,7 @@ spec:
      containers:
      - args:
        - /usr/local/bin/argocd-notifications
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        livenessProbe:
          tcpSocket:
@@ -17468,7 +17468,7 @@ spec:
          value: /helm-working-dir
        - name: HELM_DATA_HOME
          value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -17520,7 +17520,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        name: copyutil
        securityContext:
          allowPrivilegeEscalation: false
@@ -17795,7 +17795,7 @@ spec:
              key: server.enable.proxy.extension
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
@@ -18035,7 +18035,7 @@ spec:
              key: controller.kubectl.parallelism.limit
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        name: argocd-application-controller
        ports:
--- a/manifests/namespace-install.yaml
+++ b/manifests/namespace-install.yaml
@@ -704,7 +704,7 @@ spec:
              key: applicationsetcontroller.enable.progressive.syncs
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        name: argocd-applicationset-controller
        ports:
@@ -814,7 +814,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        name: copyutil
        securityContext:
@@ -871,7 +871,7 @@ spec:
      containers:
      - args:
        - /usr/local/bin/argocd-notifications
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        livenessProbe:
          tcpSocket:
@@ -1128,7 +1128,7 @@ spec:
          value: /helm-working-dir
        - name: HELM_DATA_HOME
          value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -1180,7 +1180,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        name: copyutil
        securityContext:
          allowPrivilegeEscalation: false
@@ -1455,7 +1455,7 @@ spec:
              key: server.enable.proxy.extension
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
@@ -1695,7 +1695,7 @@ spec:
              key: controller.kubectl.parallelism.limit
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.7.10
+        image: quay.io/argoproj/argocd:v2.7.11
        imagePullPolicy: Always
        name: argocd-application-controller
        ports:
--- a/server/application/application.go
+++ b/server/application/application.go
@@ -1389,7 +1389,7 @@ func (s *Server) ManagedResources(ctx context.Context, q *application.ResourcesQ
 	res := &application.ManagedResourcesResponse{}
 	for i := range items {
 		item := items[i]
-		if isMatchingResource(q, kube.ResourceKey{Name: item.Name, Namespace: item.Namespace, Kind: item.Kind, Group: item.Group}) {
+		if !item.Hook && isMatchingResource(q, kube.ResourceKey{Name: item.Name, Namespace: item.Namespace, Kind: item.Kind, Group: item.Group}) {
 			res.Items = append(res.Items, item)
 		}
 	}
--- a/ui/src/app/applications/components/pod-logs-viewer/since-seconds-selector.tsx
+++ b/ui/src/app/applications/components/pod-logs-viewer/since-seconds-selector.tsx
@@ -4,7 +4,14 @@ import {Tooltip} from 'argo-ui';
 // SinceSelector is a component that renders a dropdown menu of time ranges
 export const SinceSecondsSelector = ({sinceSeconds, setSinceSeconds}: {sinceSeconds: number; setSinceSeconds: (value: number) => void}) => (
    <Tooltip content='Show logs since a given time'>
-        <select className='argo-field' style={{marginRight: '1em'}} value={sinceSeconds} onChange={e => setSinceSeconds(parseInt(e.target.value, 10))}>
+        <select
+            className='argo-field'
+            style={{marginRight: '1em'}}
+            value={sinceSeconds}
+            onChange={e => {
+                const v = parseInt(e.target.value, 10);
+                setSinceSeconds(!isNaN(v) ? v : null);
+            }}>
            <option value='60'>1m ago</option>
            <option value='300'>5m ago</option>
            <option value='600'>10m ago</option>
Author	SHA1	Message	Date
github-actions[bot]	ec195adad8	Bump version to 2.7.11 (#14933 ) Signed-off-by: GitHub <noreply@github.com> Co-authored-by: crenshaw-dev <crenshaw-dev@users.noreply.github.com>	2023-08-07 10:01:25 -04:00
gcp-cherry-pick-bot[bot]	743334ec1d	docs: add ignoreDifferences name and namespace fields (#14741 ) (#14806 ) * Update application.yaml * Update docs/operator-manual/application.yaml --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>	2023-08-03 10:28:35 -04:00
gcp-cherry-pick-bot[bot]	97ddc4b245	docs: Update application.yaml (#14742 ) (#14810 ) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>	2023-08-03 10:27:10 -04:00
gcp-cherry-pick-bot[bot]	89c30d8d34	docs: Change Generator docs for List Generator to note any key/value pairs can be used (#14825 ) (#14833 ) This is no longer limited to cluster/url value pairs. Signed-off-by: JesseBot <jessebot@linux.com> Co-authored-by: JesseBot <jessebot@linux.com>	2023-08-01 13:56:11 -04:00
gcp-cherry-pick-bot[bot]	c56d7e7bc6	fix: ManagedResources API should not return diff for hooks (#14816 ) (#14829 ) Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com> Co-authored-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>	2023-08-01 09:07:37 -07:00
gcp-cherry-pick-bot[bot]	9b6892c467	fix: Correct broken `forever` option in pod logs viewer. Fixes #14762 (#14763 ) (#14804 ) Signed-off-by: Alex Collins <alex_collins@intuit.com> Co-authored-by: Alex Collins <alexec@users.noreply.github.com>	2023-07-31 19:27:11 -04:00
@@ -1 +1 @@
 .7.10
 .7.11