v1: Reimplement reconciliation with server-side apply

.github/workflows/e2e.yaml

@@ -2,9 +2,9 @@ name: e2e
 
 on:
   pull_request:
+    branches: [main]
   push:
-    branches:
-      - master
+    branches: [main]
 
 jobs:
   kind:
@@ -22,32 +22,60 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.14.x
+          go-version: 1.16.x
       - name: Setup Kubernetes
         uses: engineerd/setup-kind@v0.5.0
-      - name: Setup Kustomize
-        uses: ./.github/actions/kustomize
+        with:
+          version: v0.11.1
+          image: kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6
       - name: Run test
-        run: make test
+        run: make test-race
       - name: Check if working tree is dirty
         run: |
           if [[ $(git diff --stat) != '' ]]; then
             echo 'run make test and commit changes'
             exit 1
           fi
       - name: Build
-        run: sudo go build -o ./bin/kustomizer ./cmd/kustomizer
-      - name: Smoke tests
+        run: make build
+      - name: Test apply --kustomize
+        run: |
+          ./bin/kustomizer apply -i kustomizer-test -k testdata/kustomize/ --wait --prune
+          kubectl -n kustomizer-test get tests 2>&1 | grep custom-resource-test1
+      - name: Test diff --kustomize
+        run: |
+          echo "diff=test" >> testdata/kustomize/test.conf
+          ./bin/kustomizer diff -i kustomizer-test -k testdata/kustomize/ --prune 2>&1 | grep drifted
+      - name: Test diff secret marks
+        run: |
+          echo "diff=test" >> testdata/kustomize/secret.conf
+          ./bin/kustomizer diff -i kustomizer-test -k testdata/kustomize/ 2>&1 | grep -F "secret.conf: '******'"
+      - name: Test apply --filename
+        run: |
+          ./bin/kustomizer apply -i kustomizer-demo -f testdata/plain/ --wait --prune
+          kubectl -n kustomizer-test get svc frontend 2>&1 | grep frontend
+      - name: Test apply --prune
         run: |
-          ./bin/kustomizer apply testdata/plain/ --name=test --revision=1.0.0
-           kubectl -n kustomizer-demo get svc frontend 2>&1 | grep frontend
           rm -rf testdata/plain/frontend
-          ./bin/kustomizer apply testdata/plain/ --name=test --revision=1.1.0
+          ./bin/kustomizer apply -i kustomizer-demo -f testdata/plain/ --wait --prune
           kubectl -n kustomizer-demo get svc frontend 2>&1 | grep NotFound
-          ./bin/kustomizer delete --name=test
+      - name: Test delete --wait
+        run: |
+          ./bin/kustomizer delete -i kustomizer-demo --wait
+          kubectl get ns kustomizer-demo 2>&1 | grep NotFound
+          ./bin/kustomizer delete -i kustomizer-test --wait
+          kubectl get crd tests.testing.kustomizer.dev 2>&1 | grep NotFound
+      - name: Load test apply (110 objects)
+        run: |
+          ./bin/kustomizer apply -i load-test -k ./testdata/loadtest/
+      - name: Load test delete (110 objects)
+        run: |
+          ./bin/kustomizer delete -i load-test
+      - name: Test staged apply
+        run: |
+          ./bin/kustomizer apply -i cert-test -k ./testdata/certs/ --prune --wait
+          kubectl -n kustomizer-cert-test wait issuers/my-ca-issuer --for=condition=ready --timeout=1m
       - name: Debug failure
         if: failure()
         run: |
-          kubectl version --client --short
           kubectl -n default get configmaps -oyaml
-          kubectl -n kustomizer-demo get all

.gitignore

@@ -14,4 +14,5 @@
 # Dependency directories (remove the comment below to include it)
 # vendor/
 
-bin/
+bin/
+testbin/

.goreleaser.yml

@@ -16,18 +16,3 @@ archives:
   - name_template: "{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
     files:
       - LICENSE
-brews:
-  - tap:
-      owner: stefanprodan
-      name: kustomizer
-
-    folder: Formula
-    homepage: "https://kustomizer.dev/"
-    description: "Kustomize build, apply, prune command-line utility."
-
-    dependencies:
-      - name: kubectl
-        type: optional
-
-    test: |
-      system "#{bin}/kustomizer --version"

Makefile

@@ -1,4 +1,4 @@
-VERSION?=$(shell grep 'VERSION' cmd/kustomizer/main.go | awk '{ print $$4 }' | tr -d '"')
+# Kustomizer test, build, install makefile
 
 all: test build
 
@@ -11,33 +11,61 @@ fmt:
 vet:
 	go vet ./...
 
-test: tidy fmt vet
-	go test ./... -coverprofile cover.out
-
 build:
 	CGO_ENABLED=0 go build -o ./bin/kustomizer ./cmd/kustomizer
 
 install:
-	go install cmd/kustomizer
+	go install ./cmd/kustomizer
 
 install-dev:
 	CGO_ENABLED=0 go build -o /usr/local/bin ./cmd/kustomizer
 
 install-plugin:
 	CGO_ENABLED=0 go build -o /usr/local/bin/kubectl-kustomizer ./cmd/kustomizer
 
-release:
-	git tag "v$(VERSION)"
-	git push origin "v$(VERSION)"
+ENVTEST_ASSETS_DIR=$(shell pwd)/testbin
+ENVTEST_AKUBERNETES_VERSION=latest
+install-envtest: setup-envtest
+	$(SETUP_ENVTEST) use $(ENVTEST_AKUBERNETES_VERSION) --bin-dir=$(ENVTEST_ASSETS_DIR)
+
+KUBEBUILDER_ASSETS?="$(shell $(SETUP_ENVTEST) use -i $(ENVTEST_AKUBERNETES_VERSION) --bin-dir=$(ENVTEST_ASSETS_DIR) -p path)"
+test: tidy fmt vet install-envtest
+	KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS) go test ./... -v -parallel 4 -coverprofile cover.out
+
+test-race: tidy fmt vet install-envtest
+	KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS) go test ./... -v -race -parallel 4 -coverprofile cover.out
+
+test-bench:
+	KUBEBUILDER_ASSETS=$(KUBEBUILDER_ASSETS) go test ./... -v -bench=. -run=none
+
+ifeq (,$(shell go env GOBIN))
+GOBIN=$(shell go env GOPATH)/bin
+else
+GOBIN=$(shell go env GOBIN)
+endif
+
+setup-envtest:
+ifeq (, $(shell which setup-envtest))
+	@{ \
+	set -e ;\
+	SETUP_ENVTEST_TMP_DIR=$$(mktemp -d) ;\
+	cd $$SETUP_ENVTEST_TMP_DIR ;\
+	go mod init tmp ;\
+	go get sigs.k8s.io/controller-runtime/tools/setup-envtest@latest ;\
+	rm -rf $$SETUP_ENVTEST_TMP_DIR ;\
+	}
+SETUP_ENVTEST=$(GOBIN)/setup-envtest
+else
+SETUP_ENVTEST=$(shell which setup-envtest)
+endif
 
 .PHONY: release-docs
 release-docs:
-	git checkout master && git pull; \
+	git checkout main && git pull; \
 	README=$$(cat README.md); \
 	git checkout gh-pages && git pull; \
 	echo "$$README" > README.md; \
-	git add -A; \
+	git add README.md; \
 	git commit -m "update docs"; \
 	git push origin gh-pages; \
-	git checkout master
-
+	git checkout main