Skip to content

Commit

Permalink
Fix kustomize build; add CI lint (#89)
Browse files Browse the repository at this point in the history
  • Loading branch information
bastjan authored Jun 20, 2024
1 parent c473029 commit 20dfb4c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ vet: ## Run go vet against code

.PHONY: lint
lint: fmt vet generate manifests ## All-in-one linting
@echo 'Checking kustomize build ...'
$(KUSTOMIZE) build config/crd -o /dev/null
$(KUSTOMIZE) build config/default -o /dev/null
@echo 'Check for uncommitted changes ...'
git diff --exit-code

Expand Down
2 changes: 1 addition & 1 deletion Makefile.vars.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ IMG_TAG ?= latest
CURDIR ?= $(shell pwd)
BIN_FILENAME ?= $(CURDIR)/$(PROJECT_ROOT_DIR)/openshift-upgrade-controller

KUSTOMIZE ?= go run sigs.k8s.io/kustomize/kustomize/v4
KUSTOMIZE ?= go run sigs.k8s.io/kustomize/kustomize/v5

# Image URL to use all building/pushing image targets
GHCR_IMG ?= ghcr.io/appuio/openshift-upgrade-controller:$(IMG_TAG)
2 changes: 1 addition & 1 deletion config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ resources:
- bases/managedupgrade.appuio.io_upgradejobs.yaml
- bases/managedupgrade.appuio.io_upgradeconfigs.yaml
- bases/managedupgrade.appuio.io_upgradejobhooks.yaml
- bases/managedupgrade.appuio.io_upgradesuspensionwindow.yaml
- bases/managedupgrade.appuio.io_upgradesuspensionwindows.yaml
#+kubebuilder:scaffold:crdkustomizeresource

patchesStrategicMerge:
Expand Down

0 comments on commit 20dfb4c

Please sign in to comment.