Skip to content

Commit

Permalink
[release/v2.9] Add downstream triple (#2913)
Browse files Browse the repository at this point in the history
* Use downstream triple package (#2910)

Upstream removed the triple package[0], in order to be able to upgrade
client-go we need to have a downsream version.

[0] kubernetes/kubernetes#70966

* Remove test occurence of the upstream triple package
  • Loading branch information
alvaroaleman authored and kubermatic-bot committed Mar 4, 2019
1 parent 25b2207 commit 6212798
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 18 deletions.
4 changes: 1 addition & 3 deletions api/Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/pkg/controller/backup/backup_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
kubermaticv1 "github.com/kubermatic/kubermatic/api/pkg/crd/kubermatic/v1"
"github.com/kubermatic/kubermatic/api/pkg/resources"
"github.com/kubermatic/kubermatic/api/pkg/resources/certificates"
"github.com/kubermatic/kubermatic/api/pkg/resources/certificates/triple"

"k8s.io/api/batch/v1"
batchv1beta1 "k8s.io/api/batch/v1beta1"
Expand All @@ -41,7 +42,6 @@ import (
listersbatchv1beta1 "k8s.io/client-go/listers/batch/v1beta1"
corev1lister "k8s.io/client-go/listers/core/v1"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/util/cert/triple"
"k8s.io/client-go/util/workqueue"
)

Expand Down
2 changes: 1 addition & 1 deletion api/pkg/controller/cluster/resources_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/kubermatic/kubermatic/api/pkg/provider"
"github.com/kubermatic/kubermatic/api/pkg/resources"
"github.com/kubermatic/kubermatic/api/pkg/resources/certificates"
"github.com/kubermatic/kubermatic/api/pkg/resources/certificates/triple"
"github.com/kubermatic/kubermatic/api/pkg/semver"

corev1 "k8s.io/api/core/v1"
Expand All @@ -22,7 +23,6 @@ import (
listerscorev1 "k8s.io/client-go/listers/core/v1"
"k8s.io/client-go/tools/cache"
certutil "k8s.io/client-go/util/cert"
"k8s.io/client-go/util/cert/triple"
)

func TestLaunchingCreateNamespace(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion api/pkg/resources/certificates/client-certificate.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"fmt"

"github.com/kubermatic/kubermatic/api/pkg/resources"
"github.com/kubermatic/kubermatic/api/pkg/resources/certificates/triple"

corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
certutil "k8s.io/client-go/util/cert"
"k8s.io/client-go/util/cert/triple"
)

type templateDataProvider interface {
Expand Down
2 changes: 1 addition & 1 deletion api/pkg/resources/certificates/root-ca.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"fmt"

"github.com/kubermatic/kubermatic/api/pkg/resources"
"github.com/kubermatic/kubermatic/api/pkg/resources/certificates/triple"

corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
certutil "k8s.io/client-go/util/cert"
"k8s.io/client-go/util/cert/triple"
)

// GetCACreator returns a function to create a secret containing a CA with the specified name
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
/*
Copyright 2016 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
Expand Down
2 changes: 1 addition & 1 deletion api/pkg/resources/data.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import (
"github.com/golang/glog"
kubermaticv1 "github.com/kubermatic/kubermatic/api/pkg/crd/kubermatic/v1"
"github.com/kubermatic/kubermatic/api/pkg/provider"
"github.com/kubermatic/kubermatic/api/pkg/resources/certificates/triple"

corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
corev1lister "k8s.io/client-go/listers/core/v1"
"k8s.io/client-go/util/cert/triple"
)

// TemplateData is a group of data required for template generation
Expand Down
3 changes: 2 additions & 1 deletion api/pkg/resources/kubeconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ import (
"crypto/x509"
"fmt"

"github.com/kubermatic/kubermatic/api/pkg/resources/certificates/triple"

"github.com/golang/glog"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/equality"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/tools/clientcmd"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
certutil "k8s.io/client-go/util/cert"
"k8s.io/client-go/util/cert/triple"
)

// AdminKubeconfig returns a secret with the AdminKubeconfig key
Expand Down
2 changes: 1 addition & 1 deletion api/pkg/resources/kubeconfig_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"github.com/stretchr/testify/assert"

kubermaticv1 "github.com/kubermatic/kubermatic/api/pkg/crd/kubermatic/v1"
"github.com/kubermatic/kubermatic/api/pkg/resources/certificates/triple"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/util/cert/triple"
)

func TestGetBaseKubeconfig(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion api/pkg/resources/machinecontroller/webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
kubermaticv1 "github.com/kubermatic/kubermatic/api/pkg/crd/kubermatic/v1"
"github.com/kubermatic/kubermatic/api/pkg/resources"
"github.com/kubermatic/kubermatic/api/pkg/resources/apiserver"
"github.com/kubermatic/kubermatic/api/pkg/resources/certificates/triple"

admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1"
appsv1 "k8s.io/api/apps/v1"
Expand All @@ -14,7 +15,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
certutil "k8s.io/client-go/util/cert"
"k8s.io/client-go/util/cert/triple"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion api/pkg/resources/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"time"

kubermaticv1 "github.com/kubermatic/kubermatic/api/pkg/crd/kubermatic/v1"
"github.com/kubermatic/kubermatic/api/pkg/resources/certificates/triple"
"github.com/kubermatic/kubermatic/api/pkg/semver"

"github.com/golang/glog"
Expand All @@ -31,7 +32,6 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
corev1lister "k8s.io/client-go/listers/core/v1"
certutil "k8s.io/client-go/util/cert"
"k8s.io/client-go/util/cert/triple"
apiregistrationv1beta1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1"

autoscalingv1beta "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1beta1"
Expand Down

0 comments on commit 6212798

Please sign in to comment.