From 04d133a66fcfad88524ac0f6c40f570256573193 Mon Sep 17 00:00:00 2001 From: Donny Xia Date: Mon, 2 Nov 2020 12:31:15 -0800 Subject: [PATCH] re-enable test for edit patch add --- Makefile | 15 +-------------- examples/springboot/README.md | 6 ++++-- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 6ef3beea0..717006edb 100644 --- a/Makefile +++ b/Makefile @@ -244,20 +244,7 @@ test-examples-kustomize-against-HEAD: $(MYGOBIN)/kustomize $(MYGOBIN)/mdrip ./hack/testExamplesAgainstKustomize.sh HEAD .PHONY: -test-examples-kustomize-against-3.8.0: $(MYGOBIN)/mdrip - ( \ - set -e; \ - tag=v3.8.0; \ - /bin/rm -f $(MYGOBIN)/kustomize; \ - echo "Installing kustomize $$tag."; \ - GO111MODULE=on go get sigs.k8s.io/kustomize/kustomize/v3@$${tag}; \ - ./hack/testExamplesAgainstKustomize.sh $$tag; \ - echo "Reinstalling kustomize from HEAD."; \ - cd kustomize; go install .; \ - ) - -.PHONY: -test-examples-kustomize-against-3.8.2: $(MYGOBIN)/mdrip +test-examples-kustomize-against-3.8.6: $(MYGOBIN)/mdrip ( \ set -e; \ tag=v3.8.2; \ diff --git a/examples/springboot/README.md b/examples/springboot/README.md index 93064f59d..f91c32817 100644 --- a/examples/springboot/README.md +++ b/examples/springboot/README.md @@ -102,7 +102,8 @@ For Spring Boot application, we can set an active profile through the environmen the application will pick up an extra `application-.properties` file. With this, we can customize the configMap in two steps. Add an environment variable through the patch and add a file to the configMap. - + + ``` cat <$DEMO_HOME/patch.yaml apiVersion: apps/v1 @@ -281,7 +282,8 @@ The output contains Add these patches to the kustomization: - + + ``` cd $DEMO_HOME kustomize edit add patch --path memorylimit_patch.yaml --name sbdemo --kind Deployment --group apps --version v1