Merge branch 'master' into docs/manifest-paths-clarification

Author: Aamir017

.github/workflows/bump-major-version.yaml

@@ -37,7 +37,7 @@ jobs:
         working-directory: /home/runner/go/src/github.com/argoproj/argo-cd
 
       - name: Setup Golang
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version: ${{ env.GOLANG_VERSION }}
       - name: Add ~/go/bin to PATH

.github/workflows/ci-build.yaml

@@ -57,7 +57,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@8410ad0602e1e429cee44a835ae9f77f654a6694 # v4.0.0
       - name: Setup Golang
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version: ${{ env.GOLANG_VERSION }}
       - name: Download all Go modules
@@ -78,7 +78,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@8410ad0602e1e429cee44a835ae9f77f654a6694 # v4.0.0
       - name: Setup Golang
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version: ${{ env.GOLANG_VERSION }}
       - name: Restore go build cache
@@ -105,7 +105,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@8410ad0602e1e429cee44a835ae9f77f654a6694 # v4.0.0
       - name: Setup Golang
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version: ${{ env.GOLANG_VERSION }}
       - name: Run golangci-lint
@@ -133,7 +133,7 @@ jobs:
       - name: Create symlink in GOPATH
         run: ln -s $(pwd) ~/go/src/github.com/argoproj/argo-cd
       - name: Setup Golang
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version: ${{ env.GOLANG_VERSION }}
       - name: Install required packages
@@ -197,7 +197,7 @@ jobs:
       - name: Create symlink in GOPATH
         run: ln -s $(pwd) ~/go/src/github.com/argoproj/argo-cd
       - name: Setup Golang
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version: ${{ env.GOLANG_VERSION }}
       - name: Install required packages
@@ -253,7 +253,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@8410ad0602e1e429cee44a835ae9f77f654a6694 # v4.0.0
       - name: Setup Golang
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version: ${{ env.GOLANG_VERSION }}
       - name: Create symlink in GOPATH
@@ -449,7 +449,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@8410ad0602e1e429cee44a835ae9f77f654a6694 # v4.0.0
       - name: Setup Golang
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version: ${{ env.GOLANG_VERSION }}
       - name: GH actions workaround - Kill XSP4 process

.github/workflows/codeql.yml

@@ -33,7 +33,7 @@ jobs:
 
     # Use correct go version. https://github.com/github/codeql-action/issues/1842#issuecomment-1704398087
     - name: Setup Golang
-      uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+      uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
       with:
         go-version-file: go.mod
 

.github/workflows/image-reuse.yaml

@@ -67,7 +67,7 @@ jobs:
         if: ${{ github.ref_type != 'tag'}}
 
       - name: Setup Golang
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version: ${{ inputs.go-version }}
           cache: false

.github/workflows/release.yaml

@@ -70,7 +70,7 @@ jobs:
         run: git fetch --force --tags
 
       - name: Setup Golang
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version: ${{ env.GOLANG_VERSION }}
           cache: false
@@ -153,7 +153,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Setup Golang
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
           go-version: ${{ env.GOLANG_VERSION }}
           cache: false

CODEOWNERS

@@ -12,3 +12,8 @@
 /.github/**               @argoproj/argocd-approvers @argoproj/argocd-approvers-ci
 /.goreleaser.yaml         @argoproj/argocd-approvers @argoproj/argocd-approvers-ci
 /sonar-project.properties @argoproj/argocd-approvers @argoproj/argocd-approvers-ci
+
+# CLI
+/cmd/argocd/** @argoproj/argocd-approvers @argoproj/argocd-approvers-cli
+/cmd/main.go @argoproj/argocd-approvers @argoproj/argocd-approvers-cli
+/docs/operator-manual/ @argoproj/argocd-approvers @argoproj/argocd-approvers-cli

docs/operator-manual/upgrading/3.1-3.2.md

@@ -40,20 +40,25 @@ The `ManifestRequest` and `RepoServerAppDetailsQuery` messages are used by the f
 
 ## CronJob Health
 
-This realease introduce the addition of CronJob's health, a longtime omitted heath status for a native Kubernetes resource.
-The health of a CronJob is based on whether or not Jobs are currently running, and if the last completed Job was successful.
+After the upgrade, Application's status may transition to `Degraded` depending on the CronJob health.
 
-After the upgrade, Application's status may transition to `Degraded`, `Progressing` or `Suspended` depending on the CronJob health.
+!!! note "CronJob with running jobs"
 
-If the CronJob is permanently `Suspended`, then the aggregated health of the Application will now be `Suspended` instead of `Healthy`.
-If the CronJob is permanently running jobs, then the aggregated health of the Application will now be `Progressing` instead of `Healthy`.
+    If the CronJob is `Degraded` and a new job is scheduled, the health will change to `Healthy` until the active job completes.
+    This may cause your application to go from `Degraded` to `Healthy` to `Degraded` again. The CronJob status does not contain enough
+    information to infer the health of the last completed job if there are active jobs.
 
-If you do not want your CronJob to affect the Application's aggregated Health, you can configure the annotation
-`argocd.argoproj.io/ignore-healthcheck: "true"` on the CronJob resource.
+    If the CronJob constantly has active jobs, the health will be constantly `Healthy` even if the last job failed.
+
+!!! note "CronJob with suspended state"
 
-The health can also be configured globally using the `resource.customizations.health.batch_CronJob` configuration to change the default behaviour.
+    If the CronJob is in a suspended state, the CronJob status will remain Healthy. You can override this behaviour by configuring the
+    health check using the `resource.customizations.health.batch_CronJob` key in the argocd-cm ConfigMap.
 
-## Breaking Changes
+    If you decide to do so and the CronJob is `Suspended`, then the aggregated health of the Application will now be `Suspended` instead of `Healthy`.
+
+If you do not want your CronJob to affect the Application's aggregated Health, you can configure the annotation
+`argocd.argoproj.io/ignore-healthcheck: "true"` on the CronJob resource.
 
 ## Sanitized project API response
 

resource_customizations/batch/CronJob/health.lua

@@ -1,36 +1,52 @@
 hs = {}
 
 if obj.spec.suspend == true then
-    hs.status = "Suspended"
+    -- Set to Healthy insted of Suspended until bug is resolved
+    -- See https://github.com/argoproj/argo-cd/issues/24428
+    hs.status = "Healthy"
     hs.message = "CronJob is Suspended"
     return hs
 end
 
 if obj.status ~= nil then
-    if obj.status.active ~= nil and table.getn(obj.status.active) > 0 then
-        -- We could be Progressing very often, depending on the Cron schedule, which would bubble up
-        -- to the Application health. If this is undesired, the annotation `argocd.argoproj.io/ignore-healthcheck: "true"`
-        -- can be added on the CronJob.
-        hs.status = "Progressing"
-        hs.message = string.format("Waiting for %d Jobs to complete", table.getn(obj.status.active))
-        return hs
-    end
+    if obj.status.lastScheduleTime ~= nil then
+
+        -- Job is running its first execution and has not yet reported any success
+        if obj.status.lastSuccessfulTime == nil then
+            -- Set to healthy even if it may be degraded, because we dont know
+            -- if it was not yet executed or if it never succeeded
+            hs.status = "Healthy"
+            hs.message = "The Cronjob never completed succesfully. It may not be healthy"
+            return hs
+        end
+
+
+        -- Job is progressing, so lastScheduleTime will always be grater than lastSuccessfulTime
+        -- Set to healthy since we do not know if it is Degraded
+        -- See https://github.com/argoproj/argo-cd/issues/24429
+        if obj.status.active ~= nil and table.getn(obj.status.active) > 0 then
+            hs.status = "Healthy"
+            hs.message = "The job is running. Its last execution may not have been successful"
+            return hs
+        end
 
     -- If the CronJob has no active jobs and the lastSuccessfulTime < lastScheduleTime
     -- then we know it failed the last execution
-    if obj.status.lastScheduleTime ~= nil then
-        -- No issue comparing time as text
-        if obj.status.lastSuccessfulTime == nil or obj.status.lastSuccessfulTime < obj.status.lastScheduleTime then
+        if obj.status.lastSuccessfulTime ~= nil and obj.status.lastSuccessfulTime < obj.status.lastScheduleTime then
             hs.status = "Degraded"
             hs.message = "CronJob has not completed its last execution successfully"
             return hs
         end
+
         hs.message = "CronJob has completed its last execution successfully"
+        hs.status = "Healthy"
+        return hs
     end
 
     -- There is no way to know if as CronJob missed its execution based on status
     -- so we assume Healthy even if a cronJob is not getting scheduled.
     -- https://kubernetes.io/docs/concepts/workloads/controllers/cron-jobs/#job-creation
+    hs.message = "CronJob has not been scheduled yet"
     hs.status = "Healthy"
     return hs
 end

resource_customizations/batch/CronJob/health_test.yaml

@@ -5,21 +5,21 @@ tests:
     inputPath: testdata/healthy.yaml
   - healthStatus:
       status: Healthy
-      message: ''
+      message: CronJob has not been scheduled yet
     inputPath: testdata/never-scheduled.yaml
   - healthStatus:
       status: Degraded
       message: CronJob has not completed its last execution successfully
     inputPath: testdata/degraded.yaml
   - healthStatus:
-      status: Degraded
-      message: CronJob has not completed its last execution successfully
+      status: Healthy
+      message: The Cronjob never completed succesfully. It may not be healthy
     inputPath: testdata/never-succeeded.yaml
   - healthStatus:
-      status: Progressing
-      message: Waiting for 1 Jobs to complete
+      status: Healthy
+      message: The job is running. Its last execution may not have been successful
     inputPath: testdata/active.yaml
   - healthStatus:
-      status: Suspended
+      status: Healthy
       message: CronJob is Suspended
     inputPath: testdata/suspended.yaml