Merge pull request #2134 from monopole/moveStatusToKustomize

Move status command to kustomize.

.golangci-kustomize.yml

@@ -7,8 +7,13 @@ linters:
     - bodyclose
     - deadcode
     - depguard
+    # - dogsled
     - dupl
+    # - errcheck
+    # - funlen
+    # - gochecknoinits
     - goconst
+    # - gocritic
     - gocyclo
     - gofmt
     - goimports
@@ -21,16 +26,18 @@ linters:
     - lll
     - misspell
     - nakedret
+    # - scopelint
     - staticcheck
     - structcheck
     # stylecheck demands that acronyms not be treated as words
     # in camelCase, so JsonOp become JSONOp, etc.  Yuck.
     # - stylecheck
     - typecheck
     - unconvert
-    - unused
     - unparam
+    - unused
     - varcheck
+    # - whitespace
 
 linters-settings:
   dupl:

Makefile

@@ -208,8 +208,6 @@ test-examples-e2e-kustomize: $(MYGOBIN)/mdrip $(MYGOBIN)/kind
 		/bin/rm -f $(MYGOBIN)/kustomize; \
 		echo "Installing kustomize from ."; \
 		cd kustomize; go install .; cd ..; \
-		echo "Installing resource from ."; \
-        cd cmd/resource; go install .; cd ../..; \
 		./hack/testExamplesE2EAgainstKustomize.sh .; \
 	)
 

examples/alphaTestExamples/MultipleDeployments.md

@@ -31,6 +31,8 @@ Alternatively, use
 ```
 BASE=$DEMO_HOME/base
 mkdir -p $BASE
+OUTPUT=$DEMO_HOME/output
+mkdir -p $OUTPUT
 
 mkdir $BASE/wordpress
 mkdir $BASE/mysql
@@ -59,51 +61,46 @@ metadata:
 EOF
 ```
 
-<!-- @setGoBin @testE2EAgainstLatestRelease -->
-```
-MYGOBIN=$GOPATH/bin
-```
-
 Delete any existing kind cluster and create a new one. By default the name of the cluster is "kind"
 <!-- @deleteAndCreateKindCluster @testE2EAgainstLatestRelease -->
 ```
-$MYGOBIN/kind delete cluster;
-$MYGOBIN/kind create cluster;
+kind delete cluster
+kind create cluster
 ```
 
 Let's run the wordpress and mysql services.
 <!-- @RunWordpressAndMysql @testE2EAgainstLatestRelease -->
 ```
 export KUSTOMIZE_ENABLE_ALPHA_COMMANDS=true
 
-$MYGOBIN/kustomize resources apply $BASE/mysql --status;
+kustomize resources apply $BASE/mysql --status;
 
 status=$(mktemp);
-$MYGOBIN/resource status fetch $BASE/mysql > $status
+kustomize status fetch $BASE/mysql > $OUTPUT/status
 
 test 1 == \
-  $(grep "mysql" $status | grep "Deployment is available. Replicas: 1" | wc -l); \
+  $(grep "mysql" $OUTPUT/status | grep "Deployment is available. Replicas: 1" | wc -l); \
   echo $?
 
 test 1 == \
-  $(grep "mysql-pass" $status | grep "Resource is always ready" | wc -l); \
+  $(grep "mysql-pass" $OUTPUT/status | grep "Resource is always ready" | wc -l); \
   echo $?
 
 test 1 == \
-  $(grep "mysql" $status | grep "Service is ready" | wc -l); \
+  $(grep "mysql" $OUTPUT/status | grep "Service is ready" | wc -l); \
   echo $?
 
-$MYGOBIN/kustomize resources apply $BASE/wordpress --status;
+kustomize resources apply $BASE/wordpress --status;
 
 status=$(mktemp);
-$MYGOBIN/resource status fetch $BASE/wordpress > $status
+kustomize status fetch $BASE/wordpress > $OUTPUT/status
 
 test 1 == \
-  $(grep "wordpress" $status | grep "Deployment is available. Replicas: 1" | wc -l); \
+  $(grep "wordpress" $OUTPUT/status | grep "Deployment is available. Replicas: 1" | wc -l); \
   echo $?
 
 test 1 == \
-  $(grep "wordpress" $status | grep "Service is ready" | wc -l); \
+  $(grep "wordpress" $OUTPUT/status | grep "Service is ready" | wc -l); \
   echo $?
 ```
 
@@ -130,26 +127,26 @@ sed -i.bak 's/secret/secret2/' \
 sed -i.bak 's/mysql-pass/mysql-pass2/' \
     $BASE/mysql/deployment.yaml
 
-$MYGOBIN/kustomize resources apply $BASE/mysql --status;
+kustomize resources apply $BASE/mysql --status;
 
 status=$(mktemp);
-$MYGOBIN/resource status fetch $BASE/mysql > $status
+kustomize status fetch $BASE/mysql > $OUTPUT/status
 
 test 1 == \
-  $(grep "mysql" $status | grep "Deployment is available. Replicas: 1" | wc -l); \
+  $(grep "mysql" $OUTPUT/status | grep "Deployment is available. Replicas: 1" | wc -l); \
   echo $?
 
 test 1 == \
-  $(grep "mysql-pass2" $status | grep "Resource is always ready" | wc -l); \
+  $(grep "mysql-pass2" $OUTPUT/status | grep "Resource is always ready" | wc -l); \
   echo $?
 
 test 1 == \
-  $(grep "mysql" $status | grep "Service is ready" | wc -l); \
+  $(grep "mysql" $OUTPUT/status | grep "Service is ready" | wc -l); \
   echo $?
 ```
 
 Clean-up the cluster 
 <!-- @deleteKindCluster @testE2EAgainstLatestRelease -->
 ```
-$MYGOBIN/kind delete cluster;
-```
+kind delete cluster
+```

examples/alphaTestExamples/helloapp.md

@@ -33,6 +33,8 @@ Let's run the [hello] service.
 ```
 BASE=$DEMO_HOME/base
 mkdir -p $BASE
+OUTPUT=$DEMO_HOME/output
+mkdir -p $OUTPUT
 ```
 
 Now lets add a simple config map resource to the `base`
@@ -158,40 +160,34 @@ sed -i.bak 's/app: hello/app: my-hello/' \
     $BASE/kustomization.yaml
 ```
 
-To do end to end tests using kustomize on local, go through the following section. You should have GOPATH set up and [kind] installed.
-
-<!-- @setGoBin @testE2EAgainstLatestRelease -->
-```
-MYGOBIN=$GOPATH/bin
-```
+The following requires installation of [kind].
 
 Delete any existing kind cluster and create a new one. By default the name of the cluster is "kind"
 <!-- @deleteAndCreateKindCluster @testE2EAgainstLatestRelease -->
 ```
-$MYGOBIN/kind delete cluster;
-$MYGOBIN/kind create cluster;
+kind delete cluster
+kind create cluster
 ```
 
 Use the kustomize binary in MYGOBIN to apply a deployment, fetch the status and verify the status.
 <!-- @runHelloApp @testE2EAgainstLatestRelease -->
 ```
 export KUSTOMIZE_ENABLE_ALPHA_COMMANDS=true
 
-$MYGOBIN/kustomize resources apply $BASE --status;
+kustomize resources apply $BASE --status;
 
-status=$(mktemp);
-$MYGOBIN/resource status fetch $BASE > $status
+kustomize status fetch $BASE > $OUTPUT/status
 
 test 1 == \
-  $(grep "the-deployment" $status | grep "Deployment is available. Replicas: 3" | wc -l); \
+  $(grep "the-deployment" $OUTPUT/status | grep "Deployment is available. Replicas: 3" | wc -l); \
   echo $?
 
 test 1 == \
-  $(grep "the-map" $status | grep "Resource is always ready" | wc -l); \
+  $(grep "the-map" $OUTPUT/status | grep "Resource is always ready" | wc -l); \
   echo $?
 
 test 1 == \
-  $(grep "the-service" $status | grep "Service is ready" | wc -l); \
+  $(grep "the-service" $OUTPUT/status | grep "Service is ready" | wc -l); \
   echo $?
 ```
 
@@ -216,30 +212,29 @@ sed -i.bak 's/configMap/configMap2/' \
 sed -i.bak 's/the-map/the-map2/' \
     $BASE/deployment.yaml
 
-$MYGOBIN/kustomize resources apply $BASE --status;
+kustomize resources apply $BASE --status;
 
 status=$(mktemp);
-$MYGOBIN/resource status fetch $BASE > $status
-$MYGOBIN/resource status fetch $BASE > /tmp/teste2eout/out.txt
+kustomize status fetch $BASE > $OUTPUT/status
 
 test 1 == \
-  $(grep "the-deployment" $status | grep "Deployment is available. Replicas: 3" | wc -l); \
+  $(grep "the-deployment" $OUTPUT/status | grep "Deployment is available. Replicas: 3" | wc -l); \
   echo $?
 
 test 1 == \
-  $(grep "the-map2" $status | grep "Resource is always ready" | wc -l); \
+  $(grep "the-map2" $OUTPUT/status | grep "Resource is always ready" | wc -l); \
   echo $?
 
 test 1 == \
-  $(grep "the-service" $status | grep "Service is ready" | wc -l); \
+  $(grep "the-service" $OUTPUT/status | grep "Service is ready" | wc -l); \
   echo $?
 ```
 
 Clean-up the cluster 
 <!-- @deleteKindCluster @testE2EAgainstLatestRelease -->
 ```
-$MYGOBIN/kind delete cluster;
+kind delete cluster
 ```
 
 ### Next Exercise
-Create overlays as described in the [helloWorld] section and verify the results. Good luck! 
+Create overlays as described in the [helloWorld] section and verify the results.