Skip to content

Commit 7de89e8

Browse files
authored
feat(kong): fail when postgres enable without image (#1444)
1 parent 6bf6201 commit 7de89e8

36 files changed

+516
-503
lines changed

Makefile

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ TOOLS_VERSIONS_FILE = .tools_versions.yaml
33

44
MISE := $(shell which mise)
55
MISE_FILE := .mise.toml
6+
MISE_DATA_DIR := $(PROJECT_DIR)/bin
7+
68
.PHONY: mise
79
mise:
810
@mise -V >/dev/null || (echo "mise - https://github.com/jdx/mise - not found. Please install it." && exit 1)
911

10-
export MISE_DATA_DIR = $(PROJECT_DIR)/bin/
11-
1212
# NOTE: mise targets use -q to silence the output.
1313
# Users can use MISE_VERBOSE=1 MISE_DEBUG=1 to get more verbose output.
1414

@@ -21,35 +21,32 @@ mise-install: mise
2121
@$(MISE) install -q $(DEP_VER)
2222

2323
KUBE_LINTER_VERSION = $(shell yq -ojson -r '.kube-linter' < $(TOOLS_VERSIONS_FILE))
24-
KUBE_LINTER = $(PROJECT_DIR)/bin/installs/kube-linter/$(KUBE_LINTER_VERSION)/bin/kube-linter
24+
KUBE_LINTER = $(PROJECT_DIR)/bin/installs/github-stackrox-kube-linter/$(KUBE_LINTER_VERSION)/kube-linter
2525
.PHONY: kube-linter
26-
kube-linter: mise
27-
@$(MAKE) mise-plugin-install DEP=kube-linter
28-
@$(MAKE) mise-install DEP_VER=kube-linter@$(KUBE_LINTER_VERSION)
26+
kube-linter:
27+
MISE_DATA_DIR=$(MISE_DATA_DIR) $(MAKE) mise-install DEP_VER=github:stackrox/kube-linter@$(KUBE_LINTER_VERSION)
2928

3029
CHARTSNAP_VERSION = $(shell yq -ojson -r '.chartsnap' < $(TOOLS_VERSIONS_FILE))
3130
.PHONY: chartsnap
3231
chartsnap: download.helm
33-
HELM=$(HELM) CHARTSNAP_VERSION=${CHARTSNAP_VERSION} ./scripts/install-chartsnap.sh
32+
HELM=$(HELM) CHARTSNAP_VERSION=$(CHARTSNAP_VERSION) ./scripts/install-chartsnap.sh
3433

3534
SHELLCHECK_VERSION = $(shell yq -ojson -r '.shellcheck' < $(TOOLS_VERSIONS_FILE))
36-
SHELLCHECK = $(PROJECT_DIR)/bin/installs/shellcheck/$(SHELLCHECK_VERSION)/bin/shellcheck
37-
.PHONY: shellcheck
38-
shellcheck: mise
39-
@$(MAKE) mise-plugin-install DEP=shellcheck
40-
@$(MAKE) mise-install DEP_VER=shellcheck@$(SHELLCHECK_VERSION)
35+
SHELLCHECK = $(PROJECT_DIR)/bin/installs/github-koalaman-shellcheck/$(SHELLCHECK_VERSION)/shellcheck
36+
.PHONY: download.shellcheck
37+
download.shellcheck:
38+
MISE_DATA_DIR=$(MISE_DATA_DIR) $(MAKE) mise-install DEP_VER=github:koalaman/shellcheck@$(SHELLCHECK_VERSION)
4139

4240
ACTIONLINT_VERSION = $(shell yq -r '.actionlint' < $(TOOLS_VERSIONS_FILE))
43-
ACTIONLINT = $(PROJECT_DIR)/bin/installs/actionlint/$(ACTIONLINT_VERSION)/bin/actionlint
41+
ACTIONLINT = $(PROJECT_DIR)/bin/installs/github-rhysd-actionlint/$(ACTIONLINT_VERSION)/actionlint
4442
.PHONY: download.actionlint
45-
download.actionlint: mise ## Download actionlint locally if necessary.
46-
@$(MISE) plugin install --yes -q actionlint
47-
@$(MISE) install -q actionlint@$(ACTIONLINT_VERSION)
43+
download.actionlint:
44+
MISE_DATA_DIR=$(MISE_DATA_DIR) $(MAKE) mise-install DEP_VER=github:rhysd/actionlint@$(ACTIONLINT_VERSION)
4845

4946
HELM_VERSION = $(shell yq -p toml -o yaml '.tools["http:helm"].version' < $(MISE_FILE))
50-
HELM = $(PROJECT_DIR)/bin/installs/http-helm/$(HELM_VERSION)/helm
47+
HELM = helm
5148
.PHONY: download.helm
52-
download.helm: mise ## Download helm locally if necessary.
49+
download.helm:
5350
@$(MAKE) mise-install DEP_VER=http:helm
5451

5552
.PHONY: print.helm
@@ -61,7 +58,7 @@ verify.diff:
6158
@$(PROJECT_DIR)/scripts/verify-diff.sh $(PROJECT_DIR)
6259

6360
.PHONY: tools
64-
tools: kube-linter chartsnap shellcheck
61+
tools: kube-linter chartsnap download.shellcheck
6562

6663
.PHONY: lint
6764
lint: tools lint.charts lint.shellcheck lint.actions
@@ -71,12 +68,12 @@ lint.charts:
7168
$(KUBE_LINTER) lint charts/
7269

7370
.PHONY: lint.shellcheck
74-
lint.shellcheck: shellcheck
71+
lint.shellcheck: download.shellcheck
7572
$(SHELLCHECK) ./scripts/*
7673
$(SHELLCHECK) ./charts/gateway-operator/scripts/*
7774

7875
.PHONY: lint.actions
79-
lint.actions: download.actionlint shellcheck
76+
lint.actions: download.actionlint download.shellcheck
8077
# TODO: add more files to be checked
8178
$(ACTIONLINT) -shellcheck $(SHELLCHECK) \
8279
./.github/workflows/*

charts/kong/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Changelog
22

3+
## 3.0.1
4+
5+
### Changes
6+
7+
* Fail chart rendering when `postgresql.enabled` is `true` but
8+
`postgresql.image.repository` or `postgresql.image.tag` or
9+
`postgresql.image.registry` are not set.
10+
[#1444](https://github.com/Kong/charts/pull/1444)
11+
312
## 3.0.0
413

514
### Changes

charts/kong/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ maintainers:
88
name: kong
99
sources:
1010
- https://github.com/Kong/charts/tree/main/charts/kong
11-
version: 3.0.0
11+
version: 3.0.1
1212
appVersion: "3.9"
1313
dependencies:
1414
- name: postgresql

charts/kong/ci/__snapshots__/admin-api-service-clusterip-values.snap

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

charts/kong/ci/__snapshots__/admission-webhook-configuration.snap

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)