Bump version to 2.3.11

docs: fix 'bellow' typos (#11038 )
2026-03-02 14:38:47 +01:00 · 2022-11-01 21:22:53 +00:00 · 2022-11-01 21:22:41 +00:00 · 2022-10-22 20:15:11 -04:00 · 2022-10-21 11:25:38 -04:00 · 2022-10-21 11:25:16 -04:00
25 changed files with 140 additions and 101 deletions
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -27,9 +27,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
      - name: Setup Golang
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v3
        with:
          go-version: ${{ env.GOLANG_VERSION }}
      - name: Download all Go modules
@@ -45,13 +45,13 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
      - name: Setup Golang
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v3
        with:
          go-version: ${{ env.GOLANG_VERSION }}
      - name: Restore go build cache
-        uses: actions/cache@v1
+        uses: actions/cache@v3
        with:
          path: ~/.cache/go-build
          key: ${{ runner.os }}-go-build-v1-${{ github.run_id }}
@@ -69,7 +69,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
      - name: Run golangci-lint
        uses: golangci/golangci-lint-action@v3
        with:
@@ -85,11 +85,11 @@ jobs:
      - name: Create checkout directory
        run: mkdir -p ~/go/src/github.com/argoproj
      - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
      - name: Create symlink in GOPATH
        run: ln -s $(pwd) ~/go/src/github.com/argoproj/argo-cd
      - name: Setup Golang
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v3
        with:
          go-version: ${{ env.GOLANG_VERSION }}
      - name: Install required packages
@@ -109,7 +109,7 @@ jobs:
        run: |
          echo "/usr/local/bin" >> $GITHUB_PATH
      - name: Restore go build cache
-        uses: actions/cache@v1
+        uses: actions/cache@v3
        with:
          path: ~/.cache/go-build
          key: ${{ runner.os }}-go-build-v1-${{ github.run_id }}
@@ -145,11 +145,11 @@ jobs:
      - name: Create checkout directory
        run: mkdir -p ~/go/src/github.com/argoproj
      - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
      - name: Create symlink in GOPATH
        run: ln -s $(pwd) ~/go/src/github.com/argoproj/argo-cd
      - name: Setup Golang
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v3
        with:
          go-version: ${{ env.GOLANG_VERSION }}
      - name: Install required packages
@@ -169,7 +169,7 @@ jobs:
        run: |
          echo "/usr/local/bin" >> $GITHUB_PATH
      - name: Restore go build cache
-        uses: actions/cache@v1
+        uses: actions/cache@v3
        with:
          path: ~/.cache/go-build
          key: ${{ runner.os }}-go-build-v1-${{ github.run_id }}
@@ -196,9 +196,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
      - name: Setup Golang
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v3
        with:
          go-version: ${{ env.GOLANG_VERSION }}
      - name: Create symlink in GOPATH
@@ -243,14 +243,14 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
      - name: Setup NodeJS
        uses: actions/setup-node@v1
        with:
          node-version: '12.18.4'
      - name: Restore node dependency cache
        id: cache-dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v3
        with:
          path: ui/node_modules
          key: ${{ runner.os }}-node-dep-v2-${{ hashFiles('**/yarn.lock') }}
@@ -280,12 +280,12 @@ jobs:
      sonar_secret: ${{ secrets.SONAR_TOKEN }}
    steps:
      - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
      - name: Restore node dependency cache
        id: cache-dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v3
        with:
          path: ui/node_modules
          key: ${{ runner.os }}-node-dep-v2-${{ hashFiles('**/yarn.lock') }}
@@ -356,9 +356,9 @@ jobs:
      ARGOCD_SERVER: "127.0.0.1:8088"
    steps:
      - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
      - name: Setup Golang
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v3
        with:
          go-version: ${{ env.GOLANG_VERSION }}
      - name: GH actions workaround - Kill XSP4 process
@@ -376,7 +376,7 @@ jobs:
          sudo chown runner $HOME/.kube/config
          kubectl version
      - name: Restore go build cache
-        uses: actions/cache@v1
+        uses: actions/cache@v3
        with:
          path: ~/.cache/go-build
          key: ${{ runner.os }}-go-build-v1-${{ github.run_id }}
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -26,7 +26,7 @@ jobs:

    steps:
    - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
      with:
        # We must fetch at least the immediate parents so that if this is
        # a pull request then we can checkout the head.
--- a/.github/workflows/image.yaml
+++ b/.github/workflows/image.yaml
@@ -28,7 +28,7 @@ jobs:
    env:
      GOPATH: /home/runner/work/argo-cd/argo-cd
    steps:
-      - uses: actions/setup-go@v1
+      - uses: actions/setup-go@v3
        with:
          go-version: ${{ env.GOLANG_VERSION }}
      - uses: actions/checkout@master
@@ -52,8 +52,8 @@ jobs:
          DOCKER_TOKEN: ${{ secrets.RELEASE_QUAY_TOKEN }}

      # build
-      - uses: docker/setup-qemu-action@v1
-      - uses: docker/setup-buildx-action@v1
+      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-buildx-action@v2
      - run: |
          IMAGE_PLATFORMS=linux/amd64
          if [[ "${{ github.event_name }}" == "push" || "${{ contains(github.event.pull_request.labels.*.name, 'test-arm-image') }}" == "true" ]]
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -43,7 +43,7 @@ jobs:
      GIT_EMAIL: argoproj@gmail.com
    steps:
      - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
        with:
          fetch-depth: 0
          token: ${{ secrets.GITHUB_TOKEN }}
@@ -147,7 +147,7 @@ jobs:
          echo "RELEASE_NOTES=${RELEASE_NOTES}" >> $GITHUB_ENV

      - name: Setup Golang
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
        with:
          go-version: ${{ env.GOLANG_VERSION }}

@@ -201,9 +201,8 @@ jobs:
          docker login --username "${DOCKER_USERNAME}" --password "${DOCKER_TOKEN}"
        if: ${{ env.DRY_RUN != 'true' }}

-
-      - uses: docker/setup-qemu-action@v1
-      - uses: docker/setup-buildx-action@v1
+      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-buildx-action@v2
      - name: Build and push Docker image for release
        run: |
          set -ue
@@ -235,7 +234,7 @@ jobs:
      - name: Read release notes file
        id: release-notes
        uses: juliangruber/read-file-action@v1
-        with: 
+        with:
          path: ${{ env.RELEASE_NOTES }}

      - name: Push changes to release branch
@@ -288,6 +287,14 @@ jobs:
          cd /tmp && tar -zcf sbom.tar.gz *.spdx
        if: ${{ env.DRY_RUN != 'true' }}

+      - name: Sign sbom
+        run: |
+          cosign sign-blob --key env://COSIGN_PRIVATE_KEY /tmp/sbom.tar.gz > /tmp/sbom.tar.gz.sig
+        env:
+          COSIGN_PRIVATE_KEY: ${{secrets.COSIGN_PRIVATE_KEY}}
+          COSIGN_PASSWORD: ${{secrets.COSIGN_PASSWORD}}
+        if: ${{ env.DRY_RUN != 'true' }}
+
      - name: Create GitHub release
        uses: softprops/action-gh-release@v1
        env:
@@ -301,6 +308,7 @@ jobs:
          files: |
            dist/argocd-*
            /tmp/sbom.tar.gz
+            /tmp/sbom.tar.gz.sig
        if: ${{ env.DRY_RUN != 'true' }}

      - name: Update homebrew formula
--- a/2
+++ b/2
@@ -561,4 +561,4 @@ list:

 .PHONY: checksums
 checksums:
-	for f in ./dist/$(BIN_NAME)-*; do openssl dgst -sha256 "$$f" | awk ' { print $$2 }' > "$$f".sha256 ; done
+	sha256sum ./dist/$(BIN_NAME)-* | awk -F './dist/' '{print $$1 $$2}' > ./dist/$(BIN_NAME)-$(TARGET_VERSION)-checksums.txt
--- a/2
+++ b/2
@@ -1 +1 @@
-2.3.10
+2.3.11
--- a/docs/operator-manual/metrics.md
+++ b/docs/operator-manual/metrics.md
@@ -9,7 +9,7 @@ Metrics about applications. Scraped at the `argocd-metrics:8082/metrics` endpoin
 |--------|:----:|-------------|
 | `argocd_app_info` | gauge | Information about Applications. It contains labels such as `sync_status` and `health_status` that reflect the application state in ArgoCD. |
 | `argocd_app_k8s_request_total` | counter | Number of kubernetes requests executed during application reconciliation |
-| `argocd_app_labels` | gauge | Argo Application labels converted to Prometheus labels. Disabled by default. See section bellow about how to enable it. |
+| `argocd_app_labels` | gauge | Argo Application labels converted to Prometheus labels. Disabled by default. See section below about how to enable it. |
 | `argocd_app_reconcile` | histogram | Application reconciliation performance. |
 | `argocd_app_sync_total` | counter | Counter for application sync history |
 | `argocd_cluster_api_resource_objects` | gauge | Number of k8s resource objects in the cache. |
@@ -41,7 +41,7 @@ Some examples are:
 As the Application labels are specific to each company, this feature is disabled by default. To enable it, add the
 `--metrics-application-labels` flag to the ArgoCD application controller.

-The example bellow will expose the ArgoCD Application labels `team-name` and `business-unit` to Prometheus:
+The example below will expose the ArgoCD Application labels `team-name` and `business-unit` to Prometheus:

    containers:
    - command:
--- a/docs/user-guide/diffing.md
+++ b/docs/user-guide/diffing.md
@@ -80,7 +80,7 @@ data:
    - '.webhooks[]?.clientConfig.caBundle'
 ```

-Resource customization can also be configured to ignore all differences made by a managedField.manager at the system level. The example bellow shows how to configure ArgoCD to ignore changes made by `kube-controller-manager` in `Deployment` resources.
+Resource customization can also be configured to ignore all differences made by a managedField.manager at the system level. The example below shows how to configure Argo CD to ignore changes made by `kube-controller-manager` in `Deployment` resources.

 ```yaml
 data:
@@ -89,7 +89,7 @@ data:
    - kube-controller-manager
 ```

-It is possible to configure ignoreDifferences to be applied to all resources in every Application managed by an ArgoCD instance. In order to do so, resource customizations can be configured like in the example bellow:
+It is possible to configure ignoreDifferences to be applied to all resources in every Application managed by an Argo CD instance. In order to do so, resource customizations can be configured like in the example below:

 ```yaml
 data:
--- a/docs/user-guide/sync-options.md
+++ b/docs/user-guide/sync-options.md
@@ -168,7 +168,7 @@ spec:

 ## Respect ignore difference configs

-This sync option is used to enable ArgoCD to consider the configurations made in the `spec.ignoreDifferences` attribute also during the sync stage. By default, ArgoCD uses the `ignoreDifferences` config just for computing the diff between the live and desired state which defines if the application is synced or not. However during the sync stage, the desired state is applied as-is. The patch is calculated using a 3-way-merge between the live state the desired state and the `last-applied-configuration` annotation. This sometimes leads to an undesired results. This behavior can be changed by setting the `RespectIgnoreDifferences=true` sync option like in the example bellow:
+This sync option is used to enable Argo CD to consider the configurations made in the `spec.ignoreDifferences` attribute also during the sync stage. By default, Argo CD uses the `ignoreDifferences` config just for computing the diff between the live and desired state which defines if the application is synced or not. However during the sync stage, the desired state is applied as-is. The patch is calculated using a 3-way-merge between the live state the desired state and the `last-applied-configuration` annotation. This sometimes leads to an undesired results. This behavior can be changed by setting the `RespectIgnoreDifferences=true` sync option like in the example below:

 ```yaml
 apiVersion: argoproj.io/v1alpha1
--- a/docs/user-guide/tracking_strategies.md
+++ b/docs/user-guide/tracking_strategies.md
@@ -20,6 +20,8 @@ For Helm, all versions are [Semantic Versions](https://semver.org/). As a result
 | Track minor releases (e.g. in QA) | Use a range | `1.*` or `>=1.0.0 <2.0.0` |
 | Use the latest (e.g. in local development) | Use star range |  `*` or `>=0.0.0` |

+**Note for OCI Helm repositories**: the only available strategy is "Pin to a version".
+
 [Read about version ranges](https://www.telerik.com/blogs/the-mystical-magical-semver-ranges-used-by-npm-bower)

 ## Git
--- 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.3.10
+  newTag: v2.3.11
 resources:
 - ./application-controller
 - ./dex
--- a/manifests/core-install.yaml
+++ b/manifests/core-install.yaml
@@ -9698,7 +9698,7 @@ spec:
          value: /helm-working-dir
        - name: HELM_DATA_HOME
          value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -9747,7 +9747,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        name: copyutil
        volumeMounts:
        - mountPath: /var/run/argocd
@@ -9912,7 +9912,7 @@ spec:
              key: controller.default.cache.expiration
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
--- a/manifests/core-install/kustomization.yaml
+++ b/manifests/core-install/kustomization.yaml
@@ -11,4 +11,4 @@ resources:
 images:
 - name: quay.io/argoproj/argocd
  newName: quay.io/argoproj/argocd
-  newTag: v2.3.10
+  newTag: v2.3.11
--- a/manifests/ha/base/kustomization.yaml
+++ b/manifests/ha/base/kustomization.yaml
@@ -11,7 +11,7 @@ patchesStrategicMerge:
 images:
 - name: quay.io/argoproj/argocd
  newName: quay.io/argoproj/argocd
-  newTag: v2.3.10
+  newTag: v2.3.11
 resources:
 - ../../base/application-controller
 - ../../base/dex
--- a/manifests/ha/install.yaml
+++ b/manifests/ha/install.yaml
@@ -10516,7 +10516,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        imagePullPolicy: Always
        name: copyutil
        volumeMounts:
@@ -10549,7 +10549,7 @@ spec:
      containers:
      - command:
        - argocd-notifications
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        imagePullPolicy: Always
        livenessProbe:
          tcpSocket:
@@ -10788,7 +10788,7 @@ spec:
          value: /helm-working-dir
        - name: HELM_DATA_HOME
          value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -10837,7 +10837,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        name: copyutil
        volumeMounts:
        - mountPath: /var/run/argocd
@@ -11064,7 +11064,7 @@ spec:
              key: server.http.cookie.maxnumber
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
@@ -11260,7 +11260,7 @@ spec:
              key: controller.default.cache.expiration
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
--- a/manifests/ha/namespace-install.yaml
+++ b/manifests/ha/namespace-install.yaml
@@ -7812,7 +7812,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        imagePullPolicy: Always
        name: copyutil
        volumeMounts:
@@ -7845,7 +7845,7 @@ spec:
      containers:
      - command:
        - argocd-notifications
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        imagePullPolicy: Always
        livenessProbe:
          tcpSocket:
@@ -8084,7 +8084,7 @@ spec:
          value: /helm-working-dir
        - name: HELM_DATA_HOME
          value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -8133,7 +8133,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        name: copyutil
        volumeMounts:
        - mountPath: /var/run/argocd
@@ -8360,7 +8360,7 @@ spec:
              key: server.http.cookie.maxnumber
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
@@ -8556,7 +8556,7 @@ spec:
              key: controller.default.cache.expiration
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
--- a/manifests/install.yaml
+++ b/manifests/install.yaml
@@ -9886,7 +9886,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        imagePullPolicy: Always
        name: copyutil
        volumeMounts:
@@ -9919,7 +9919,7 @@ spec:
      containers:
      - command:
        - argocd-notifications
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        imagePullPolicy: Always
        livenessProbe:
          tcpSocket:
@@ -10122,7 +10122,7 @@ spec:
          value: /helm-working-dir
        - name: HELM_DATA_HOME
          value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -10171,7 +10171,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        name: copyutil
        volumeMounts:
        - mountPath: /var/run/argocd
@@ -10394,7 +10394,7 @@ spec:
              key: server.http.cookie.maxnumber
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
@@ -10584,7 +10584,7 @@ spec:
              key: controller.default.cache.expiration
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
--- a/manifests/namespace-install.yaml
+++ b/manifests/namespace-install.yaml
@@ -7182,7 +7182,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        imagePullPolicy: Always
        name: copyutil
        volumeMounts:
@@ -7215,7 +7215,7 @@ spec:
      containers:
      - command:
        - argocd-notifications
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        imagePullPolicy: Always
        livenessProbe:
          tcpSocket:
@@ -7418,7 +7418,7 @@ spec:
          value: /helm-working-dir
        - name: HELM_DATA_HOME
          value: /helm-working-dir
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        imagePullPolicy: Always
        livenessProbe:
          failureThreshold: 3
@@ -7467,7 +7467,7 @@ spec:
        - -n
        - /usr/local/bin/argocd
        - /var/run/argocd/argocd-cmp-server
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        name: copyutil
        volumeMounts:
        - mountPath: /var/run/argocd
@@ -7690,7 +7690,7 @@ spec:
              key: server.http.cookie.maxnumber
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
@@ -7880,7 +7880,7 @@ spec:
              key: controller.default.cache.expiration
              name: argocd-cmd-params-cm
              optional: true
-        image: quay.io/argoproj/argocd:v2.3.10
+        image: quay.io/argoproj/argocd:v2.3.11
        imagePullPolicy: Always
        livenessProbe:
          httpGet:
--- a/resource_customizations/kiali.io/Kiali/health.lua
+++ b/resource_customizations/kiali.io/Kiali/health.lua
@@ -3,17 +3,21 @@ if obj.status ~= nil then
  if obj.status.conditions ~= nil then
    for i, condition in ipairs(obj.status.conditions) do
      health_status.message = condition.message
-      if condition.reason == "Successful" then
+      if condition.type == "Successful" and condition.status == "True" then
        health_status.status = "Healthy"
-      elseif condition.reason == "Running" then
-        health_status.status = "Progressing"
-      else
-        health_status.status = "Degraded"
+        return health_status
+      end
+      if condition.type == "Failure" and condition.status == "True" then
+        health_status.status = "Degraded"
+        return health_status
+      end
+      if condition.type == "Running" and condition.reason == "Running" then
+        health_status.status = "Progressing"
+        return health_status
      end
-      return health_status
    end
  end
 end
 health_status.status = "Progressing"
 health_status.message = "Waiting for Kiali"
-return health_status
+return health_status
--- a/resource_customizations/kiali.io/Kiali/health_test.yaml
+++ b/resource_customizations/kiali.io/Kiali/health_test.yaml
@@ -9,5 +9,5 @@ tests:
  inputPath: testdata/degraded.yaml
 - healthStatus:
    status: Healthy
-    message: "Awaiting next reconciliation"
+    message: "Last reconciliation succeeded"
  inputPath: testdata/healthy.yaml
--- a/resource_customizations/kiali.io/Kiali/testdata/degraded.yaml
+++ b/resource_customizations/kiali.io/Kiali/testdata/degraded.yaml
@@ -14,14 +14,24 @@ metadata:
 spec: {}
 status:
  conditions:
-  - ansibleResult:
-      changed: 1
-      completion: 2020-06-08T13:41:20.133525
-      failures: 0
-      ok: 56
-      skipped: 82
-    lastTransitionTime: "2020-06-04T17:47:31Z"
-    message: Error Reconciling
-    reason: null 
-    status: "True"
-    type: Running
+    - lastTransitionTime: '2022-10-19T09:44:32Z'
+      message: ''
+      reason: ''
+      status: 'False'
+      type: Failure
+    - ansibleResult:
+        changed: 18
+        completion: '2022-10-19T09:44:32.289505'
+        failures: 0
+        ok: 101
+        skipped: 101
+      lastTransitionTime: '2022-10-19T09:43:39Z'
+      message: Awaiting next reconciliation
+      reason: Successful
+      status: 'True'
+      type: Running
+    - lastTransitionTime: '2022-10-19T09:44:32Z'
+      message: Error Reconciling
+      reason: Failure
+      status: 'True'
+      type: Failure
--- a/resource_customizations/kiali.io/Kiali/testdata/healthy.yaml
+++ b/resource_customizations/kiali.io/Kiali/testdata/healthy.yaml
@@ -14,14 +14,24 @@ metadata:
 spec: {}
 status:
  conditions:
-  - ansibleResult:
-      changed: 1
-      completion: 2020-06-08T13:41:20.133525
-      failures: 0
-      ok: 56
-      skipped: 82
-    lastTransitionTime: "2020-06-04T17:47:31Z"
-    message: Awaiting next reconciliation
-    reason: Successful
-    status: "True"
-    type: Running
+    - lastTransitionTime: '2022-10-19T09:44:32Z'
+      message: ''
+      reason: ''
+      status: 'False'
+      type: Failure
+    - ansibleResult:
+        changed: 18
+        completion: '2022-10-19T09:44:32.289505'
+        failures: 0
+        ok: 101
+        skipped: 101
+      lastTransitionTime: '2022-10-19T09:43:39Z'
+      message: Awaiting next reconciliation
+      reason: Successful
+      status: 'True'
+      type: Running
+    - lastTransitionTime: '2022-10-19T09:44:32Z'
+      message: Last reconciliation succeeded
+      reason: Successful
+      status: 'True'
+      type: Successful
--- a/test/e2e/fixture/fixture.go
+++ b/test/e2e/fixture/fixture.go
@@ -717,6 +717,8 @@ func Declarative(filename string, values interface{}) (string, error) {
 }

 func CreateSubmoduleRepos(repoType string) {
+	oldEnv := os.Getenv("GIT_ALLOW_PROTOCOL")
+	CheckError(os.Setenv("GIT_ALLOW_PROTOCOL", "file"))

 	// set-up submodule repo
 	FailOnErr(Run("", "cp", "-Rf", "testdata/git-submodule/", submoduleDirectory()))
@@ -748,6 +750,8 @@ func CreateSubmoduleRepos(repoType string) {
 		FailOnErr(Run(submoduleParentDirectory(), "git", "remote", "add", "origin", os.Getenv("ARGOCD_E2E_GIT_SERVICE_SUBMODULE_PARENT")))
 		FailOnErr(Run(submoduleParentDirectory(), "git", "push", "origin", "master", "-f"))
 	}
+
+	CheckError(os.Setenv("GIT_ALLOW_PROTOCOL", oldEnv))
 }

 // RestartRepoServer performs a restart of the repo server deployment and waits
--- a/ui/src/app/applications/components/application-details/application-details.scss
+++ b/ui/src/app/applications/components/application-details/application-details.scss
@@ -40,6 +40,7 @@ $header: 120px;
    &__warning {
        font-size: 0.8em;
        color: darken($argo-status-warning-color, 20%);
+        min-height: 1.2rem;
    }

    &__refreshing-label {
--- a/ui/src/app/applications/components/application-sync-panel/application-sync-panel.tsx
+++ b/ui/src/app/applications/components/application-sync-panel/application-sync-panel.tsx
@@ -169,9 +169,9 @@ export const ApplicationSyncPanel = ({application, selectedResource, hide}: {app
                                                none
                                            </a>
                                        </div>
-                                        {!formApi.values.resources.every((item: boolean) => item) && (
-                                            <div className='application-details__warning'>WARNING: partial synchronization is not recorded in history</div>
-                                        )}
+                                        <div className='application-details__warning'>
+                                            {!formApi.values.resources.every((item: boolean) => item) && <div>WARNING: partial synchronization is not recorded in history</div>}
+                                        </div>
                                        <div>
                                            {application.status.resources
                                                .filter(item => !item.hook)
Author	SHA1	Message	Date
argo-bot	3ef61d737c	Bump version to 2.3.11	2022-11-01 21:22:53 +00:00
argo-bot	d24aaff5d2	Bump version to 2.3.11	2022-11-01 21:22:41 +00:00
Chromo-residuum-opec	0d7d5255c9	docs: fix 'bellow' typos (#11038 ) Signed-off-by: backfire-monism-net <development.0extl@simplelogin.com> Signed-off-by: backfire-monism-net <development.0extl@simplelogin.com>	2022-10-22 20:15:11 -04:00
Michael Crenshaw	5f118f5c9b	chore: fix CI (#11022 ) * chore: fix CI Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * no more set global Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>	2022-10-21 11:25:38 -04:00
Michael Crenshaw	3855e2c853	chore: fix e2e (#11005 ) * chore: fix e2e Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * more config Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * global Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>	2022-10-21 11:25:16 -04:00
Alex Eftimie	fbf38d1029	docs: mention that OCI helm does not support version ranges (#11026 ) * docs: mention that OCI helm does not support version ranges Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com> * Apply suggestions from code review Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com> Signed-off-by: Alex Eftimie <alex.eftimie@getyourguide.com>	2022-10-21 11:19:12 -04:00
Allex	0bc9d1b973	fix: Update custom health check for kiali.io/Kiali (#10995 ) With Kiali v1.57.1 an additional status condition was added: ``` - lastTransitionTime: '2022-10-14T11:56:24Z' message: '' reason: '' status: 'False' type: Failure ``` Based on the discussion in https://github.com/kiali/kiali/issues/5560 this should not lead to a degraded health state. This will no longer return Degraded as a catch-all and use the `type` and `status` fields of the condition to determine the CR health. Signed-off-by: Allex Veldman <allexveldman+github@gmail.com> Signed-off-by: Allex Veldman <allexveldman+github@gmail.com>	2022-10-19 12:17:41 -04:00
Michael Crenshaw	bd8e16aa1a	chore: upgrade actions/checkout to v3, i.e. Node.js 16 (#10947 ) * chore: updgrade actions/checkout to v3, i.e. Node.js 16 Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * more node 12 Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>	2022-10-19 11:32:43 -04:00
34FathomBelow	65556c22ec	chore: release signature of sbom (#10969 ) Signed-off-by: Justin Marquis <34fathombelow@protonmail.com> Signed-off-by: Justin Marquis <34fathombelow@protonmail.com>	2022-10-18 15:39:58 -04:00
Michael Crenshaw	508fdd6fd5	chore: use one checksum file Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>	2022-10-18 14:59:14 -04:00
Jessie Teng	3b2d31cc58	fix: Resource list in sync page msg style#10887 (#10970 ) * fix: Resource list in sync page msg style#10887 Signed-off-by: Teng, Jessie <yilin.teng@fmr.com> * fix: Resource list in sync page msg style#10887 Signed-off-by: Teng, Jessie <yilin.teng@fmr.com> * fix: Resource list in sync page msg style#10887 Signed-off-by: Teng, Jessie <yilin.teng@fmr.com> * fix: Resource list in sync page msg style#10887 Signed-off-by: Teng, Jessie <yilin.teng@fmr.com> Signed-off-by: Teng, Jessie <yilin.teng@fmr.com>	2022-10-18 14:02:08 -04:00
@@ -1 +1 @@
 .3.10
 .3.11