Skip to content

Commit

Permalink
Merge pull request #8 from sergioifg94/bump-kubernetes-client
Browse files Browse the repository at this point in the history
MGDAPI-1091 Bump version of Kubernetes dependencies
  • Loading branch information
philbrookes authored Jan 25, 2021
2 parents 1cdde52 + 500b539 commit 1972ece
Show file tree
Hide file tree
Showing 934 changed files with 183,831 additions and 146,720 deletions.
20 changes: 11 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,32 @@ module github.com/integr8ly/keycloak-client
go 1.13

require (
github.com/json-iterator/go v1.1.7
github.com/json-iterator/go v1.1.10
github.com/keycloak/keycloak-operator v0.0.0-20200129141231-e99da8a15034
github.com/pkg/errors v0.8.1
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.4.2
github.com/stretchr/testify v1.4.0
k8s.io/apimachinery v0.0.0
k8s.io/apimachinery v0.19.4
k8s.io/client-go v12.0.0+incompatible
sigs.k8s.io/controller-runtime v0.3.0
sigs.k8s.io/controller-runtime v0.6.3
)

// Pinned to kubernetes-1.15.4
replace (
k8s.io/api => k8s.io/api v0.0.0-20190918195907-bd6ac527cfd2
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190918201827-3de75813f604
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
github.com/go-logr/logr => github.com/go-logr/logr v0.1.0
k8s.io/api => k8s.io/api v0.0.0-20200331211856-3c24962070e9
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.4
k8s.io/apimachinery => k8s.io/apimachinery v0.19.4
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190918200908-1e17798da8c1
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190918202139-0b14c719ca62
k8s.io/client-go => k8s.io/client-go v0.0.0-20190918200256-06eb1244587a
k8s.io/client-go => k8s.io/client-go v0.0.0-20200331211856-d847b4c9642e
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190918203125-ae665f80358a
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190918202959-c340507a5d48
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
k8s.io/component-base => k8s.io/component-base v0.0.0-20190918200425-ed2f0867c778
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190817025403-3ae76f584e79
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190918203248-97c07dcbb623
k8s.io/klog/v2 => k8s.io/klog/v2 v2.1.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190918201136-c3a845f1fbb2
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190918202837-c54ce30c680e
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190918202429-08c8357f8e2d
Expand All @@ -35,5 +37,5 @@ replace (
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190918203421-225f0541b3ea
k8s.io/metrics => k8s.io/metrics v0.0.0-20190918202012-3c1ca76f5bda
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20190918201353-5cc279503896
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.3.0
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.6.3
)
236 changes: 215 additions & 21 deletions go.sum

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion pkg/common/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package common

import (
"bytes"
"context"
"crypto/tls"
"encoding/json"
"fmt"
Expand Down Expand Up @@ -1164,7 +1165,7 @@ func (i *LocalConfigKeycloakFactory) AuthenticatedClient(kc v1alpha1.Keycloak) (
return nil, err
}

adminCreds, err := secretClient.CoreV1().Secrets(kc.Namespace).Get(kc.Status.CredentialSecret, v12.GetOptions{})
adminCreds, err := secretClient.CoreV1().Secrets(kc.Namespace).Get(context.TODO(), kc.Status.CredentialSecret, v12.GetOptions{})
if err != nil {
return nil, errors.Wrap(err, "failed to get the admin credentials")
}
Expand Down
13 changes: 5 additions & 8 deletions pkg/common/keycloakClientFactory_moq.go

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

Loading

0 comments on commit 1972ece

Please sign in to comment.