Apply k8s 1.18.5 (#159)

flag/service/service.go

@@ -1,8 +1,8 @@
 package service
 
 import (
-	"github.com/giantswarm/operatorkit/controller"
-	"github.com/giantswarm/operatorkit/flag/service/kubernetes"
+	"github.com/giantswarm/operatorkit/v2/pkg/controller"
+	"github.com/giantswarm/operatorkit/v2/pkg/flag/service/kubernetes"
 
 	"github.com/giantswarm/prometheus-config-controller/flag/service/prometheus"
 	"github.com/giantswarm/prometheus-config-controller/flag/service/resource"

go.mod

@@ -4,47 +4,24 @@ go 1.13
 
 require (
 	github.com/davecgh/go-spew v1.1.1
-	github.com/giantswarm/apiextensions v0.2.0
+	github.com/giantswarm/apiextensions/v2 v2.1.0
 	github.com/giantswarm/backoff v0.2.0
-	github.com/giantswarm/k8sclient v0.2.0
+	github.com/giantswarm/k8sclient/v4 v4.0.0
 	github.com/giantswarm/microendpoint v0.2.0
-	github.com/giantswarm/microerror v0.2.0
+	github.com/giantswarm/microerror v0.2.1
 	github.com/giantswarm/microkit v0.2.0
 	github.com/giantswarm/micrologger v0.3.1
-	github.com/giantswarm/operatorkit v0.2.0
+	github.com/giantswarm/operatorkit v1.2.0
+	github.com/giantswarm/operatorkit/v2 v2.0.0
 	github.com/giantswarm/versionbundle v0.2.0
-	github.com/google/go-cmp v0.4.0
-	github.com/prometheus/client_golang v1.5.1
-	github.com/prometheus/common v0.9.2-0.20200303083015-6225330c4d5d
-	github.com/prometheus/prometheus v1.8.2-0.20200324163041-39e01b369dbd
+	github.com/google/go-cmp v0.5.1
+	github.com/prometheus/client_golang v1.7.1
+	github.com/prometheus/common v0.11.1
+	github.com/prometheus/prometheus v2.20.1+incompatible
 	github.com/spf13/afero v1.2.2
 	github.com/spf13/viper v1.6.2
-	gopkg.in/yaml.v2 v2.2.8
-	k8s.io/api v0.17.4
-	k8s.io/apimachinery v0.17.4
-	k8s.io/client-go v8.0.0+incompatible
-)
-
-replace (
-	k8s.io/api => k8s.io/api v0.0.0-20191114100352-16d7abae0d2a
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20191114105449-027877536833
-	k8s.io/apimachinery => k8s.io/apimachinery v0.16.5-beta.1
-	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20191114103151-9ca1dc586682
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20191114110141-0a35778df828
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20191114101535-6c5935290e33
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20191114112024-4bbba8331835
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20191114111741-81bb9acf592d
-	k8s.io/code-generator => k8s.io/code-generator v0.16.5-beta.1
-	k8s.io/component-base => k8s.io/component-base v0.0.0-20191114102325-35a9586014f7
-	k8s.io/cri-api => k8s.io/cri-api v0.16.5-beta.1
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20191114112310-0da609c4ca2d
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20191114103820-f023614fb9ea
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20191114111510-6d1ed697a64b
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20191114110717-50a77e50d7d9
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20191114111229-2e90afcb56c7
-	k8s.io/kubectl => k8s.io/kubectl v0.0.0-20191114113550-6123e1c827f7
-	k8s.io/kubelet => k8s.io/kubelet v0.0.0-20191114110954-d67a8e7e2200
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20191114112655-db9be3e678bb
-	k8s.io/metrics => k8s.io/metrics v0.0.0-20191114105837-a4a2842dc51b
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20191114104439-68caf20693ac
+	gopkg.in/yaml.v2 v2.3.0
+	k8s.io/api v0.18.5
+	k8s.io/apimachinery v0.18.5
+	k8s.io/client-go v0.18.5
 )

service/controller/prometheus.go

@@ -1,15 +1,17 @@
 package controller
 
 import (
-	"github.com/giantswarm/k8sclient"
+	"github.com/giantswarm/k8sclient/v4/pkg/k8sclient"
 	"github.com/giantswarm/microerror"
 	"github.com/giantswarm/micrologger"
-	"github.com/giantswarm/operatorkit/controller"
+	"github.com/giantswarm/operatorkit/v2/pkg/controller"
+	"github.com/giantswarm/operatorkit/v2/pkg/resource"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 
 	"github.com/giantswarm/prometheus-config-controller/pkg/project"
 	"github.com/giantswarm/prometheus-config-controller/service/controller/v1/key"
+	controllerresource "github.com/giantswarm/prometheus-config-controller/service/controller/v1/resource"
 )
 
 type PrometheusConfig struct {
@@ -65,12 +67,12 @@ func NewPrometheus(config PrometheusConfig) (*Prometheus, error) {
 
 	var err error
 
-	var resourceSet *controller.ResourceSet
+	var resources []resource.Interface
 	{
-		c := prometheusResourceSetConfig{
-			K8sClient: config.K8sClient.K8sClient(),
-			Logger:    config.Logger,
+		c := controllerresource.Config{
 
+			K8sClient:          config.K8sClient.K8sClient(),
+			Logger:             config.Logger,
 			ConfigMapKey:       config.ConfigMapKey,
 			ConfigMapName:      config.ConfigMapName,
 			ConfigMapNamespace: config.ConfigMapNamespace,
@@ -80,8 +82,7 @@ func NewPrometheus(config PrometheusConfig) (*Prometheus, error) {
 			CertPermission:     config.CertPermission,
 			PrometheusAddress:  config.PrometheusAddress,
 		}
-
-		resourceSet, err = newPrometheusResourceSet(c)
+		resources, err = controllerresource.New(c)
 		if err != nil {
 			return nil, microerror.Mask(err)
 		}
@@ -94,13 +95,10 @@ func NewPrometheus(config PrometheusConfig) (*Prometheus, error) {
 			NewRuntimeObjectFunc: func() runtime.Object {
 				return new(corev1.Service)
 			},
-			Logger: config.Logger,
-			ResourceSets: []*controller.ResourceSet{
-				resourceSet,
-			},
-			Selector: key.LabelSelectorService(),
-
-			Name: project.Name(),
+			Logger:    config.Logger,
+			Resources: resources,
+			Selector:  key.LabelSelectorService(),
+			Name:      project.Name(),
 		}
 
 		operatorkitController, err = controller.New(c)

service/controller/v1/prometheus/testdata/scrapeconfig.golden

@@ -377,8 +377,7 @@
     replacement: guest
   - target_label: __address__
     replacement: master.xa5ly:443
-  - source_labels: [namespace, pod_name, __meta_kubernetes_service_annotation_giantswarm_io_monitoring_port,
-      __meta_kubernetes_service_annotation_giantswarm_io_monitoring_path]
+  - source_labels: [namespace, pod_name, __meta_kubernetes_service_annotation_giantswarm_io_monitoring_port, __meta_kubernetes_service_annotation_giantswarm_io_monitoring_path]
     regex: (.*);(.*);(.*);(.*)
     target_label: __metrics_path__
     replacement: /api/v1/namespaces/${1}/pods/${2}:${3}/proxy/${4}

service/controller/v1/resource/certificate/delete.go

@@ -3,7 +3,7 @@ package certificate
 import (
 	"context"
 
-	"github.com/giantswarm/operatorkit/resource/crud"
+	"github.com/giantswarm/operatorkit/v2/pkg/resource/crud"
 )
 
 func (r *Resource) NewDeletePatch(ctx context.Context, obj, currentState, desiredState interface{}) (*crud.Patch, error) {

service/controller/v1/resource/certificate/desired.go

@@ -25,7 +25,7 @@ func (r *Resource) GetDesiredState(ctx context.Context, obj interface{}) (interf
 	r.logger.LogCtx(ctx, "debug", "fetching all services")
 
 	servicesTimer := prometheusclient.NewTimer(kubernetesResource.WithLabelValues("services", "list"))
-	services, err := r.k8sClient.CoreV1().Services("").List(metav1.ListOptions{
+	services, err := r.k8sClient.CoreV1().Services("").List(ctx, metav1.ListOptions{
 		LabelSelector: serviceLabelSelector,
 	})
 	servicesTimer.ObserveDuration()
@@ -44,7 +44,7 @@ func (r *Resource) GetDesiredState(ctx context.Context, obj interface{}) (interf
 		clusterID := prometheus.GetClusterID(service)
 
 		certificatesTimer := prometheusclient.NewTimer(kubernetesResource.WithLabelValues("secrets", "list"))
-		certificates, err := r.k8sClient.CoreV1().Secrets(r.certNamespace).List(metav1.ListOptions{
+		certificates, err := r.k8sClient.CoreV1().Secrets(r.certNamespace).List(ctx, metav1.ListOptions{
 			LabelSelector: fmt.Sprintf(
 				"clusterComponent=%s, clusterID=%s",
 				r.certComponentName,

service/controller/v1/resource/certificate/desired_test.go

@@ -423,13 +423,13 @@ func Test_Resource_Certificate_GetDesiredState(t *testing.T) {
 		}
 
 		for _, service := range test.services {
-			if _, err := fakeK8sClient.CoreV1().Services(service.Namespace).Create(service); err != nil {
+			if _, err := fakeK8sClient.CoreV1().Services(service.Namespace).Create(context.TODO(), service, metav1.CreateOptions{}); err != nil {
 				t.Fatalf("%d: error returned creating service: %s\n", index, err)
 			}
 		}
 
 		for _, secret := range test.secrets {
-			if _, err := fakeK8sClient.CoreV1().Secrets(secret.Namespace).Create(secret); err != nil {
+			if _, err := fakeK8sClient.CoreV1().Secrets(secret.Namespace).Create(context.TODO(), secret, metav1.CreateOptions{}); err != nil {
 				t.Fatalf("%d: error returned creating secret: %s\n", index, err)
 			}
 		}

service/controller/v1/resource/certificate/update.go

@@ -7,7 +7,7 @@ import (
 	"reflect"
 
 	"github.com/giantswarm/microerror"
-	"github.com/giantswarm/operatorkit/resource/crud"
+	"github.com/giantswarm/operatorkit/v2/pkg/resource/crud"
 	"github.com/spf13/afero"
 )
 

service/controller/v1/resource/configmap/current.go

@@ -17,6 +17,7 @@ func (r *Resource) getCurrentState(ctx context.Context) (*corev1.ConfigMap, erro
 	r.logger.LogCtx(ctx, "debug", fmt.Sprintf("fetching configmap: %s/%s", r.configMapNamespace, r.configMapName))
 
 	configMap, err := r.k8sClient.CoreV1().ConfigMaps(r.configMapNamespace).Get(
+		ctx,
 		r.configMapName, metav1.GetOptions{},
 	)
 

service/controller/v1/resource/configmap/desired.go

@@ -20,6 +20,7 @@ func (r *Resource) getDesiredState(ctx context.Context) (*corev1.ConfigMap, erro
 	r.logger.LogCtx(ctx, "debug", fmt.Sprintf("fetching configmap: %s/%s", r.configMapNamespace, r.configMapName))
 
 	configMap, err := r.k8sClient.CoreV1().ConfigMaps(r.configMapNamespace).Get(
+		ctx,
 		r.configMapName, metav1.GetOptions{},
 	)
 
@@ -41,7 +42,7 @@ func (r *Resource) getDesiredState(ctx context.Context) (*corev1.ConfigMap, erro
 
 	r.logger.LogCtx(ctx, "debug", fmt.Sprintf("fetching all services"))
 
-	services, err := r.k8sClient.CoreV1().Services("").List(metav1.ListOptions{
+	services, err := r.k8sClient.CoreV1().Services("").List(ctx, metav1.ListOptions{
 		LabelSelector: key.LabelSelectorService().String(),
 	})
 

service/controller/v1/resource/configmap/configmap.go → service/controller/v1/resource/configmap/resource.go

@@ -7,6 +7,7 @@ import (
 	"github.com/giantswarm/microerror"
 	"github.com/giantswarm/micrologger"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 )
 
@@ -97,9 +98,9 @@ func (r *Resource) ensure(ctx context.Context, obj interface{}) error {
 			return nil
 		}
 
-		r.k8sClient.CoreV1().ConfigMaps(cm.GetNamespace()).Update(cm)
+		r.k8sClient.CoreV1().ConfigMaps(cm.GetNamespace()).Update(ctx, cm, metav1.UpdateOptions{})
 		if apierrors.IsNotFound(err) {
-			r.k8sClient.CoreV1().ConfigMaps(cm.GetNamespace()).Create(cm)
+			r.k8sClient.CoreV1().ConfigMaps(cm.GetNamespace()).Create(ctx, cm, metav1.CreateOptions{})
 			if err != nil {
 				return microerror.Mask(err)
 			}

service/controller/v1/resource/reload/resource.go

@@ -87,7 +87,7 @@ func (r *Resource) ensure(ctx context.Context, obj interface{}) error {
 	{
 		r.logger.LogCtx(ctx, "level", "debug", "message", fmt.Sprintf("finding %#q ConfigMap in namespace %#q", r.configMapName, r.configMapNamespace))
 
-		cm, err = r.k8sClient.CoreV1().ConfigMaps(r.configMapNamespace).Get(r.configMapName, metav1.GetOptions{})
+		cm, err = r.k8sClient.CoreV1().ConfigMaps(r.configMapNamespace).Get(ctx, r.configMapName, metav1.GetOptions{})
 		if err != nil {
 			return microerror.Mask(err)
 		}

service/controller/prometheus_resource_set.go → service/controller/v1/resource/resource.go

@@ -1,24 +1,22 @@
-package controller
+package resource
 
 import (
 	"os"
 
 	"github.com/giantswarm/microerror"
 	"github.com/giantswarm/micrologger"
-	"github.com/giantswarm/operatorkit/controller"
-	"github.com/giantswarm/operatorkit/resource"
-	"github.com/giantswarm/operatorkit/resource/crud"
-	"github.com/giantswarm/operatorkit/resource/wrapper/metricsresource"
-	"github.com/giantswarm/operatorkit/resource/wrapper/retryresource"
-	"github.com/spf13/afero"
-	"k8s.io/client-go/kubernetes"
-
+	"github.com/giantswarm/operatorkit/v2/pkg/resource"
+	"github.com/giantswarm/operatorkit/v2/pkg/resource/crud"
+	"github.com/giantswarm/operatorkit/v2/pkg/resource/wrapper/metricsresource"
+	"github.com/giantswarm/operatorkit/v2/pkg/resource/wrapper/retryresource"
 	"github.com/giantswarm/prometheus-config-controller/service/controller/v1/resource/certificate"
 	"github.com/giantswarm/prometheus-config-controller/service/controller/v1/resource/configmap"
 	"github.com/giantswarm/prometheus-config-controller/service/controller/v1/resource/reload"
+	"github.com/spf13/afero"
+	"k8s.io/client-go/kubernetes"
 )
 
-type prometheusResourceSetConfig struct {
+type Config struct {
 	K8sClient kubernetes.Interface
 	Logger    micrologger.Logger
 
@@ -32,7 +30,7 @@ type prometheusResourceSetConfig struct {
 	PrometheusAddress  string
 }
 
-func newPrometheusResourceSet(config prometheusResourceSetConfig) (*controller.ResourceSet, error) {
+func New(config Config) ([]resource.Interface, error) {
 	var err error
 
 	var certificateResource resource.Interface
@@ -113,34 +111,17 @@ func newPrometheusResourceSet(config prometheusResourceSetConfig) (*controller.R
 
 	{
 		c := metricsresource.WrapConfig{}
-		resources, err = metricsresource.Wrap(resources, c)
-		if err != nil {
-			return nil, microerror.Mask(err)
-		}
-	}
-
-	handlesFunc := func(obj interface{}) bool {
-		return true
-	}
-
-	var resourceSet *controller.ResourceSet
-	{
-		c := controller.ResourceSetConfig{
-			Handles:   handlesFunc,
-			Logger:    config.Logger,
-			Resources: resources,
-		}
 
-		resourceSet, err = controller.NewResourceSet(c)
+		resources, err = metricsresource.Wrap(resources, c)
 		if err != nil {
 			return nil, microerror.Mask(err)
 		}
 	}
 
-	return resourceSet, nil
+	return resources, nil
 }
 
-func toCRUDResource(logger micrologger.Logger, ops crud.Interface) (resource.Interface, error) {
+func toCRUDResource(logger micrologger.Logger, ops crud.Interface) (*crud.Resource, error) {
 	c := crud.ResourceConfig{
 		CRUD:   ops,
 		Logger: logger,

service/service.go

@@ -7,10 +7,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/giantswarm/apiextensions/pkg/apis/core/v1alpha1"
+	"github.com/giantswarm/apiextensions/v2/pkg/apis/core/v1alpha1"
 	"github.com/giantswarm/backoff"
-	"github.com/giantswarm/k8sclient"
-	"github.com/giantswarm/k8sclient/k8srestconfig"
+	"github.com/giantswarm/k8sclient/v4/pkg/k8sclient"
+	"github.com/giantswarm/k8sclient/v4/pkg/k8srestconfig"
 	"github.com/giantswarm/microendpoint/service/version"
 	"github.com/giantswarm/microerror"
 	"github.com/giantswarm/micrologger"