Bump oneinfra dependency

Author: ereslibre

api/go.mod

@@ -5,14 +5,14 @@ go 1.14
 require (
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/gorilla/mux v1.7.4
-	github.com/oneinfra/oneinfra v0.0.0-20200511213016-abeecf2a76ac
+	github.com/oneinfra/oneinfra v0.0.0-20200512173005-c13efb1384f6
 	github.com/pkg/errors v0.9.1
 	github.com/urfave/cli/v2 v2.2.0
 	golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37
-	k8s.io/api v0.17.4
-	k8s.io/apimachinery v0.17.4
-	k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90
-	k8s.io/cluster-bootstrap v0.17.4
+	k8s.io/api v0.18.2
+	k8s.io/apimachinery v0.18.2
+	k8s.io/client-go v0.18.2
+	k8s.io/cluster-bootstrap v0.18.2
 	k8s.io/klog v1.0.0
 	sigs.k8s.io/yaml v1.2.0
 )

api/go.sum

@@ -19,7 +19,7 @@ package internal
 import (
 	"k8s.io/client-go/kubernetes"
 
-	oneinfra "github.com/oneinfra/oneinfra/pkg/clientset/manager"
+	oneinfra "github.com/oneinfra/oneinfra/pkg/clientsets/manager"
 )
 
 var (

api/internal/constants.go

@@ -17,18 +17,22 @@
 package internal
 
 import (
+	"context"
+
 	v1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 func EnsureUserNamespace(userNamespace string) error {
 	_, err := KubernetesClientset.CoreV1().Namespaces().Create(
+		context.TODO(),
 		&v1.Namespace{
 			ObjectMeta: metav1.ObjectMeta{
 				Name: userNamespace,
 			},
 		},
+		metav1.CreateOptions{},
 	)
 	if err != nil && !apierrors.IsAlreadyExists(err) {
 		return err

api/internal/kubernetes.go

@@ -17,6 +17,7 @@
 package kubernetes
 
 import (
+	"context"
 	"errors"
 	"fmt"
 
@@ -36,6 +37,7 @@ func RetrieveUser(loginRequest LoginRequest) (internal.User, error) {
 	userSecret, err := internal.KubernetesClientset.CoreV1().Secrets(
 		constants.OneInfraUsersNamespace,
 	).Get(
+		context.TODO(),
 		loginRequest.Username,
 		metav1.GetOptions{},
 	)

api/internal/kubernetes/user.go

@@ -17,6 +17,7 @@
 package internal
 
 import (
+	"context"
 	"fmt"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -30,6 +31,7 @@ func (user User) Clusters() (*clusterv1alpha1.ClusterList, error) {
 	return OneInfraClientset.ClusterV1alpha1().Clusters(
 		user.Namespace(),
 	).List(
+		context.TODO(),
 		metav1.ListOptions{},
 	)
 }
@@ -38,6 +40,7 @@ func (user User) CreateCluster(name, kubernetesVersion string, replicas int) err
 	_, err := OneInfraClientset.ClusterV1alpha1().Clusters(
 		user.Namespace(),
 	).Create(
+		context.TODO(),
 		&clusterv1alpha1.Cluster{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      name,
@@ -48,6 +51,7 @@ func (user User) CreateCluster(name, kubernetesVersion string, replicas int) err
 				ControlPlaneReplicas: replicas,
 			},
 		},
+		metav1.CreateOptions{},
 	)
 	return err
 }
@@ -69,7 +73,9 @@ func (user User) UpdateCluster(cluster *clusterv1alpha1.Cluster) error {
 	_, err := OneInfraClientset.ClusterV1alpha1().Clusters(
 		user.Namespace(),
 	).Update(
+		context.TODO(),
 		cluster,
+		metav1.UpdateOptions{},
 	)
 	return err
 }
@@ -78,15 +84,17 @@ func (user User) DeleteCluster(clusterName string) error {
 	return OneInfraClientset.ClusterV1alpha1().Clusters(
 		user.Namespace(),
 	).Delete(
+		context.TODO(),
 		clusterName,
-		&metav1.DeleteOptions{},
+		metav1.DeleteOptions{},
 	)
 }
 
 func (user User) ClusterComponents(clusterName string) (*clusterv1alpha1.ComponentList, error) {
 	return OneInfraClientset.ClusterV1alpha1().Components(
 		user.Namespace(),
 	).List(
+		context.TODO(),
 		metav1.ListOptions{
 			LabelSelector: fmt.Sprintf("%s=%s", constants.OneInfraClusterNameLabelName, clusterName),
 		},

api/internal/oneinfra.go

@@ -17,6 +17,7 @@
 package main
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"log"
@@ -38,7 +39,7 @@ import (
 	"github.com/oneinfra/console/api/handlers"
 	"github.com/oneinfra/console/api/internal"
 	"github.com/oneinfra/console/api/internal/endpoints/auth"
-	oneinfra "github.com/oneinfra/oneinfra/pkg/clientset/manager"
+	oneinfra "github.com/oneinfra/oneinfra/pkg/clientsets/manager"
 	constantsapi "github.com/oneinfra/oneinfra/pkg/constants"
 	"github.com/oneinfra/oneinfra/pkg/versions"
 )
@@ -119,18 +120,19 @@ func initializeClientsets() {
 }
 
 func initializeKubernetesVersions() {
-	configMap, err := internal.KubernetesClientset.CoreV1().ConfigMaps(
+	versionsConfigMap, err := internal.KubernetesClientset.CoreV1().ConfigMaps(
 		constantsapi.OneInfraNamespace,
 	).Get(
-		constantsapi.OneInfraVersionConfigMap,
+		context.TODO(),
+		constantsapi.OneInfraVersionsConfigMap,
 		metav1.GetOptions{},
 	)
 	if err != nil {
-		klog.Fatalf("could not read versions from ConfigMap %q", constantsapi.OneInfraVersionConfigMap)
+		klog.Fatalf("could not read versions from ConfigMap %q", constantsapi.OneInfraVersionsConfigMap)
 	}
-	rawReleaseInfo, exists := configMap.Data[constantsapi.OneInfraVersionsKeyName]
+	rawReleaseInfo, exists := versionsConfigMap.Data[constantsapi.OneInfraVersionsKeyName]
 	if !exists {
-		klog.Fatalf("ConfigMap %q does not contain a %q key", constantsapi.OneInfraVersionConfigMap, constantsapi.OneInfraVersionsKeyName)
+		klog.Fatalf("ConfigMap %q does not contain a %q key", constantsapi.OneInfraVersionsConfigMap, constantsapi.OneInfraVersionsKeyName)
 	}
 	var releaseInfo versions.ReleaseInfo
 	if err := yaml.Unmarshal([]byte(rawReleaseInfo), &releaseInfo); err != nil {