Finalize extraction of controller from gardener/gardener-extensions

gardener · Jan 31, 2020 · ba9c53b · ba9c53b
1 parent c6d71d0
commit ba9c53b
Show file tree

Hide file tree

Showing 27 changed files with 52 additions and 205 deletions.
diff --git a/.ci/component_descriptor b/.ci/component_descriptor
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-"$(dirname $0)"/../vendor/github.com/gardener/gardener-extensions/.ci/component_descriptor "$(dirname $0)"/..
+"$(dirname $0)"/../vendor/github.com/gardener/gardener-extensions/hack/.ci/component_descriptor "$(dirname $0)"/..
diff --git a/.ci/pipeline_definitions b/.ci/pipeline_definitions
@@ -18,10 +18,14 @@ gardener-extension-provider-openstack:
       traits:
         component_descriptor: ~
         draft_release: ~
+        options:
+          public_build_logs: true
     pull-request:
       traits:
         pull-request: ~
         component_descriptor: ~
+        options:
+          public_build_logs: true
     release:
       traits:
         version:

diff --git a/.ci/prepare_release b/.ci/prepare_release
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-"$(dirname $0)"/../vendor/github.com/gardener/gardener-extensions/.ci/prepare_release "$(dirname $0)"/.. github.com/gardener gardener-extension-provider-openstack
+"$(dirname $0)"/../vendor/github.com/gardener/gardener-extensions/hack/.ci/prepare_release "$(dirname $0)"/.. github.com/gardener gardener-extension-provider-openstack
diff --git a/.ci/set_dependency_version b/.ci/set_dependency_version
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-"$(dirname $0)"/../vendor/github.com/gardener/gardener-extensions/.ci/set_dependency_version
+"$(dirname $0)"/../vendor/github.com/gardener/gardener-extensions/hack/.ci/set_dependency_version
diff --git a/Makefile b/Makefile
@@ -37,7 +37,7 @@ endif
 
 .PHONY: format
 format:
-	@$(REPO_ROOT)/vendor/github.com/gardener/gardener-extensions/hack/format.sh ./cmd ./pkg
+	@$(REPO_ROOT)/vendor/github.com/gardener/gardener-extensions/hack/format.sh ./cmd ./pkg ./test
 
 .PHONY: clean
 clean:
@@ -95,7 +95,7 @@ revendor:
 	@GO111MODULE=on go mod vendor
 	@GO111MODULE=on go mod tidy
 	@chmod +x $(REPO_ROOT)/vendor/github.com/gardener/gardener-extensions/hack/*
-	@chmod +x $(REPO_ROOT)/vendor/github.com/gardener/gardener-extensions/.ci/*
+	@chmod +x $(REPO_ROOT)/vendor/github.com/gardener/gardener-extensions/hack/.ci/*
 
 .PHONY: start
 start:

diff --git a/README.md b/README.md
@@ -44,16 +44,17 @@ Static code checks and tests can be executed by running `VERIFY=true make all`.
 
 ## Feedback and Support
 
-Feedback and contributions are always welcome. Please report bugs or suggestions as [GitHub issues](https://github.com/gardener/gardener-extensions/issues) or join our [Slack channel #gardener](https://kubernetes.slack.com/messages/gardener) (please invite yourself to the Kubernetes workspace [here](http://slack.k8s.io)).
+Feedback and contributions are always welcome. Please report bugs or suggestions as [GitHub issues](https://github.com/gardener/gardener-extension-provider-openstack/issues) or join our [Slack channel #gardener](https://kubernetes.slack.com/messages/gardener) (please invite yourself to the Kubernetes workspace [here](http://slack.k8s.io)).
 
 ## Learn more!
 
 Please find further resources about out project here:
 
 * [Our landing page gardener.cloud](https://gardener.cloud/)
 * ["Gardener, the Kubernetes Botanist" blog on kubernetes.io](https://kubernetes.io/blog/2018/05/17/gardener/)
+* ["Gardener Project Update" blog on kubernetes.io](https://kubernetes.io/blog/2019/12/02/gardener-project-update/)
 * [GEP-1 (Gardener Enhancement Proposal) on extensibility](https://github.com/gardener/gardener/blob/master/docs/proposals/01-extensibility.md)
 * [GEP-4 (New `core.gardener.cloud/v1alpha1` API)](https://github.com/gardener/gardener/blob/master/docs/proposals/04-new-core-gardener-cloud-apis.md)
-* [Extension contract documentation](https://github.com/gardener/gardener/tree/master/docs/extensions)
+* [Extensibility API documentation](https://github.com/gardener/gardener/tree/master/docs/extensions)
 * [Gardener Extensions Golang library](https://godoc.org/github.com/gardener/gardener-extensions/pkg)
 * [Gardener API Reference](https://gardener.cloud/api-reference/)
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/ahmetb/gen-crd-api-reference-docs v0.1.5
 	github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f
 	github.com/gardener/gardener v0.35.1-0.20200128130120-5b69a02f511a
-	github.com/gardener/gardener-extensions v1.2.1-0.20200130094329-f359bd0eb552
+	github.com/gardener/gardener-extensions v1.3.0
 	github.com/gardener/machine-controller-manager v0.25.1-0.20200115123605-0510de7ddfca
 	github.com/go-logr/logr v0.1.0
 	github.com/gobuffalo/packr/v2 v2.1.0

diff --git a/go.sum b/go.sum
diff --git a/hack/LICENSE_BOILERPLATE.txt b/hack/LICENSE_BOILERPLATE.txt
diff --git a/hack/generate-code b/hack/generate-code
@@ -24,7 +24,7 @@ bash "${PROJECT_ROOT}"/vendor/k8s.io/code-generator/generate-internal-groups.sh
   github.com/gardener/gardener-extension-provider-openstack/pkg/apis \
   github.com/gardener/gardener-extension-provider-openstack/pkg/apis \
   "openstack:v1alpha1" \
-  --go-header-file "${PROJECT_ROOT}/hack/LICENSE_BOILERPLATE.txt"
+  --go-header-file "${PROJECT_ROOT}/vendor/github.com/gardener/gardener-extensions/hack/LICENSE_BOILERPLATE.txt"
 
 bash "${PROJECT_ROOT}"/vendor/k8s.io/code-generator/generate-internal-groups.sh \
   conversion \
@@ -33,15 +33,15 @@ bash "${PROJECT_ROOT}"/vendor/k8s.io/code-generator/generate-internal-groups.sh
   github.com/gardener/gardener-extension-provider-openstack/pkg/apis \
   "openstack:v1alpha1" \
   --extra-peer-dirs=github.com/gardener/gardener-extension-provider-openstack/pkg/apis/openstack,github.com/gardener/gardener-extension-provider-openstack/pkg/apis/openstack/v1alpha1,k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/conversion,k8s.io/apimachinery/pkg/runtime \
-  --go-header-file "${PROJECT_ROOT}/hack/LICENSE_BOILERPLATE.txt"
+  --go-header-file "${PROJECT_ROOT}/vendor/github.com/gardener/gardener-extensions/hack/LICENSE_BOILERPLATE.txt"
 
 bash "${PROJECT_ROOT}"/vendor/k8s.io/code-generator/generate-internal-groups.sh \
   deepcopy,defaulter \
   github.com/gardener/gardener-extension-provider-openstack/pkg/client/componentconfig \
   github.com/gardener/gardener-extension-provider-openstack/pkg/apis \
   github.com/gardener/gardener-extension-provider-openstack/pkg/apis \
   "config:v1alpha1" \
-  --go-header-file "${PROJECT_ROOT}/hack/LICENSE_BOILERPLATE.txt"
+  --go-header-file "${PROJECT_ROOT}/vendor/github.com/gardener/gardener-extensions/hack/LICENSE_BOILERPLATE.txt"
 
 bash "${PROJECT_ROOT}"/vendor/k8s.io/code-generator/generate-internal-groups.sh \
   conversion \
@@ -50,4 +50,4 @@ bash "${PROJECT_ROOT}"/vendor/k8s.io/code-generator/generate-internal-groups.sh
   github.com/gardener/gardener-extension-provider-openstack/pkg/apis \
   "config:v1alpha1" \
   --extra-peer-dirs=github.com/gardener/gardener-extension-provider-openstack/pkg/apis/config,github.com/gardener/gardener-extension-provider-openstack/pkg/apis/config/v1alpha1,k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/conversion,k8s.io/apimachinery/pkg/runtime, github.com/gardener/gardener-extensions/pkg/controller/healthcheck/config/v1alpha1 \
-  --go-header-file "${PROJECT_ROOT}/hack/LICENSE_BOILERPLATE.txt"
+  --go-header-file "${PROJECT_ROOT}/vendor/github.com/gardener/gardener-extensions/hack/LICENSE_BOILERPLATE.txt"
diff --git a/hack/tools.go b/hack/tools.go
@@ -18,15 +18,16 @@
 package tools
 
 import (
-	_ "github.com/gardener/gardener-extensions/.ci"
 	_ "github.com/gardener/gardener-extensions/hack"
+	_ "github.com/gardener/gardener-extensions/hack/.ci"
 	_ "github.com/gardener/gardener-extensions/hack/api-reference/template"
 	_ "github.com/gardener/gardener-extensions/hack/code-generator"
 
 	_ "github.com/ahmetb/gen-crd-api-reference-docs"
 	_ "github.com/gobuffalo/packr/v2/packr2"
 	_ "github.com/golang/mock/mockgen"
 	_ "github.com/onsi/ginkgo/ginkgo"
+	_ "k8s.io/code-generator"
 	_ "k8s.io/code-generator/cmd/client-gen"
 	_ "k8s.io/code-generator/cmd/conversion-gen"
 	_ "k8s.io/code-generator/cmd/deepcopy-gen"

diff --git a/test/e2e/doc.go b/test/e2e/doc.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:generate go run netpol-gen/netpol-gen.go --go-header-file ../../hack/LICENSE_BOILERPLATE.txt --input-dirs ./netpol-gen/app --output-base networkpolicies
+//go:generate go run netpol-gen/netpol-gen.go --go-header-file ../../vendor/github.com/gardener/gardener-extensions/hack/LICENSE_BOILERPLATE.txt --input-dirs ./netpol-gen/app --output-base networkpolicies
 
 // Package e2e contain all network policies for OpenStack.
 package e2e
diff --git a/vendor/github.com/gardener/gardener-extensions/.ci/pipeline_definitions b/vendor/github.com/gardener/gardener-extensions/.ci/pipeline_definitions
diff --git a/vendor/github.com/gardener/gardener-extensions/NOTICE.md b/vendor/github.com/gardener/gardener-extensions/NOTICE.md
diff --git a/...om/gardener/gardener-extensions/.ci/ci.go → ...rdener/gardener-extensions/hack/.ci/ci.go b/...om/gardener/gardener-extensions/.ci/ci.go → ...rdener/gardener-extensions/hack/.ci/ci.go
diff --git a/...dener-extensions/.ci/component_descriptor → ...-extensions/hack/.ci/component_descriptor b/...dener-extensions/.ci/component_descriptor → ...-extensions/hack/.ci/component_descriptor
diff --git a/...r/gardener-extensions/.ci/prepare_release → ...dener-extensions/hack/.ci/prepare_release b/...r/gardener-extensions/.ci/prepare_release → ...dener-extensions/hack/.ci/prepare_release
diff --git a/...ner-extensions/.ci/set_dependency_version → ...xtensions/hack/.ci/set_dependency_version b/...ner-extensions/.ci/set_dependency_version → ...xtensions/hack/.ci/set_dependency_version
diff --git a/vendor/github.com/gardener/gardener-extensions/hack/check.sh b/vendor/github.com/gardener/gardener-extensions/hack/check.sh
diff --git a/vendor/github.com/gardener/gardener-extensions/hack/tools.go b/vendor/github.com/gardener/gardener-extensions/hack/tools.go
diff --git a/vendor/github.com/gardener/gardener-extensions/pkg/controller/worker/machines.go b/vendor/github.com/gardener/gardener-extensions/pkg/controller/worker/machines.go
diff --git a/...ener/gardener-extensions/test/e2e/framework/networkpolicies/generators/networkpolicies.go b/...ener/gardener-extensions/test/e2e/framework/networkpolicies/generators/networkpolicies.go
diff --git a/...ub.com/gardener/gardener-extensions/test/e2e/framework/networkpolicies/generators/tags.go b/...ub.com/gardener/gardener-extensions/test/e2e/framework/networkpolicies/generators/tags.go
diff --git a/vendor/github.com/gardener/gardener-extensions/test/integration/operation/shoot_operation.go b/vendor/github.com/gardener/gardener-extensions/test/integration/operation/shoot_operation.go
diff --git a/vendor/gopkg.in/ini.v1/ini.go b/vendor/gopkg.in/ini.v1/ini.go
diff --git a/vendor/gopkg.in/ini.v1/struct.go b/vendor/gopkg.in/ini.v1/struct.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -107,9 +107,9 @@ github.com/gardener/gardener/test/framework/config
 github.com/gardener/gardener/test/framework/reporter
 github.com/gardener/gardener/test/integration/framework
 github.com/gardener/gardener/test/integration/shoots
-# github.com/gardener/gardener-extensions v1.2.1-0.20200130094329-f359bd0eb552
-github.com/gardener/gardener-extensions/.ci
+# github.com/gardener/gardener-extensions v1.3.0
 github.com/gardener/gardener-extensions/hack
+github.com/gardener/gardener-extensions/hack/.ci
 github.com/gardener/gardener-extensions/hack/api-reference/template
 github.com/gardener/gardener-extensions/hack/code-generator
 github.com/gardener/gardener-extensions/pkg/controller
@@ -546,7 +546,7 @@ google.golang.org/appengine/urlfetch
 gopkg.in/fsnotify.v1
 # gopkg.in/inf.v0 v0.9.1
 gopkg.in/inf.v0
-# gopkg.in/ini.v1 v1.51.1
+# gopkg.in/ini.v1 v1.51.0
 gopkg.in/ini.v1
 # gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7
 gopkg.in/tomb.v1