Skip to content

[2280] [Upgrade] Delete custom resources per kind instead of per object during cleanup - #2327

Merged
sarika-pf9 merged 3 commits into
mainfrom
2280-optimise-upgrade-cleanup-deletion
Aug 25, 2026
Merged

[2280] [Upgrade] Delete custom resources per kind instead of per object during cleanup#2327
sarika-pf9 merged 3 commits into
mainfrom
2280-optimise-upgrade-cleanup-deletion

Conversation

@sarika-pf9

@sarika-pf9 sarika-pf9 commented Aug 24, 2026

Copy link
Copy Markdown
Collaborator

What this PR does / why we need it

  • Cleanup now deletes each CR kind with a single DeleteCollection call instead of one call per object — flat instead of ~2000 calls on a large vCenter, and no list-then-delete gap for the creds cascade to race, so the "already removed" errors stop.
  • Pre-upgrade checks use Limit: 2 instead of paging the whole inventory to answer yes/no.
  • Cleanup waits for the credential finalizers to finish before re-running the checks, so a slow cascade no longer aborts with pre-upgrade checks still failing after cleanup.

Which issue(s) this PR fixes

fixes #2280

Testing done

Screen.Recording.2026-08-25.at.1.44.50.PM.mov

@github-actions

Copy link
Copy Markdown
Contributor

✅ Security Vulnerability Summary

No change in security posture

📊 Overall Changes

Metric Count
Total Added 0
Total Fixed 0
Net Change 0

🔍 Detailed Breakdown

📦 Gosec (Static Analysis)

Current Baseline Added Fixed Method
0 0 0 0 artifact

📦 Trivy (Dependency Scan)

Current Baseline Added Fixed Method
92 92 0 0 artifact

📋 Baseline Methods

  • 📦 artifact: Used stored report from main branch
  • 🔄 live_scan: Scanned base branch in real-time
  • ⚠️ no_baseline: No baseline available (all vulnerabilities treated as new)

Only HIGH and CRITICAL severity vulnerabilities are tracked
Baseline: acc9f06e7243ff17832272ad8c549aed38127027

Comment thread pkg/vpwned/upgrade/executor.go Outdated
Comment thread pkg/vpwned/upgrade/progress.go Outdated
@sarika-pf9
sarika-pf9 force-pushed the 2280-optimise-upgrade-cleanup-deletion branch from cfaf757 to cd883c7 Compare August 25, 2026 05:09
@github-actions

Copy link
Copy Markdown
Contributor

🚨 Security Vulnerability Summary

Security posture degraded

📊 Overall Changes

Metric Count
Total Added 3
Total Fixed 0
Net Change +3

🔍 Detailed Breakdown

📦 Gosec (Static Analysis)

Current Baseline Added Fixed Method
0 0 0 0 artifact

📦 Trivy (Dependency Scan)

Current Baseline Added Fixed Method
95 92 3 0 artifact

📋 Baseline Methods

  • 📦 artifact: Used stored report from main branch
  • 🔄 live_scan: Scanned base branch in real-time
  • ⚠️ no_baseline: No baseline available (all vulnerabilities treated as new)

🚨 Added Vulnerabilities

Trivy (Dependencies) - 3 Added

Target: vjailbreak-ai/requirements.txt
Package: chromadb 0.5.20
Vulnerability: CVE-2026-45830
Severity: HIGH
Title: chromadb: ChromaDB: Unauthorized data manipulation due to improper authorization validation

Target: vjailbreak-ai/requirements.txt
Package: chromadb 0.5.20
Vulnerability: CVE-2026-45831
Severity: HIGH
Title: ChromaDB: ChromaDB: Unauthorized cross-tenant actions due to improper authorization checks

Target: vjailbreak-ai/requirements.txt
Package: chromadb 0.5.20
Vulnerability: CVE-2026-45833
Severity: CRITICAL
Title: chromadb: ChromaDB: Arbitrary Code Execution via Code Injection


Only HIGH and CRITICAL severity vulnerabilities are tracked
Baseline: acc9f06e7243ff17832272ad8c549aed38127027

@github-actions

Copy link
Copy Markdown
Contributor

🚨 Security Vulnerability Summary

Security posture degraded

📊 Overall Changes

Metric Count
Total Added 3
Total Fixed 0
Net Change +3

🔍 Detailed Breakdown

📦 Gosec (Static Analysis)

Current Baseline Added Fixed Method
0 0 0 0 artifact

📦 Trivy (Dependency Scan)

Current Baseline Added Fixed Method
95 92 3 0 artifact

📋 Baseline Methods

  • 📦 artifact: Used stored report from main branch
  • 🔄 live_scan: Scanned base branch in real-time
  • ⚠️ no_baseline: No baseline available (all vulnerabilities treated as new)

🚨 Added Vulnerabilities

Trivy (Dependencies) - 3 Added

Target: vjailbreak-ai/requirements.txt
Package: chromadb 0.5.20
Vulnerability: CVE-2026-45830
Severity: HIGH
Title: chromadb: ChromaDB: Unauthorized data manipulation due to improper authorization validation

Target: vjailbreak-ai/requirements.txt
Package: chromadb 0.5.20
Vulnerability: CVE-2026-45831
Severity: HIGH
Title: ChromaDB: ChromaDB: Unauthorized cross-tenant actions due to improper authorization checks

Target: vjailbreak-ai/requirements.txt
Package: chromadb 0.5.20
Vulnerability: CVE-2026-45833
Severity: CRITICAL
Title: chromadb: ChromaDB: Arbitrary Code Execution via Code Injection


Only HIGH and CRITICAL severity vulnerabilities are tracked
Baseline: e8bf3d43dcc8609678bffff2d1f9b7433d17ba2f

@sarika-pf9
sarika-pf9 force-pushed the 2280-optimise-upgrade-cleanup-deletion branch from cd883c7 to 250d661 Compare August 25, 2026 06:45
@github-actions

Copy link
Copy Markdown
Contributor

✅ Security Vulnerability Summary

No change in security posture

📊 Overall Changes

Metric Count
Total Added 0
Total Fixed 0
Net Change 0

🔍 Detailed Breakdown

📦 Gosec (Static Analysis)

Current Baseline Added Fixed Method
0 0 0 0 artifact

📦 Trivy (Dependency Scan)

Current Baseline Added Fixed Method
95 95 0 0 artifact

📋 Baseline Methods

  • 📦 artifact: Used stored report from main branch
  • 🔄 live_scan: Scanned base branch in real-time
  • ⚠️ no_baseline: No baseline available (all vulnerabilities treated as new)

Only HIGH and CRITICAL severity vulnerabilities are tracked
Baseline: 4b13a69ff80d2cafe688a8154e58a364f074c1a7

@sarika-pf9
sarika-pf9 enabled auto-merge (squash) August 25, 2026 08:16
@github-actions

Copy link
Copy Markdown
Contributor

✅ Security Vulnerability Summary

No change in security posture

📊 Overall Changes

Metric Count
Total Added 0
Total Fixed 0
Net Change 0

🔍 Detailed Breakdown

📦 Gosec (Static Analysis)

Current Baseline Added Fixed Method
0 0 0 0 artifact

📦 Trivy (Dependency Scan)

Current Baseline Added Fixed Method
95 95 0 0 artifact

📋 Baseline Methods

  • 📦 artifact: Used stored report from main branch
  • 🔄 live_scan: Scanned base branch in real-time
  • ⚠️ no_baseline: No baseline available (all vulnerabilities treated as new)

Only HIGH and CRITICAL severity vulnerabilities are tracked
Baseline: 4b13a69ff80d2cafe688a8154e58a364f074c1a7

@sarika-pf9
sarika-pf9 merged commit 15f6828 into main Aug 25, 2026
17 checks passed
@sarika-pf9
sarika-pf9 deleted the 2280-optimise-upgrade-cleanup-deletion branch August 25, 2026 13:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Remove deletion of vmwaremachine CR after cleanup of vmware creds during upgrade cleanup

2 participants