Skip to content

Commit 68325c4

Browse files
committed
fix more issue
Signed-off-by: yxxhero <aiopsclub@163.com>
1 parent 3b7264f commit 68325c4

5 files changed

Lines changed: 9 additions & 10 deletions

File tree

.github/copilot-instructions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Always reference these instructions first and fallback to search or bash command
2828
- ALWAYS run `make format` and `make lint` before committing changes.
2929

3030
**Plugin Installation:**
31-
- Install as Helm plugin: `make install` or `make install/helm3` - builds and installs to Helm plugins directory. Takes ~3 seconds.
31+
- Install as Helm plugin: `make install` or `make install/helm` - builds and installs to Helm plugins directory. Takes ~3 seconds.
3232
- The plugin installs via `install-binary.sh` script which handles cross-platform binary installation.
3333

3434
## Validation Scenarios

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127
run: helm version
128128

129129
- name: helm plugin install
130-
run: helm plugin install .
130+
run: make install/helm
131131

132132
- name: helm create helm-diff
133133
run: helm create helm-diff

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
HELM_HOME ?= $(shell helm env HELM_DATA_HOME)
22
VERSION := $(shell sed -n -e 's/version:[ "]*\([^"]*\).*/\1/p' plugin.yaml)
33

4-
HELM_3_PLUGINS := $(shell helm env HELM_PLUGINS)
4+
HELM_PLUGINS := $(shell helm env HELM_PLUGINS)
55

66
PKG:= github.com/databus23/helm-diff/v3
77
LDFLAGS := -X $(PKG)/cmd.Version=$(VERSION)
@@ -19,11 +19,11 @@ install: build
1919
cp bin/diff $(HELM_HOME)/plugins/helm-diff/bin
2020
cp plugin.yaml $(HELM_HOME)/plugins/helm-diff/
2121

22-
.PHONY: install/helm3
23-
install/helm3: build
24-
mkdir -p $(HELM_3_PLUGINS)/helm-diff/bin
25-
cp bin/diff $(HELM_3_PLUGINS)/helm-diff/bin
26-
cp plugin.yaml $(HELM_3_PLUGINS)/helm-diff/
22+
.PHONY: install/helm
23+
install/helm: build
24+
mkdir -p $(HELM_PLUGINS)/helm-diff/bin
25+
cp bin/diff $(HELM_PLUGINS)/helm-diff/bin
26+
cp plugin.yaml $(HELM_PLUGINS)/helm-diff/
2727

2828
.PHONY: lint
2929
lint:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ The first step is to download the repository and enter the directory. You can do
4343
Next, install the plugin into helm.
4444

4545
```bash
46-
make install/helm3
46+
make install/helm
4747
```
4848

4949

cmd/helm.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,6 @@ func (d *diffCmd) template(isUpgrade bool) ([]byte, error) {
330330
} else {
331331
if !d.disableValidation && d.clusterAccessAllowed() {
332332
isHelmV4, err := isHelmVersionGreaterThanEqual(helmV4Version)
333-
fmt.Printf("Is helm v4: %v, err: %v\n", isHelmV4, err)
334333
if err == nil && isHelmV4 {
335334
// Flag --validate has been deprecated, use '--dry-run=server' instead in Helm v4+
336335
flags = append(flags, "--dry-run=server")

0 commit comments

Comments
 (0)