Skip to content

Commit 09daf8d

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #246 from ecordell/k18
chore(deps): bump to kube 1.18
2 parents 888a0ab + c149b6f commit 09daf8d

File tree

531 files changed

+26966
-10751
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

531 files changed

+26966
-10751
lines changed

‎cmd/configmap-server/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func runCmdFunc(cmd *cobra.Command, args []string) error {
9999
logger := logrus.WithFields(logrus.Fields{"configMapName": configMapName, "configMapNamespace": configMapNamespace, "port": port})
100100

101101
client := NewClientFromConfig(kubeconfig, logger.Logger)
102-
configMap, err := client.CoreV1().ConfigMaps(configMapNamespace).Get(configMapName, metav1.GetOptions{})
102+
configMap, err := client.CoreV1().ConfigMaps(configMapNamespace).Get(context.TODO(), configMapName, metav1.GetOptions{})
103103
if err != nil {
104104
logger.Fatalf("error getting configmap: %s", err)
105105
}

‎go.mod‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ require (
1616
github.com/docker/go-metrics v0.0.1 // indirect
1717
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
1818
github.com/ghodss/yaml v1.0.0
19-
github.com/gogo/protobuf v1.3.1 // indirect
2019
github.com/golang-migrate/migrate/v4 v4.6.2
2120
github.com/golang/mock v1.3.1
2221
github.com/golang/protobuf v1.3.2
@@ -40,20 +39,18 @@ require (
4039
github.com/spf13/cobra v0.0.6
4140
github.com/stretchr/testify v1.5.1
4241
go.etcd.io/bbolt v1.3.4
43-
golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975 // indirect
4442
golang.org/x/mod v0.2.0
4543
golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271
4644
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
47-
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
48-
google.golang.org/grpc v1.24.0
45+
google.golang.org/grpc v1.26.0
4946
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
5047
gopkg.in/yaml.v2 v2.2.8
51-
k8s.io/api v0.17.3
52-
k8s.io/apiextensions-apiserver v0.17.3
53-
k8s.io/apimachinery v0.17.3
54-
k8s.io/client-go v0.17.3
48+
k8s.io/api v0.18.0
49+
k8s.io/apiextensions-apiserver v0.18.0
50+
k8s.io/apimachinery v0.18.0
51+
k8s.io/client-go v0.18.0
5552
k8s.io/klog v1.0.0
56-
k8s.io/kubectl v0.17.3
53+
k8s.io/kubectl v0.18.0
5754
)
5855

5956
replace github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d

‎go.sum‎

Lines changed: 48 additions & 24 deletions
Large diffs are not rendered by default.

‎pkg/appregistry/downloader.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package appregistry
22

33
import (
4+
"context"
45
"errors"
56
"fmt"
67

@@ -251,7 +252,7 @@ func (s *secretRegistryOptionsGetter) GetRegistryOptions(source *Source) (*apprc
251252

252253
token := ""
253254
if source.IsSecretSpecified() {
254-
secret, err := s.kubeClient.CoreV1().Secrets(source.Secret.Namespace).Get(source.Secret.Name, metav1.GetOptions{})
255+
secret, err := s.kubeClient.CoreV1().Secrets(source.Secret.Namespace).Get(context.TODO(), source.Secret.Name, metav1.GetOptions{})
255256
if err != nil {
256257
return nil, err
257258
}

‎pkg/configmap/configmap_writer.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package configmap
22

33
import (
4+
"context"
45
"errors"
56
"fmt"
67
"io/ioutil"
@@ -94,7 +95,7 @@ func validateConfigmapAnnotations(annotations map[string]string) error {
9495
func (c *ConfigMapWriter) Populate(maxDataSizeLimit uint64) error {
9596
subDirs := []string{"manifests/", "metadata/"}
9697

97-
configMapPopulate, err := c.clientset.CoreV1().ConfigMaps(c.namespace).Get(c.configMapName, metav1.GetOptions{})
98+
configMapPopulate, err := c.clientset.CoreV1().ConfigMaps(c.namespace).Get(context.TODO(), c.configMapName, metav1.GetOptions{})
9899
if err != nil {
99100
return err
100101
}
@@ -158,7 +159,7 @@ func (c *ConfigMapWriter) Populate(maxDataSizeLimit uint64) error {
158159
annotations[ConfigMapImageAnnotationKey] = sourceImage
159160
}
160161

161-
_, err = c.clientset.CoreV1().ConfigMaps(c.namespace).Update(configMapPopulate)
162+
_, err = c.clientset.CoreV1().ConfigMaps(c.namespace).Update(context.TODO(), configMapPopulate, metav1.UpdateOptions{})
162163
if err != nil {
163164
return err
164165
}
@@ -172,11 +173,11 @@ func (c *ConfigMapWriter) Populate(maxDataSizeLimit uint64) error {
172173
// for locality.
173174
func LaunchBundleImage(kubeclient kubernetes.Interface, bundleImage, initImage, namespace string) (*corev1.ConfigMap, *batchv1.Job, error) {
174175
// create configmap for bundle image data to write to (will be returned)
175-
newConfigMap, err := kubeclient.CoreV1().ConfigMaps(namespace).Create(&corev1.ConfigMap{
176+
newConfigMap, err := kubeclient.CoreV1().ConfigMaps(namespace).Create(context.TODO(), &corev1.ConfigMap{
176177
ObjectMeta: metav1.ObjectMeta{
177178
GenerateName: "bundle-image-",
178179
},
179-
})
180+
}, metav1.CreateOptions{})
180181
if err != nil {
181182
return nil, nil, err
182183
}
@@ -237,9 +238,9 @@ func LaunchBundleImage(kubeclient kubernetes.Interface, bundleImage, initImage,
237238
},
238239
},
239240
}
240-
launchedJob, err := kubeclient.BatchV1().Jobs(namespace).Create(&launchJob)
241+
launchedJob, err := kubeclient.BatchV1().Jobs(namespace).Create(context.TODO(), &launchJob, metav1.CreateOptions{})
241242
if err != nil {
242-
err := kubeclient.CoreV1().ConfigMaps(namespace).Delete(newConfigMap.GetName(), &metav1.DeleteOptions{})
243+
err := kubeclient.CoreV1().ConfigMaps(namespace).Delete(context.TODO(), newConfigMap.GetName(), metav1.DeleteOptions{})
243244
if err != nil {
244245
// already in an error, so just report it
245246
logrus.Errorf("failed to remove configmap: %v", err)

‎test/e2e/bundle_image_test.go‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package e2e_test
22

33
import (
4+
"context"
45
"fmt"
56
"os"
67
"os/exec"
@@ -676,8 +677,8 @@ spec:
676677
}
677678
}
678679

679-
func buildContainer(tag, dockerfilePath, context string) {
680-
cmd := exec.Command(builderCmd, "build", "-t", tag, "-f", dockerfilePath, context)
680+
func buildContainer(tag, dockerfilePath, dockerContext string) {
681+
cmd := exec.Command(builderCmd, "build", "-t", tag, "-f", dockerfilePath, dockerContext)
681682
err := cmd.Run()
682683
Expect(err).NotTo(HaveOccurred())
683684
}
@@ -710,7 +711,7 @@ var _ = Describe("Launch bundle", func() {
710711
kubeclient, err := client.NewKubeClient("", logrus.StandardLogger())
711712
Expect(err).NotTo(HaveOccurred())
712713

713-
_, err = kubeclient.RbacV1().Roles(namespace).Create(&rbacv1.Role{
714+
_, err = kubeclient.RbacV1().Roles(namespace).Create(context.TODO(), &rbacv1.Role{
714715
ObjectMeta: metav1.ObjectMeta{
715716
Name: "olm-dev-configmap-access",
716717
Namespace: namespace,
@@ -722,10 +723,10 @@ var _ = Describe("Launch bundle", func() {
722723
Verbs: []string{"create", "get", "update"},
723724
},
724725
},
725-
})
726+
}, metav1.CreateOptions{})
726727
Expect(err).NotTo(HaveOccurred())
727728

728-
_, err = kubeclient.RbacV1().RoleBindings(namespace).Create(&rbacv1.RoleBinding{
729+
_, err = kubeclient.RbacV1().RoleBindings(namespace).Create(context.TODO(), &rbacv1.RoleBinding{
729730
ObjectMeta: metav1.ObjectMeta{
730731
Name: "olm-dev-configmap-access-binding",
731732
Namespace: namespace,
@@ -743,7 +744,7 @@ var _ = Describe("Launch bundle", func() {
743744
Kind: "Role",
744745
Name: "olm-dev-configmap-access",
745746
},
746-
})
747+
}, metav1.CreateOptions{})
747748
Expect(err).NotTo(HaveOccurred())
748749

749750
By("building required images")
@@ -755,7 +756,7 @@ var _ = Describe("Launch bundle", func() {
755756
Expect(err).NotTo(HaveOccurred())
756757

757758
// wait for job to complete
758-
jobWatcher, err := kubeclient.BatchV1().Jobs(namespace).Watch(metav1.ListOptions{})
759+
jobWatcher, err := kubeclient.BatchV1().Jobs(namespace).Watch(context.TODO(), metav1.ListOptions{})
759760
Expect(err).NotTo(HaveOccurred())
760761

761762
done := make(chan struct{})
@@ -792,22 +793,22 @@ var _ = Describe("Launch bundle", func() {
792793
<-done
793794
Logf("Job complete")
794795

795-
bundleDataConfigMap, err = kubeclient.CoreV1().ConfigMaps(namespace).Get(bundleDataConfigMap.GetName(), metav1.GetOptions{})
796+
bundleDataConfigMap, err = kubeclient.CoreV1().ConfigMaps(namespace).Get(context.TODO(), bundleDataConfigMap.GetName(), metav1.GetOptions{})
796797
Expect(err).NotTo(HaveOccurred())
797798
assert.EqualValues(GinkgoT(), correctConfigMap.Annotations, bundleDataConfigMap.Annotations)
798799
assert.EqualValues(GinkgoT(), correctConfigMap.Data, bundleDataConfigMap.Data)
799800

800801
// clean up, perhaps better handled elsewhere
801-
err = kubeclient.CoreV1().ConfigMaps(namespace).Delete(bundleDataConfigMap.GetName(), &metav1.DeleteOptions{})
802+
err = kubeclient.CoreV1().ConfigMaps(namespace).Delete(context.TODO(), bundleDataConfigMap.GetName(), metav1.DeleteOptions{})
802803
Expect(err).NotTo(HaveOccurred())
803804

804805
// job deletion does not clean up underlying pods (but using kubectl will do the clean up)
805-
pods, err := kubeclient.CoreV1().Pods(namespace).List(metav1.ListOptions{LabelSelector: fmt.Sprintf("job-name=%s", job.GetName())})
806+
pods, err := kubeclient.CoreV1().Pods(namespace).List(context.TODO(), metav1.ListOptions{LabelSelector: fmt.Sprintf("job-name=%s", job.GetName())})
806807
Expect(err).NotTo(HaveOccurred())
807-
err = kubeclient.CoreV1().Pods(namespace).Delete(pods.Items[0].GetName(), &metav1.DeleteOptions{})
808+
err = kubeclient.CoreV1().Pods(namespace).Delete(context.TODO(), pods.Items[0].GetName(), metav1.DeleteOptions{})
808809
Expect(err).NotTo(HaveOccurred())
809810

810-
err = kubeclient.BatchV1().Jobs(namespace).Delete(job.GetName(), &metav1.DeleteOptions{})
811+
err = kubeclient.BatchV1().Jobs(namespace).Delete(context.TODO(), job.GetName(), metav1.DeleteOptions{})
811812
Expect(err).NotTo(HaveOccurred())
812813
})
813814
})

‎vendor/github.com/google/gofuzz/README.md‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/google/gofuzz/fuzz.go‎

Lines changed: 27 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)