Merge pull request #22 from rmohr/api-package

Introduce a separate api package to minimize dependencies on the consumer side

api/go.mod

@@ -0,0 +1,27 @@
+module kubevirt.io/controller-lifecycle-operator-sdk/api
+
+go 1.17
+
+require (
+	github.com/openshift/custom-resource-status v1.1.2
+	k8s.io/api v0.23.5
+)
+
+require (
+	github.com/go-logr/logr v1.2.2 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/google/go-cmp v0.5.5 // indirect
+	github.com/google/gofuzz v1.1.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
+	golang.org/x/text v0.3.7 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	k8s.io/apimachinery v0.23.5 // indirect
+	k8s.io/klog/v2 v2.40.1 // indirect
+	k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
+	sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
+)

examples/sample-operator/build/operator/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.14 AS builder
+FROM golang:1.17 AS builder
 WORKDIR /src/sample-operator/
 COPY . .
 ENV GOFLAGS=-mod=vendor

examples/sample-operator/cluster/common.sh

@@ -10,9 +10,9 @@ function debug {
 
 # Install golang
 function ensure_golang {
-    GOVERSION='go1.14.2.linux-amd64.tar.gz'
+    GOVERSION='go1.17.5.linux-amd64.tar.gz'
     if [[ "$(go version 2>&1)" =~ "not found" ]]; then
         wget -q https://dl.google.com/go/${GOVERSION}
         tar -C /usr/local -xzf ${GOVERSION}
     fi
-}
+}

examples/sample-operator/go.mod

@@ -4,29 +4,32 @@ go 1.13
 
 require (
 	github.com/kelseyhightower/envconfig v1.4.0
-	github.com/onsi/ginkgo v1.15.0
-	github.com/onsi/gomega v1.10.5
+	github.com/onsi/ginkgo v1.16.5
+	github.com/onsi/gomega v1.19.0
 	github.com/operator-framework/operator-sdk v0.18.0
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/pflag v1.0.5
-	golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e
-	k8s.io/api v0.20.2
-	k8s.io/apimachinery v0.20.2
+	golang.org/x/tools v0.1.10
+	k8s.io/api v0.23.5
+	k8s.io/apimachinery v0.23.5
 	k8s.io/client-go v12.0.0+incompatible
-	k8s.io/code-generator v0.20.2
+	k8s.io/code-generator v0.23.5
 	kubevirt.io/client-go v0.32.0
 	kubevirt.io/controller-lifecycle-operator-sdk v0.0.7
-	sigs.k8s.io/controller-runtime v0.8.3
+	kubevirt.io/controller-lifecycle-operator-sdk/api v0.0.0-00010101000000-000000000000
+	sigs.k8s.io/controller-runtime v0.11.1
 )
 
-replace k8s.io/client-go => k8s.io/client-go v0.20.2
+replace k8s.io/client-go => k8s.io/client-go v0.23.5
 
-replace k8s.io/api => k8s.io/api v0.20.2
+replace k8s.io/api => k8s.io/api v0.23.5
 
-replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.2
+replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.5
 
-replace k8s.io/kubectl => k8s.io/kubectl v0.20.2
+replace k8s.io/kubectl => k8s.io/kubectl v0.23.5
 
 replace vbom.ml/util => github.com/fvbommel/util v0.0.0-20180919145318-efcd4e0f9787
 
 replace kubevirt.io/controller-lifecycle-operator-sdk => ../../
+
+replace kubevirt.io/controller-lifecycle-operator-sdk/api => ../../api

examples/sample-operator/pkg/apis/sample/v1alpha1/sampleconfig_types.go

@@ -2,7 +2,7 @@ package v1alpha1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	sdkapi "kubevirt.io/controller-lifecycle-operator-sdk/pkg/sdk/api"
+	sdkapi "kubevirt.io/controller-lifecycle-operator-sdk/api"
 )
 
 // SampleConfigSpec defines the desired state of SampleConfig

examples/sample-operator/pkg/controller/sampleconfig/cr-manager.go

@@ -7,8 +7,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	sdkapi "kubevirt.io/controller-lifecycle-operator-sdk/api"
 	"kubevirt.io/controller-lifecycle-operator-sdk/examples/sample-operator/pkg/apis/sample/v1alpha1"
-	sdkapi "kubevirt.io/controller-lifecycle-operator-sdk/pkg/sdk/api"
 	"kubevirt.io/controller-lifecycle-operator-sdk/pkg/sdk/resources"
 )
 

examples/sample-operator/pkg/controller/sampleconfig/cr-manager_test.go

@@ -3,9 +3,9 @@ package sampleconfig_test
 import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	sdkapi "kubevirt.io/controller-lifecycle-operator-sdk/api"
 	"kubevirt.io/controller-lifecycle-operator-sdk/examples/sample-operator/pkg/apis/sample/v1alpha1"
 	"kubevirt.io/controller-lifecycle-operator-sdk/examples/sample-operator/pkg/controller/sampleconfig"
-	sdkapi "kubevirt.io/controller-lifecycle-operator-sdk/pkg/sdk/api"
 )
 
 var _ = Describe("Controller CR manager", func() {

examples/sample-operator/tests/framework/sample-config.go

@@ -5,8 +5,8 @@ import (
 
 	"k8s.io/apimachinery/pkg/api/errors"
 
+	sdkapi "kubevirt.io/controller-lifecycle-operator-sdk/api"
 	"kubevirt.io/controller-lifecycle-operator-sdk/examples/sample-operator/pkg/apis/sample/v1alpha1"
-	sdkapi "kubevirt.io/controller-lifecycle-operator-sdk/pkg/sdk/api"
 
 	v1meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

examples/sample-operator/tests/operator/operator_lifecycle_test.go

@@ -8,7 +8,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/api/errors"
 
-	sdkapi "kubevirt.io/controller-lifecycle-operator-sdk/pkg/sdk/api"
+	sdkapi "kubevirt.io/controller-lifecycle-operator-sdk/api"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"