Skip to content
This repository was archived by the owner on May 17, 2024. It is now read-only.

Commit 3e0fe2b

Browse files
JoshVanLJoshVanL
committed
Updates e2e tests for Kubernetes v1.18.0
Signed-off-by: JoshVanL <[email protected]>
1 parent f33d88f commit 3e0fe2b

File tree

13 files changed

+107
-94
lines changed

13 files changed

+107
-94
lines changed

‎test/e2e/framework/helper/deploy.go

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
package helper
33

44
import (
5+
"context"
56
"fmt"
67
"net"
78
"net/url"
@@ -97,7 +98,7 @@ func (h *Helper) DeployProxy(ns *corev1.Namespace, issuerURL *url.URL, clientID
9798
},
9899
}
99100

100-
_, err := h.KubeClient.CoreV1().Secrets(ns.Name).Create(sec)
101+
_, err := h.KubeClient.CoreV1().Secrets(ns.Name).Create(context.Background(), sec, metav1.CreateOptions{})
101102
if err != nil {
102103
return nil, nil, err
103104
}
@@ -110,7 +111,7 @@ func (h *Helper) DeployProxy(ns *corev1.Namespace, issuerURL *url.URL, clientID
110111
pTrue := true
111112
pFalse := false
112113

113-
crole, err := h.KubeClient.RbacV1().ClusterRoles().Create(&rbacv1.ClusterRole{
114+
crole, err := h.KubeClient.RbacV1().ClusterRoles().Create(context.Background(), &rbacv1.ClusterRole{
114115
ObjectMeta: metav1.ObjectMeta{
115116
GenerateName: kind.ProxyImageName + "-",
116117
OwnerReferences: []metav1.OwnerReference{
@@ -136,12 +137,12 @@ func (h *Helper) DeployProxy(ns *corev1.Namespace, issuerURL *url.URL, clientID
136137
Verbs: []string{"impersonate", "create"},
137138
},
138139
},
139-
})
140+
}, metav1.CreateOptions{})
140141
if err != nil {
141142
return nil, nil, err
142143
}
143144

144-
_, err = h.KubeClient.RbacV1().ClusterRoleBindings().Create(
145+
_, err = h.KubeClient.RbacV1().ClusterRoleBindings().Create(context.Background(),
145146
&rbacv1.ClusterRoleBinding{
146147
ObjectMeta: metav1.ObjectMeta{
147148
GenerateName: kind.ProxyImageName + "-",
@@ -162,7 +163,7 @@ func (h *Helper) DeployProxy(ns *corev1.Namespace, issuerURL *url.URL, clientID
162163
Subjects: []rbacv1.Subject{
163164
{Name: kind.ProxyImageName, Namespace: ns.Name, Kind: "ServiceAccount"},
164165
},
165-
})
166+
}, metav1.CreateOptions{})
166167
if err != nil {
167168
return nil, nil, err
168169
}
@@ -234,15 +235,15 @@ func (h *Helper) DeployFakeAPIServer(ns string) ([]corev1.Volume, *url.URL, erro
234235
return nil, nil, err
235236
}
236237

237-
sec, err := h.KubeClient.CoreV1().Secrets(ns).Create(&corev1.Secret{
238+
sec, err := h.KubeClient.CoreV1().Secrets(ns).Create(context.Background(), &corev1.Secret{
238239
ObjectMeta: metav1.ObjectMeta{
239240
GenerateName: "fake-apiserver-ca-",
240241
Namespace: ns,
241242
},
242243
Data: map[string][]byte{
243244
"ca.pem": bundle.CertBytes,
244245
},
245-
})
246+
}, metav1.CreateOptions{})
246247
if err != nil {
247248
return nil, nil, err
248249
}
@@ -292,15 +293,15 @@ func (h *Helper) DeployAuditWebhook(ns, logPath string) (corev1.Volume, *url.URL
292293
return corev1.Volume{}, nil, err
293294
}
294295

295-
sec, err := h.KubeClient.CoreV1().Secrets(ns).Create(&corev1.Secret{
296+
sec, err := h.KubeClient.CoreV1().Secrets(ns).Create(context.Background(), &corev1.Secret{
296297
ObjectMeta: metav1.ObjectMeta{
297298
GenerateName: "audit-webhook-ca-",
298299
Namespace: ns,
299300
},
300301
Data: map[string][]byte{
301302
"ca.pem": bundle.CertBytes,
302303
},
303-
})
304+
}, metav1.CreateOptions{})
304305
if err != nil {
305306
return corev1.Volume{}, nil, err
306307
}
@@ -322,7 +323,7 @@ func (h *Helper) deployApp(ns, name string, serviceType corev1.ServiceType, cont
322323

323324
var netIPs []net.IP
324325
if serviceType == corev1.ServiceTypeNodePort {
325-
nodes, err := h.KubeClient.CoreV1().Nodes().List(metav1.ListOptions{})
326+
nodes, err := h.KubeClient.CoreV1().Nodes().List(context.Background(), metav1.ListOptions{})
326327
if err != nil {
327328
return nil, nil, err
328329
}
@@ -418,7 +419,7 @@ func (h *Helper) deployApp(ns, name string, serviceType corev1.ServiceType, cont
418419
},
419420
}
420421

421-
svc, err = h.KubeClient.CoreV1().Services(ns).Create(svc)
422+
svc, err = h.KubeClient.CoreV1().Services(ns).Create(context.Background(), svc, metav1.CreateOptions{})
422423
if err != nil {
423424
return nil, nil, err
424425
}
@@ -428,17 +429,17 @@ func (h *Helper) deployApp(ns, name string, serviceType corev1.ServiceType, cont
428429
strconv.FormatUint(uint64(svc.Spec.Ports[0].NodePort), 10))
429430
}
430431

431-
_, err = h.KubeClient.CoreV1().Secrets(ns).Create(sec)
432+
_, err = h.KubeClient.CoreV1().Secrets(ns).Create(context.Background(), sec, metav1.CreateOptions{})
432433
if err != nil {
433434
return nil, nil, err
434435
}
435436

436-
_, err = h.KubeClient.CoreV1().ServiceAccounts(ns).Create(sa)
437+
_, err = h.KubeClient.CoreV1().ServiceAccounts(ns).Create(context.Background(), sa, metav1.CreateOptions{})
437438
if err != nil {
438439
return nil, nil, err
439440
}
440441

441-
_, err = h.KubeClient.AppsV1().Deployments(ns).Create(deploy)
442+
_, err = h.KubeClient.AppsV1().Deployments(ns).Create(context.Background(), deploy, metav1.CreateOptions{})
442443
if err != nil {
443444
return nil, nil, err
444445
}
@@ -467,24 +468,24 @@ func (h *Helper) DeleteFakeAPIServer(ns string) error {
467468
}
468469

469470
func (h *Helper) deleteApp(ns, name string, extraSecrets ...string) error {
470-
err := h.KubeClient.AppsV1().Deployments(ns).Delete(name, nil)
471+
err := h.KubeClient.AppsV1().Deployments(ns).Delete(context.Background(), name, metav1.DeleteOptions{})
471472
if err != nil && !k8sErrors.IsNotFound(err) {
472473
return err
473474
}
474475

475476
for _, s := range append(extraSecrets, name) {
476-
err = h.KubeClient.CoreV1().Secrets(ns).Delete(s, nil)
477+
err = h.KubeClient.CoreV1().Secrets(ns).Delete(context.Background(), s, metav1.DeleteOptions{})
477478
if err != nil && !k8sErrors.IsNotFound(err) {
478479
return err
479480
}
480481
}
481482

482-
err = h.KubeClient.CoreV1().Services(ns).Delete(name, nil)
483+
err = h.KubeClient.CoreV1().Services(ns).Delete(context.Background(), name, metav1.DeleteOptions{})
483484
if err != nil && !k8sErrors.IsNotFound(err) {
484485
return err
485486
}
486487

487-
err = h.KubeClient.CoreV1().ServiceAccounts(ns).Delete(name, nil)
488+
err = h.KubeClient.CoreV1().ServiceAccounts(ns).Delete(context.Background(), name, metav1.DeleteOptions{})
488489
if err != nil && !k8sErrors.IsNotFound(err) {
489490
return err
490491
}

‎test/e2e/framework/helper/poll.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
package helper
33

44
import (
5+
"context"
56
"fmt"
67
"time"
78

@@ -16,7 +17,7 @@ func (h *Helper) WaitForDeploymentReady(namespace, name string, timeout time.Dur
1617
log.Infof("Waiting for Deployment to become ready %s/%s", namespace, name)
1718

1819
err := wait.PollImmediate(time.Second*2, timeout, func() (bool, error) {
19-
deploy, err := h.KubeClient.AppsV1().Deployments(namespace).Get(name, metav1.GetOptions{})
20+
deploy, err := h.KubeClient.AppsV1().Deployments(namespace).Get(context.Background(), name, metav1.GetOptions{})
2021
if err != nil {
2122
return false, err
2223
}
@@ -48,7 +49,7 @@ func (h *Helper) WaitForPodReady(namespace, name string, timeout time.Duration)
4849
log.Infof("Waiting for Pod to become ready %s/%s", namespace, name)
4950

5051
err := wait.PollImmediate(time.Second*2, timeout, func() (bool, error) {
51-
pod, err := h.KubeClient.CoreV1().Pods(namespace).Get(name, metav1.GetOptions{})
52+
pod, err := h.KubeClient.CoreV1().Pods(namespace).Get(context.Background(), name, metav1.GetOptions{})
5253
if err != nil {
5354
return false, err
5455
}
@@ -90,7 +91,7 @@ func (h *Helper) WaitForDeploymentToDelete(namespace, name string, timeout time.
9091
log.Infof("Waiting for Deployment to be deleted: %s/%s", namespace, name)
9192

9293
err := wait.PollImmediate(time.Second*2, timeout, func() (bool, error) {
93-
_, err := h.KubeClient.AppsV1().Deployments(namespace).Get(name, metav1.GetOptions{})
94+
_, err := h.KubeClient.AppsV1().Deployments(namespace).Get(context.Background(), name, metav1.GetOptions{})
9495
if k8sErrors.IsNotFound(err) {
9596
return true, nil
9697
}

‎test/e2e/framework/helper/secrets.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,18 @@
22
package helper
33

44
import (
5+
"context"
6+
57
corev1 "k8s.io/api/core/v1"
68
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
79
)
810

911
func (h *Helper) GetServiceAccountSecret(ns, name string) (*corev1.Secret, error) {
10-
sa, err := h.KubeClient.CoreV1().ServiceAccounts(ns).Get(name, metav1.GetOptions{})
12+
sa, err := h.KubeClient.CoreV1().ServiceAccounts(ns).Get(context.Background(), name, metav1.GetOptions{})
1113
if err != nil {
1214
return nil, err
1315
}
14-
sec, err := h.KubeClient.CoreV1().Secrets(ns).Get(sa.Secrets[0].Name, metav1.GetOptions{})
16+
sec, err := h.KubeClient.CoreV1().Secrets(ns).Get(context.Background(), sa.Secrets[0].Name, metav1.GetOptions{})
1517
if err != nil {
1618
return nil, err
1719
}

‎test/e2e/framework/util.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
package framework
33

44
import (
5+
"context"
56
"fmt"
67
"time"
78

@@ -24,12 +25,12 @@ func (f *Framework) CreateKubeNamespace(baseName string) (*corev1.Namespace, err
2425
},
2526
}
2627

27-
return f.KubeClientSet.CoreV1().Namespaces().Create(ns)
28+
return f.KubeClientSet.CoreV1().Namespaces().Create(context.Background(), ns, metav1.CreateOptions{})
2829
}
2930

3031
// DeleteKubeNamespace will delete a namespace resource
3132
func (f *Framework) DeleteKubeNamespace(namespace string) error {
32-
return f.KubeClientSet.CoreV1().Namespaces().Delete(namespace, nil)
33+
return f.KubeClientSet.CoreV1().Namespaces().Delete(context.Background(), namespace, metav1.DeleteOptions{})
3334
}
3435

3536
// WaitForKubeNamespaceNotExist will wait for the namespace with the given name
@@ -40,7 +41,7 @@ func (f *Framework) WaitForKubeNamespaceNotExist(namespace string) error {
4041

4142
func namespaceNotExist(c kubernetes.Interface, namespace string) wait.ConditionFunc {
4243
return func() (bool, error) {
43-
_, err := c.CoreV1().Namespaces().Get(namespace, metav1.GetOptions{})
44+
_, err := c.CoreV1().Namespaces().Get(context.Background(), namespace, metav1.GetOptions{})
4445
if apierrors.IsNotFound(err) {
4546
return true, nil
4647
}

‎test/e2e/suite/cases/audit/audit.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package passthrough
44
import (
55
"bufio"
66
"bytes"
7+
"context"
78
"encoding/json"
89
"fmt"
910
"net/http"
@@ -26,7 +27,7 @@ var _ = framework.CasesDescribe("Audit", func() {
2627

2728
It("should be able to write audit logs to file", func() {
2829
By("Creating policy file ConfigMap")
29-
cm, err := f.Helper().KubeClient.CoreV1().ConfigMaps(f.Namespace.Name).Create(&corev1.ConfigMap{
30+
cm, err := f.Helper().KubeClient.CoreV1().ConfigMaps(f.Namespace.Name).Create(context.Background(), &corev1.ConfigMap{
3031
ObjectMeta: metav1.ObjectMeta{
3132
GenerateName: "kube-oidc-proxy-policy-",
3233
},
@@ -36,7 +37,7 @@ kind: Policy
3637
rules:
3738
- level: RequestResponse`,
3839
},
39-
})
40+
}, metav1.CreateOptions{})
4041
Expect(err).NotTo(HaveOccurred())
4142

4243
vols := []corev1.Volume{
@@ -60,7 +61,7 @@ rules:
6061

6162
It("should be able to write audit logs to webhook", func() {
6263
By("Creating policy file ConfigMap")
63-
cmPolicy, err := f.Helper().KubeClient.CoreV1().ConfigMaps(f.Namespace.Name).Create(&corev1.ConfigMap{
64+
cmPolicy, err := f.Helper().KubeClient.CoreV1().ConfigMaps(f.Namespace.Name).Create(context.Background(), &corev1.ConfigMap{
6465
ObjectMeta: metav1.ObjectMeta{
6566
GenerateName: "kube-oidc-proxy-policy-",
6667
},
@@ -70,13 +71,13 @@ kind: Policy
7071
rules:
7172
- level: RequestResponse`,
7273
},
73-
})
74+
}, metav1.CreateOptions{})
7475
Expect(err).NotTo(HaveOccurred())
7576

7677
extraWebhookVol, webhookURL, err := f.Helper().DeployAuditWebhook(f.Namespace.Name, "/audit-log")
7778
Expect(err).NotTo(HaveOccurred())
7879

79-
cmWebhook, err := f.Helper().KubeClient.CoreV1().ConfigMaps(f.Namespace.Name).Create(&corev1.ConfigMap{
80+
cmWebhook, err := f.Helper().KubeClient.CoreV1().ConfigMaps(f.Namespace.Name).Create(context.Background(), &corev1.ConfigMap{
8081
ObjectMeta: metav1.ObjectMeta{
8182
GenerateName: "kube-oidc-proxy-webhook-config-",
8283
},
@@ -97,7 +98,7 @@ current-context: default-context
9798
preferences: {}
9899
users: []`,
99100
},
100-
})
101+
}, metav1.CreateOptions{})
101102
Expect(err).NotTo(HaveOccurred())
102103

103104
vols := []corev1.Volume{
@@ -162,7 +163,7 @@ func testAuditLogs(f *framework.Framework, podLabelSelector string) {
162163

163164
By("Copying audit log from proxy locally")
164165
// Get pod
165-
pods, err := f.Helper().KubeClient.CoreV1().Pods(f.Namespace.Name).List(metav1.ListOptions{
166+
pods, err := f.Helper().KubeClient.CoreV1().Pods(f.Namespace.Name).List(context.Background(), metav1.ListOptions{
166167
LabelSelector: podLabelSelector,
167168
})
168169
Expect(err).NotTo(HaveOccurred())

0 commit comments

Comments
 (0)