Merge pull request #244 from timuthy/enhancement.go-mod

Remove API sub-module

.ci/pipeline_definitions

@@ -45,7 +45,6 @@ etcd-druid:
           nextversion: 'bump_minor'
           git_tags:
           - ref_template: 'refs/tags/{VERSION}'
-          - ref_template: 'refs/tags/api/{VERSION}'
         slack:
           default_channel: 'internal_scp_workspace'
           channel_cfgs:

.ci/test

@@ -159,7 +159,7 @@ function test_with_coverage() {
 fetch_envtest_tools "$kb_root_dir"
 setup_envtest_env "$kb_root_dir"
 
-TEST_PACKAGES="api api_tests controllers pkg"
+TEST_PACKAGES="api controllers pkg"
 GINKGO_COMMON_FLAGS="-r -timeout=1h0m0s --randomizeAllSpecs --randomizeSuites --failOnPending --progress"
 if [ -z $COVER ] || [ "$COVER" = false ] ; then
   echo "[INFO] Test coverage is disabled."

Makefile

@@ -27,7 +27,6 @@ CRD_OPTIONS ?= "crd:trivialVersions=true"
 
 .PHONY: revendor
 revendor:
-	@cd "$(REPO_ROOT)/api" && go mod tidy
 	@env GO111MODULE=on go mod vendor
 	@env GO111MODULE=on go mod tidy
 	@chmod +x "$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/"*
@@ -65,7 +64,7 @@ deploy: manifests
 # Generate manifests e.g. CRD, RBAC etc.
 .PHONY: manifests
 manifests:
-	@cd "$(REPO_ROOT)/api" && controller-gen $(CRD_OPTIONS) paths="./..." output:crd:artifacts:config=../config/crd/bases
+	@controller-gen $(CRD_OPTIONS) paths="./api/..." output:crd:artifacts:config="./config/crd/bases"
 	@controller-gen rbac:roleName=manager-role paths="./controllers/..."
 
 # Run go fmt against code
@@ -80,8 +79,7 @@ clean:
 # Check packages
 .PHONY: check
 check:
-	@cd "$(REPO_ROOT)/api" && "$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/check.sh" --golangci-lint-config=../.golangci.yaml ./...
-	@"$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/check.sh" --golangci-lint-config=./.golangci.yaml ./pkg/... ./controllers/...
+	@"$(REPO_ROOT)/vendor/github.com/gardener/gardener/hack/check.sh" --golangci-lint-config=./.golangci.yaml ./api/... ./pkg/... ./controllers/...
 
 .PHONY: check-generate
 check-generate:

api_tests/v1alpha1/etcd_types_test.go → api/v1alpha1/etcd_types_test.go

@@ -14,22 +14,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1alpha1_test
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
 	"context"
 	"time"
 
-	druidv1alpha1 "github.com/gardener/etcd-druid/api/v1alpha1"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 
-	"k8s.io/apimachinery/pkg/api/resource"
-
-	corev1 "k8s.io/api/core/v1"
+	. "github.com/gardener/etcd-druid/api/v1alpha1"
 )
 
 // These tests are written in BDD-style using Ginkgo framework. Refer to
@@ -38,7 +36,7 @@ import (
 var _ = Describe("Etcd", func() {
 	var (
 		key              types.NamespacedName
-		created, fetched *druidv1alpha1.Etcd
+		created, fetched *Etcd
 	)
 
 	BeforeEach(func() {
@@ -66,7 +64,7 @@ var _ = Describe("Etcd", func() {
 			By("creating an API obj")
 			Expect(k8sClient.Create(context.TODO(), created)).To(Succeed())
 
-			fetched = &druidv1alpha1.Etcd{}
+			fetched = &Etcd{}
 			Expect(k8sClient.Get(context.TODO(), key, fetched)).To(Succeed())
 			Expect(fetched).To(Equal(created))
 
@@ -79,12 +77,12 @@ var _ = Describe("Etcd", func() {
 
 })
 
-func getEtcd(name, namespace string) *druidv1alpha1.Etcd {
+func getEtcd(name, namespace string) *Etcd {
 	var (
-		clientPort  int32                      = 2379
-		serverPort  int32                      = 2380
-		backupPort  int32                      = 8080
-		metricLevel druidv1alpha1.MetricsLevel = druidv1alpha1.Basic
+		clientPort  int32        = 2379
+		serverPort  int32        = 2380
+		backupPort  int32        = 8080
+		metricLevel MetricsLevel = Basic
 	)
 
 	garbageCollectionPeriod := metav1.Duration{
@@ -102,11 +100,11 @@ func getEtcd(name, namespace string) *druidv1alpha1.Etcd {
 	deltaSnapShotMemLimit := resource.MustParse("100Mi")
 	quota := resource.MustParse("8Gi")
 	storageClass := "gardener.cloud-fast"
-	provider := druidv1alpha1.StorageProvider("aws")
+	provider := StorageProvider("aws")
 	prefix := "etcd-test"
-	garbageCollectionPolicy := druidv1alpha1.GarbageCollectionPolicy(druidv1alpha1.GarbageCollectionPolicyExponential)
+	garbageCollectionPolicy := GarbageCollectionPolicy(GarbageCollectionPolicyExponential)
 
-	tlsConfig := &druidv1alpha1.TLSConfig{
+	tlsConfig := &TLSConfig{
 		ClientTLSSecretRef: corev1.SecretReference{
 			Name: "etcd-client-tls",
 		},
@@ -118,12 +116,12 @@ func getEtcd(name, namespace string) *druidv1alpha1.Etcd {
 		},
 	}
 
-	instance := &druidv1alpha1.Etcd{
+	instance := &Etcd{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      name,
 			Namespace: namespace,
 		},
-		Spec: druidv1alpha1.EtcdSpec{
+		Spec: EtcdSpec{
 			Annotations: map[string]string{
 				"app":  "etcd-statefulset",
 				"role": "test",
@@ -143,7 +141,7 @@ func getEtcd(name, namespace string) *druidv1alpha1.Etcd {
 			StorageClass:    &storageClass,
 			StorageCapacity: &storageCapacity,
 
-			Backup: druidv1alpha1.BackupSpec{
+			Backup: BackupSpec{
 				Image:                    &imageBR,
 				Port:                     &backupPort,
 				FullSnapshotSchedule:     &snapshotSchedule,
@@ -162,7 +160,7 @@ func getEtcd(name, namespace string) *druidv1alpha1.Etcd {
 						"memory": parseQuantity("128Mi"),
 					},
 				},
-				Store: &druidv1alpha1.StoreSpec{
+				Store: &StoreSpec{
 					SecretRef: &corev1.SecretReference{
 						Name: "etcd-backup",
 					},
@@ -171,7 +169,7 @@ func getEtcd(name, namespace string) *druidv1alpha1.Etcd {
 					Prefix:    prefix,
 				},
 			},
-			Etcd: druidv1alpha1.EtcdConfig{
+			Etcd: EtcdConfig{
 				Quota:                   &quota,
 				Metrics:                 &metricLevel,
 				Image:                   &imageEtcd,

api_tests/v1alpha1/suite_test.go → api/v1alpha1/suite_test.go

@@ -14,24 +14,23 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1alpha1_test
 
 import (
 	"path/filepath"
 	"testing"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-
-	druidv1alpha1 "github.com/gardener/etcd-druid/api/v1alpha1"
-
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+
+	. "github.com/gardener/etcd-druid/api/v1alpha1"
 )
 
 // These tests use Ginkgo (BDD-style Go testing framework). Refer to
@@ -59,7 +58,7 @@ var _ = BeforeSuite(func(done Done) {
 		CRDDirectoryPaths: []string{filepath.Join("..", "..", "config", "crd", "bases")},
 	}
 
-	err := druidv1alpha1.SchemeBuilder.AddToScheme(scheme.Scheme)
+	err := SchemeBuilder.AddToScheme(scheme.Scheme)
 	Expect(err).NotTo(HaveOccurred())
 
 	cfg, err = testEnv.Start()

config/crd/bases/druid.gardener.cloud_etcds.yaml

@@ -49,9 +49,6 @@ spec:
                   backupCompactionSchedule:
                     description: BackupCompactionSchedule defines the cron standard for compacting the snapstore
                     type: string
-                  etcdSnapshotTimeout:
-                    description: EtcdSnapshotTimeout defines the timeout duration for etcd FullSnapshot operation
-                    type: string
                   compression:
                     description: SnapshotCompression defines the specification for compression of Snapshots.
                     properties:
@@ -78,6 +75,9 @@ spec:
                   enableProfiling:
                     description: EnableProfiling defines if profiling should be enabled for the etcd-backup-restore-sidecar
                     type: boolean
+                  etcdSnapshotTimeout:
+                    description: EtcdSnapshotTimeout defines the timeout duration for etcd FullSnapshot operation
+                    type: string
                   fullSnapshotSchedule:
                     description: FullSnapshotSchedule defines the cron standard schedule for full snapshots.
                     type: string

go.mod

@@ -3,7 +3,6 @@ module github.com/gardener/etcd-druid
 go 1.16
 
 require (
-	github.com/gardener/etcd-druid/api v0.0.0-00010101000000-000000000000
 	github.com/gardener/gardener v1.23.0
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-logr/logr v0.3.0
@@ -20,7 +19,6 @@ require (
 )
 
 replace (
-	github.com/gardener/etcd-druid/api => ./api
 	k8s.io/api => k8s.io/api v0.19.6
 	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.6
 	k8s.io/apimachinery => k8s.io/apimachinery v0.19.6