Skip to content

Commit

Permalink
Merge pull request #162 from cosmopetrich/kube-client-1.10
Browse files Browse the repository at this point in the history 
Upgrade k8s client libs to 1.10
  • Loading branch information
@alexsomesan
alexsomesan authored Oct 4, 2018
2 parents d6612e5 + 2f76dc2 commit 523ef33
Show file tree
Hide file tree
Showing 1,230 changed files with 236,200 additions and 328,190 deletions.
2 changes: 1 addition & 1 deletion kubernetes/event_helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"log"
"sort"

api "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/api/v1"
)

func getLastWarningsForObject(conn *kubernetes.Clientset, metadata meta_v1.ObjectMeta, kind string, limit int) ([]api.Event, error) {
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/provider_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/hashicorp/terraform/terraform"
"github.com/terraform-providers/terraform-provider-aws/aws"
"github.com/terraform-providers/terraform-provider-google/google"
api "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/api/v1"
)

var testAccProviders map[string]terraform.ResourceProvider
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/resource_kubernetes_config_map.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"log"

"github.com/hashicorp/terraform/helper/schema"
api "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
pkgApi "k8s.io/apimachinery/pkg/types"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/api/v1"
)

func resourceKubernetesConfigMap() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/resource_kubernetes_config_map_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
api "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/api/v1"
)

func TestAccKubernetesConfigMap_basic(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/resource_kubernetes_horizontal_pod_autoscaler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"log"

"github.com/hashicorp/terraform/helper/schema"
api "k8s.io/api/autoscaling/v1"
"k8s.io/apimachinery/pkg/api/errors"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
pkgApi "k8s.io/apimachinery/pkg/types"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/apis/autoscaling/v1"
)

func resourceKubernetesHorizontalPodAutoscaler() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/resource_kubernetes_horizontal_pod_autoscaler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
api "k8s.io/api/autoscaling/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/apis/autoscaling/v1"
)

func TestAccKubernetesHorizontalPodAutoscaler_basic(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/resource_kubernetes_limit_range.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"log"

"github.com/hashicorp/terraform/helper/schema"
api "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
pkgApi "k8s.io/apimachinery/pkg/types"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/api/v1"
)

func resourceKubernetesLimitRange() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/resource_kubernetes_limit_range_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
api "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/api/v1"
)

func TestAccKubernetesLimitRange_basic(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/resource_kubernetes_namespace.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (

"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema"
api "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
pkgApi "k8s.io/apimachinery/pkg/types"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/api/v1"
)

func resourceKubernetesNamespace() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/resource_kubernetes_namespace_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
api "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/api/v1"
)

func TestAccKubernetesNamespace_basic(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/resource_kubernetes_persistent_volume.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
gversion "github.com/hashicorp/go-version"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema"
api "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
pkgApi "k8s.io/apimachinery/pkg/types"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/api/v1"
)

func resourceKubernetesPersistentVolume() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/resource_kubernetes_persistent_volume_claim.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (

"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema"
api "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
pkgApi "k8s.io/apimachinery/pkg/types"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/api/v1"
)

func resourceKubernetesPersistentVolumeClaim() *schema.Resource {
Expand Down
4 changes: 2 additions & 2 deletions kubernetes/resource_kubernetes_persistent_volume_claim_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
api "k8s.io/api/core/v1"
storageapi "k8s.io/api/storage/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/api/v1"
storageapi "k8s.io/client-go/pkg/apis/storage/v1"
)

func TestAccKubernetesPersistentVolumeClaim_basic(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/resource_kubernetes_persistent_volume_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
api "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/api/v1"
)

func TestAccKubernetesPersistentVolume_googleCloud_basic(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/resource_kubernetes_pod.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (

"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema"
api "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
pkgApi "k8s.io/apimachinery/pkg/types"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/api/v1"
)

func resourceKubernetesPod() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/resource_kubernetes_pod_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"os"
"testing"

api "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/api/v1"

"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/resource_kubernetes_replication_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (

"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema"
api "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
pkgApi "k8s.io/apimachinery/pkg/types"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/api/v1"
)

func resourceKubernetesReplicationController() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/resource_kubernetes_replication_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
api "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/api/v1"
)

func TestAccKubernetesReplicationController_basic(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/resource_kubernetes_resource_quota.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (

"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema"
api "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
pkgApi "k8s.io/apimachinery/pkg/types"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/api/v1"
)

func resourceKubernetesResourceQuota() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/resource_kubernetes_resource_quota_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
api "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/api/v1"
)

func TestAccKubernetesResourceQuota_basic(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/resource_kubernetes_secret.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"fmt"

"github.com/hashicorp/terraform/helper/schema"
api "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
pkgApi "k8s.io/apimachinery/pkg/types"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/api/v1"
)

func resourceKubernetesSecret() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/resource_kubernetes_secret_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
api "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/api/v1"
)

func TestAccKubernetesSecret_basic(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/resource_kubernetes_service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (

"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema"
api "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
pkgApi "k8s.io/apimachinery/pkg/types"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/api/v1"
)

func resourceKubernetesService() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/resource_kubernetes_service_account.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (

"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema"
api "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
pkgApi "k8s.io/apimachinery/pkg/types"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/api/v1"
)

func resourceKubernetesServiceAccount() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/resource_kubernetes_service_account_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
api "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/api/v1"
)

func TestAccKubernetesServiceAccount_basic(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/resource_kubernetes_service_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
api "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/api/v1"
)

func TestAccKubernetesService_basic(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/resource_kubernetes_storage_class.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"log"

"github.com/hashicorp/terraform/helper/schema"
api "k8s.io/api/storage/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
pkgApi "k8s.io/apimachinery/pkg/types"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/apis/storage/v1"
)

func resourceKubernetesStorageClass() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/resource_kubernetes_storage_class_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
api "k8s.io/api/storage/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kubernetes "k8s.io/client-go/kubernetes"
api "k8s.io/client-go/pkg/apis/storage/v1"
)

func TestAccKubernetesStorageClass_basic(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/structure_horizontal_pod_autoscaler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package kubernetes

import (
"github.com/hashicorp/terraform/helper/schema"
api "k8s.io/client-go/pkg/apis/autoscaling/v1"
api "k8s.io/api/autoscaling/v1"
)

func expandHorizontalPodAutoscalerSpec(in []interface{}) api.HorizontalPodAutoscalerSpec {
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/structure_persistent_volume_claim.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package kubernetes

import (
"github.com/hashicorp/terraform/helper/schema"
"k8s.io/client-go/pkg/api/v1"
"k8s.io/api/core/v1"
)

// Flatteners
Expand Down
Loading

0 comments on commit 523ef33

Please sign in to comment.