Skip to content

fix argocd-differ#8972

Merged
k8s-ci-robot merged 1 commit into
kubernetes:mainfrom
upodroid:argocd-differ-patch
Jan 20, 2026
Merged

fix argocd-differ#8972
k8s-ci-robot merged 1 commit into
kubernetes:mainfrom
upodroid:argocd-differ-patch

Conversation

@upodroid

Copy link
Copy Markdown
Member

So our argocd-diff-preview hasn't been working correctly for a few reasons:

  • The bundled argocd in the docker image doesn't allow kustomize with helm so I had to fix that with a modified argocd install
  • Generated 0 applications from 9 ApplicationSets for branch: main (branch: main) this happened because we generate applications from appsets that require the clusters to be added, which is why we apply the clusters.yaml and the differ works correctly.
  • The IBM clusters pull their credentials from Secret Manager so I substituted them with dummy cluster credentials but same labels and name.

@k8s-ci-robot

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: upodroid

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. area/prow Setting up or working with prow in general, prow.k8s.io, prow build clusters sig/k8s-infra Categorizes an issue or PR as relevant to SIG K8s Infra. sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels Jan 20, 2026
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 20, 2026
@upodroid upodroid requested review from dims and hakman January 20, 2026 18:31
@k8s-infra-ci-robot

k8s-infra-ci-robot commented Jan 20, 2026

Copy link
Copy Markdown
Contributor

Argo CD Diff Preview

Summary:

No changes found

No changes found

Stats:
[Applications: 6], [Full Run: 1m44s], [Rendering: 47s], [Cluster: 24s], [Argo CD: 31s]

name: ibm-ppc64le
server: http://localhost:8080
config: |
{

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{
{

name: ibm-s390x
server: http://localhost:8080
config: |
{

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{
{

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

@upodroid upodroid force-pushed the argocd-differ-patch branch from c4b7b86 to f3fd71f Compare January 20, 2026 19:10
@hakman

hakman commented Jan 20, 2026

Copy link
Copy Markdown
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 20, 2026
@k8s-ci-robot k8s-ci-robot merged commit 6309230 into kubernetes:main Jan 20, 2026
8 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.36 milestone Jan 20, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/prow Setting up or working with prow in general, prow.k8s.io, prow build clusters cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/k8s-infra Categorizes an issue or PR as relevant to SIG K8s Infra. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants