[pull] master from databus23:master

.dockerignore

@@ -0,0 +1,2 @@
+# Ignore everything
+*

.editorconfig

@@ -0,0 +1,8 @@
+root = true
+
+[*.sh]
+indent_style = space
+indent_size = 2
+max_line_length = 120
+trim_trailing_whitespace = true
+shell_variant = posix

.github/copilot-instructions.md

@@ -0,0 +1,137 @@
+# Helm Diff Plugin
+
+Helm Diff is a Go-based Helm plugin that provides diff functionality for comparing Helm charts and releases. It shows what changes would occur during helm upgrade, rollback, or between different releases/revisions.
+
+Always reference these instructions first and fallback to search or bash commands only when you encounter unexpected information that does not match the info here.
+
+## Working Effectively
+
+**Prerequisites:**
+- Go >= 1.21 (currently uses Go 1.24.5)
+- Helm v3 (tested with v3.17.4 and v3.18.6)
+- Make sure `/home/runner/go/bin` is in your PATH for staticcheck: `export PATH=$PATH:/home/runner/go/bin`
+
+**Bootstrap and Build Process:**
+- ALWAYS run: `make bootstrap` first - downloads dependencies and installs staticcheck. Takes <1 second (if already done) or ~50 seconds (first time).
+- Build the plugin: `make build` - includes linting and compiles the binary. Takes ~9 seconds after bootstrap.
+- NEVER CANCEL builds. Set timeout to 3+ minutes for bootstrap, 2+ minutes for build operations.
+
+**Testing:**
+- Run unit tests: `make test` - includes coverage analysis. Takes ~12 seconds. NEVER CANCEL - set timeout to 3+ minutes.
+- Tests include comprehensive coverage (38.7% overall) and use a fake helm binary for isolation.
+- Test coverage is generated in `cover.out` with detailed function-level coverage reports.
+
+**Linting and Code Quality:**
+- Local linting: `make lint` - runs gofmt, go vet, and staticcheck verification. Takes ~2 seconds.
+- Code formatting: `make format` - applies gofmt formatting automatically. Takes <1 second.
+- Full golangci-lint runs only in CI via GitHub Actions, not available locally.
+- ALWAYS run `make format` and `make lint` before committing changes.
+
+**Plugin Installation:**
+- Install as Helm plugin: `make install` or `make install/helm3` - builds and installs to Helm plugins directory. Takes ~3 seconds.
+- The plugin installs via `install-binary.sh` script which handles cross-platform binary installation.
+
+## Validation Scenarios
+
+**ALWAYS test your changes with these scenarios:**
+
+1. **Basic Plugin Functionality:**
+   ```bash
+   # Test the binary directly
+   ./bin/diff version
+   ./bin/diff --help
+   ./bin/diff upgrade --help
+   ```
+
+2. **Real Chart Diffing:**
+   ```bash
+   # Create a test chart and diff it
+   cd /tmp && helm create test-chart
+   cd /path/to/helm-diff
+   HELM_NAMESPACE=default HELM_BIN=helm ./bin/diff upgrade --install --dry-run test-release /tmp/test-chart
+   ```
+
+3. **Plugin Installation Verification:**
+   ```bash
+   # Test plugin installation
+   export HELM_DATA_HOME=/tmp/helm-test
+   make install
+   /tmp/helm-test/plugins/helm-diff/bin/diff version
+   ```
+
+## Build Times and Timeouts
+
+**CRITICAL: NEVER CANCEL long-running commands. Use these timeout values:**
+
+- `make bootstrap`: <1 second (if already done) or ~50 seconds (first time) (set timeout: 5+ minutes)
+- `make build`: ~9 seconds after bootstrap (set timeout: 3+ minutes)
+- `make test`: ~12 seconds (set timeout: 3+ minutes)
+- `make lint`: ~2 seconds (set timeout: 1 minute)
+- `make format`: <1 second (set timeout: 1 minute)
+- `make install`: ~3 seconds (set timeout: 2 minutes)
+
+## Common Tasks
+
+**Repository Structure:**
+- `main.go` - Entry point that delegates to cmd package
+- `cmd/` - Command-line interface implementation (upgrade, release, revision, rollback, version)
+- `diff/` - Core diffing logic and output formatting
+- `manifest/` - Kubernetes manifest parsing and handling
+- `scripts/` - Build and verification scripts (gofmt, govet, staticcheck)
+- `testdata/`, `*/testdata/` - Test fixtures and mock data
+- `plugin.yaml` - Helm plugin configuration
+- `install-binary.sh` - Cross-platform installation script
+- `Makefile` - Build system with all common targets
+
+**Key Files to Check After Changes:**
+- Always run tests after modifying `cmd/` or `diff/` packages
+- Check `plugin.yaml` version if making release changes
+- Verify `Makefile` targets if changing build process
+- Review `install-binary.sh` if modifying installation process
+
+**Environment Variables for Testing:**
+- `HELM_NAMESPACE` - Kubernetes namespace for operations
+- `HELM_BIN` - Path to helm binary (for direct testing)
+- `HELM_DIFF_USE_UPGRADE_DRY_RUN` - Use helm upgrade --dry-run instead of template
+- `HELM_DIFF_THREE_WAY_MERGE` - Enable three-way merge diffing
+- `HELM_DIFF_NORMALIZE_MANIFESTS` - Normalize YAML before diffing
+- `HELM_DIFF_OUTPUT_CONTEXT` - Configure output context lines
+
+**CI/CD Information:**
+- GitHub Actions runs on push/PR to master branch
+- Tests run on Ubuntu, macOS, Windows with multiple Helm versions
+- Integration tests use Kind (Kubernetes in Docker)
+- Linting uses golangci-lint via GitHub Actions (not available locally)
+- Cross-platform plugin installation is tested via Docker
+
+**Direct Binary Usage (for development):**
+```bash
+# Build and test directly without Helm plugin installation
+go build -o bin/diff -ldflags="-X github.com/databus23/helm-diff/v3/cmd.Version=dev"
+HELM_NAMESPACE=default HELM_BIN=helm ./bin/diff upgrade --install --dry-run my-release ./chart-path
+```
+
+**Common Commands Reference:**
+```bash
+# Full development cycle
+make bootstrap      # Install dependencies (once)
+make build         # Build with linting  
+make test          # Run all tests
+make format        # Format code
+make install       # Install as Helm plugin
+
+# Validation
+./bin/diff version                    # Check version
+./bin/diff upgrade --help            # Check help
+make test                           # Run test suite
+```
+
+## Important Notes
+
+- The plugin supports Helm v3 only (v2 support was removed)
+- Uses Go modules for dependency management
+- Cross-platform support: Linux, macOS, Windows, FreeBSD
+- Multiple output formats: diff, simple, template, dyff
+- Supports both client-side and server-side dry-run modes
+- Includes three-way merge capabilities for advanced diffing
+- Plugin binary is named `diff` and installed as `helm diff` command

.github/dependabot.yml

@@ -0,0 +1,16 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/ci.yaml

@@ -0,0 +1,139 @@
+---
+name: CI
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: "Build & Test"
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/setup-go@v6
+        with:
+          go-version-file: 'go.mod'
+
+      - name: Install dependencies
+        run: make bootstrap
+
+      - name: Run unit tests
+        run: make test
+
+      - name: Verify installation
+        run: |
+          mkdir -p helmhome
+          make install HELM_HOME=helmhome
+          helmhome/plugins/helm-diff/bin/diff version
+
+  helm-install:
+    name: helm install
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    needs: [build]
+    runs-on: ${{ matrix.os }}
+    container: ${{ matrix.container }}
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        shell: [ default ]
+        experimental: [ false ]
+        helm-version: [ v3.18.6, v3.19.0 ]
+        include:
+          - os: windows-latest
+            shell: wsl
+            experimental: false
+            helm-version: v3.18.6
+          - os: windows-latest
+            shell: cygwin
+            experimental: false
+            helm-version: v3.18.6
+          - os: ubuntu-latest
+            container: alpine
+            shell: sh
+            experimental: false
+            helm-version: v3.18.6
+          - os: windows-latest
+            shell: wsl
+            experimental: false
+            helm-version: v3.19.0
+          - os: windows-latest
+            shell: cygwin
+            experimental: false
+            helm-version: v3.19.0
+          - os: ubuntu-latest
+            container: alpine
+            shell: sh
+            experimental: false
+            helm-version: v3.19.0
+
+    steps:
+      - name: Disable autocrlf
+        if: "contains(matrix.os, 'windows-latest')"
+        run: |-
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+
+      - uses: actions/checkout@v5
+
+      - name: Setup Helm
+        uses: azure/setup-helm@v4
+        with:
+          version: ${{ matrix.helm-version }}
+
+      - name: Setup WSL
+        if: "contains(matrix.shell, 'wsl')"
+        uses: Vampire/setup-wsl@v6
+
+      - name: Setup Cygwin
+        if: "contains(matrix.shell, 'cygwin')"
+        uses: egor-tensin/setup-cygwin@v4
+
+      - name: helm plugin install
+        run: helm plugin install .
+
+  integration-tests:
+    name: Integration Tests
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    needs: [build]
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          # Helm maintains the latest minor version only and therefore each Helmfile version supports 2 Helm minor versions.
+          # That's why we cover only 2 Helm minor versions in this matrix.
+          # See https://github.com/helmfile/helmfile/pull/286#issuecomment-1250161182 for more context.
+          - helm-version: v3.18.6
+          - helm-version: v3.19.0
+    steps:
+      - uses: engineerd/[email protected]
+        with:
+          skipClusterLogsExport: true 
+
+
+      - uses: actions/checkout@v5
+
+      - name: Setup Helm
+        uses: azure/setup-helm@v4
+        with:
+          version: ${{ matrix.helm-version }}
+
+      - name: helm plugin install
+        run: helm plugin install .
+
+      - name: helm create helm-diff
+        run: helm create helm-diff
+
+      - name: helm diff upgrade --install helm-diff ./helm-diff
+        run: helm diff upgrade --install helm-diff ./helm-diff
+
+      - name: helm upgrade -i helm-diff ./helm-diff
+        run: helm upgrade -i helm-diff ./helm-diff
+
+      - name: helm diff upgrade -C 3 --set replicaCount=2 --install helm-diff ./helm-diff
+        run: helm diff upgrade -C 3 --set replicaCount=2 --install helm-diff ./helm-diff

.github/workflows/cleanup.yaml

@@ -0,0 +1,33 @@
+---
+name: Cleanup
+
+on:
+  pull_request:
+    types:
+      - closed
+
+jobs:
+  cleanup-cache:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Cleanup PR cache'
+        run: |
+          gh extension install actions/gh-actions-cache
+
+          REPO="${{ github.repository }}"
+          BRANCH="refs/pull/${{ github.event.pull_request.number }}/merge"
+
+          echo "Fetching list of cache key"
+          cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH | cut -f 1 )
+
+          ## Setting this to not fail the workflow while deleting cache keys.
+          set +e
+          echo "Deleting caches..."
+          for cacheKey in $cacheKeysForPR
+          do
+            gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
+          done
+          echo "Done"
+        shell: bash
+        env:
+          GH_TOKEN: ${{ github.token }}

.github/workflows/lint-sh.yaml

@@ -0,0 +1,22 @@
+name: Lint sh
+
+on:
+  push:
+    branches: [master]
+    paths: ['install-binary.sh']
+  pull_request:
+    branches: [master]
+    paths: ['install-binary.sh']
+
+jobs:
+  lint-sh:
+    name: Lint install-binary.sh
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    continue-on-error: true
+    steps:
+      - uses: actions/checkout@v5
+      - uses: luizm/[email protected]
+        with:
+          sh_checker_exclude: 'scripts'
+          sh_checker_checkbashisms_enable: true