Merge pull request #8584 from rdrgmnzs/include-bindata

Don't compress bindata & allow Kops to be imported as a package.

.gitignore

@@ -65,7 +65,6 @@ network_closure.sh
 
 # autogenerated code we don't want to check in
 ./go-bindata
-upup/models/bindata.go
 
 # Ignore all Exhuberant Ctags files
 # Removed for now - we have a package named tags
@@ -96,4 +95,4 @@ addons/prometheus-operator/tmp # cloned git repo
 .config
 
 # Used by some of the verify scripts in the hack directory
-_output
+_output

Makefile

@@ -175,7 +175,9 @@ kops-gobindata: gobindata-tool ${BINDATA_TARGETS}
 
 UPUP_MODELS_BINDATA_SOURCES:=$(shell find upup/models/ | egrep -v "upup/models/bindata.go")
 upup/models/bindata.go: ${GOBINDATA} ${UPUP_MODELS_BINDATA_SOURCES}
-	cd ${KOPS_ROOT}; ${GOBINDATA} -o $@ -pkg models -nometadata -ignore="\\.DS_Store" -ignore="bindata\\.go" -ignore="vfs\\.go" -prefix upup/models/ upup/models/... && GO111MODULE=on go run golang.org/x/tools/cmd/goimports -w -v upup/models/bindata.go
+	cd ${KOPS_ROOT}; ${GOBINDATA} -o $@ -pkg models -nometadata -nocompress -ignore="\\.DS_Store" -ignore="bindata\\.go" -ignore="vfs\\.go" -prefix upup/models/ upup/models/...
+	GO111MODULE=on go run golang.org/x/tools/cmd/goimports -w -v upup/models/bindata.go
+	gofmt -w -s upup/models/bindata.go
 
 # Build in a docker container with golang 1.X
 # Used to test we have not broken 1.X

upup/models/BUILD.bazel

@@ -24,6 +24,7 @@ genrule(
 $(location //vendor/github.com/go-bindata/go-bindata/go-bindata:go-bindata) \
   -o "$(OUTS)" -pkg models \
   -nometadata \
+  -nocompress \
   -prefix $$(pwd) \
   -prefix upup/models $(SRCS)
 """,

upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.12.yaml.template

@@ -293,7 +293,7 @@ rules:
       - get
       - list
       - watch
-  # These permissions are only requried for upgrade from v2.6, and can
+  # These permissions are only required for upgrade from v2.6, and can
   # be removed after upgrade or on fresh installations.
   - apiGroups: ["crd.projectcalico.org"]
     resources:

upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.15.yaml.template

@@ -408,7 +408,7 @@ rules:
       - get
       - list
       - watch
-  # These permissions are only requried for upgrade from v2.6, and can
+  # These permissions are only required for upgrade from v2.6, and can
   # be removed after upgrade or on fresh installations.
   - apiGroups: ["crd.projectcalico.org"]
     resources:

upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.16.yaml.template

@@ -404,7 +404,7 @@ rules:
       - get
       - list
       - watch
-  # These permissions are only requried for upgrade from v2.6, and can
+  # These permissions are only required for upgrade from v2.6, and can
   # be removed after upgrade or on fresh installations.
   - apiGroups: ["crd.projectcalico.org"]
     resources:

upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.12.yaml.template

@@ -452,7 +452,7 @@ rules:
       - get
       - list
       - watch
-  # These permissions are only requried for upgrade from v2.6, and can
+  # These permissions are only required for upgrade from v2.6, and can
   # be removed after upgrade or on fresh installations.
   - apiGroups: ["crd.projectcalico.org"]
     resources:

upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.16.yaml.template

@@ -453,7 +453,7 @@ rules:
       - get
       - list
       - watch
-  # These permissions are only requried for upgrade from v2.6, and can
+  # These permissions are only required for upgrade from v2.6, and can
   # be removed after upgrade or on fresh installations.
   - apiGroups: ["crd.projectcalico.org"]
     resources: