Skip to content

Commit

Permalink
Bump pipeline dep to v0.20.1
Browse files Browse the repository at this point in the history 
This will bump pipeline dep to v0.20.1
as the dep in go mod

Changes in test pkg based on new knative
version
  • Loading branch information
@piyush-garg
piyush-garg committed Feb 5, 2021
1 parent 450bf77 commit 8976afe
Show file tree
Hide file tree
Showing 626 changed files with 49,538 additions and 13,001 deletions.
25 changes: 12 additions & 13 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/cpuguy83/go-md2man v1.0.10
github.com/fatih/color v1.9.0
github.com/ghodss/yaml v1.0.0
github.com/google/go-cmp v0.5.2
github.com/google/go-cmp v0.5.4
github.com/hako/durafmt v0.0.0-20191009132224-3f39dc1ed9f4
github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c
github.com/jonboulle/clockwork v0.1.1-0.20190114141812-62fb9bc030d1
Expand All @@ -19,35 +19,34 @@ require (
github.com/spf13/cobra v1.1.1
github.com/spf13/pflag v1.0.5
github.com/tektoncd/hub/api v0.0.0-20201216093904-377b464ed407
github.com/tektoncd/pipeline v0.19.0
github.com/tektoncd/pipeline v0.20.1
github.com/tektoncd/plumbing v0.0.0-20201021153918-6b7e894737b5
github.com/tektoncd/triggers v0.10.2
github.com/tidwall/gjson v1.6.0 // indirect
go.opencensus.io v0.22.4
go.opencensus.io v0.22.5
go.uber.org/multierr v1.5.0
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
gopkg.in/yaml.v2 v2.3.0
gotest.tools v2.2.0+incompatible
gotest.tools/v3 v3.0.2
k8s.io/api v0.18.9
k8s.io/api v0.18.12
k8s.io/apimachinery v0.19.0
k8s.io/cli-runtime v0.17.6
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
knative.dev/pkg v0.0.0-20200922164940-4bf40ad82aab
knative.dev/pkg v0.0.0-20210107022335-51c72e24c179
sigs.k8s.io/yaml v1.2.0
)

replace (
contrib.go.opencensus.io/exporter/stackdriver => contrib.go.opencensus.io/exporter/stackdriver v0.12.9-0.20191108183826-59d068f8d8ff
github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.4.0+incompatible
contrib.go.opencensus.io/exporter/stackdriver => contrib.go.opencensus.io/exporter/stackdriver v0.13.4
github.com/kr/pty => github.com/creack/pty v1.1.10
)

// Pin k8s deps to 0.18.9
// Pin k8s deps to 0.18.12
replace (
k8s.io/api => k8s.io/api v0.18.9
k8s.io/apimachinery => k8s.io/apimachinery v0.18.9
k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.9
k8s.io/client-go => k8s.io/client-go v0.18.9
k8s.io/api => k8s.io/api v0.18.12
k8s.io/apimachinery => k8s.io/apimachinery v0.18.12
k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.12
k8s.io/client-go => k8s.io/client-go v0.18.12
)
209 changes: 194 additions & 15 deletions go.sum
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions test/e2e/eventListener/eventListener_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func TestEventListenerE2E(t *testing.T) {
t.Run("Get logs of EventListener", func(t *testing.T) {
res := tkn.MustSucceed(t, "eventlistener", "logs", elName, "-t", "1")

elPods, err := c.KubeClient.Kube.CoreV1().Pods(namespace).List(context.Background(), metav1.ListOptions{LabelSelector: "eventlistener=" + elName})
elPods, err := c.KubeClient.CoreV1().Pods(namespace).List(context.Background(), metav1.ListOptions{LabelSelector: "eventlistener=" + elName})
if err != nil {
t.Fatalf("Error getting pods for EventListener %s: %v", elName, err)
}
Expand All @@ -72,7 +72,7 @@ func TestEventListenerE2E(t *testing.T) {
kubectl.MustSucceed(t, "wait", "--for=condition=Ready", "pod", "-n", namespace, "--timeout=2m", "--all")

t.Run("Get logs of EventListener with multiple pods", func(t *testing.T) {
elPods, err := c.KubeClient.Kube.CoreV1().Pods(namespace).List(context.Background(), metav1.ListOptions{LabelSelector: "eventlistener=" + elName})
elPods, err := c.KubeClient.CoreV1().Pods(namespace).List(context.Background(), metav1.ListOptions{LabelSelector: "eventlistener=" + elName})
if err != nil {
t.Fatalf("Error getting pods for EventListener %s: %v", elName, err)
}
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/resource/create_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ func TestCreateClusterResourceInteractively(t *testing.T) {
assert.NilError(t, err)

t.Logf("Creating secret %s", secretName)
if _, err := c.KubeClient.Kube.CoreV1().Secrets(namespace).Create(context.Background(), getClusterResourceTaskSecret(namespace, secretName), metav1.CreateOptions{}); err != nil {
if _, err := c.KubeClient.CoreV1().Secrets(namespace).Create(context.Background(), getClusterResourceTaskSecret(namespace, secretName), metav1.CreateOptions{}); err != nil {
t.Fatalf("Failed to create Secret `%s`: %s", secretName, err)
}

Expand Down
14 changes: 7 additions & 7 deletions test/framework/helper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func CreateServiceAccountSecret(c *knativetest.KubeClient, namespace string, sec
},
}

_, err := c.Kube.CoreV1().Secrets(namespace).Create(context.Background(), sec, metav1.CreateOptions{})
_, err := c.CoreV1().Secrets(namespace).Create(context.Background(), sec, metav1.CreateOptions{})
if err != nil {
log.Fatalf("Error in creating Secrets into namespace "+namespace+" err: %s", err)
}
Expand Down Expand Up @@ -125,7 +125,7 @@ func TearDown(t *testing.T, cs *Clients, namespace string) {
}

t.Logf("Deleting namespace %s", namespace)
if err := cs.KubeClient.Kube.CoreV1().Namespaces().Delete(context.Background(), namespace, metav1.DeleteOptions{}); err != nil {
if err := cs.KubeClient.CoreV1().Namespaces().Delete(context.Background(), namespace, metav1.DeleteOptions{}); err != nil {
t.Errorf("Failed to delete namespace %s: %s", namespace, err)
}

Expand All @@ -143,7 +143,7 @@ func initializeLogsAndMetrics(t *testing.T) {

func CreateNamespace(namespace string, kubeClient *knativetest.KubeClient) {
log.Printf("Create namespace %s to deploy to", namespace)
if _, err := kubeClient.Kube.CoreV1().Namespaces().Create(context.Background(), &corev1.Namespace{
if _, err := kubeClient.CoreV1().Namespaces().Create(context.Background(), &corev1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: namespace,
},
Expand All @@ -154,7 +154,7 @@ func CreateNamespace(namespace string, kubeClient *knativetest.KubeClient) {

func DeleteNamespace(namespace string, cs *Clients) {
log.Printf("Deleting namespace %s", namespace)
if err := cs.KubeClient.Kube.CoreV1().Namespaces().Delete(context.Background(), namespace, metav1.DeleteOptions{}); err != nil {
if err := cs.KubeClient.CoreV1().Namespaces().Delete(context.Background(), namespace, metav1.DeleteOptions{}); err != nil {
log.Printf("Failed to delete namespace %s: %s", namespace, err)
}
}
Expand All @@ -164,7 +164,7 @@ func VerifyServiceAccountExistence(namespace string, kubeClient *knativetest.Kub
log.Printf("Verify SA %q is created in namespace %q", defaultSA, namespace)

if err := wait.PollImmediate(Interval, Apitimeout, func() (bool, error) {
_, err := kubeClient.Kube.CoreV1().ServiceAccounts(namespace).Get(context.Background(), defaultSA, metav1.GetOptions{})
_, err := kubeClient.CoreV1().ServiceAccounts(namespace).Get(context.Background(), defaultSA, metav1.GetOptions{})
if err != nil && errors.IsNotFound(err) {
return false, nil
}
Expand All @@ -179,7 +179,7 @@ func VerifyServiceAccountExistenceForSecrets(namespace string, kubeClient *knati
log.Printf("Verify SA %q is created in namespace %q", defaultSA, namespace)

if err := wait.PollImmediate(Interval, Apitimeout, func() (bool, error) {
_, err := kubeClient.Kube.CoreV1().ServiceAccounts(namespace).Get(context.Background(), defaultSA, metav1.GetOptions{})
_, err := kubeClient.CoreV1().ServiceAccounts(namespace).Get(context.Background(), defaultSA, metav1.GetOptions{})
if err != nil && errors.IsNotFound(err) {
return false, nil
}
Expand Down Expand Up @@ -239,7 +239,7 @@ func getCRDYaml(cs *Clients, ns string) ([]byte, error) {
printOrAdd("TaskRun", i.Name, i)
}

pods, err := cs.KubeClient.Kube.CoreV1().Pods(ns).List(context.Background(), metav1.ListOptions{})
pods, err := cs.KubeClient.CoreV1().Pods(ns).List(context.Background(), metav1.ListOptions{})
if err != nil {
return nil, xerrors.Errorf("could not get pods: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion test/framework/logs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (

// CollectPodLogs will get the logs for all containers in a Pod
func CollectPodLogs(c *Clients, podName, namespace string, logf logging.FormatLogger) {
logs, err := getContainerLogsFromPod(c.KubeClient.Kube, podName, namespace)
logs, err := getContainerLogsFromPod(c.KubeClient, podName, namespace)
if err != nil {
logf("Could not get logs for pod %s: %s", podName, err)
}
Expand Down
10 changes: 5 additions & 5 deletions test/wait/helper-wait.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func ForPodState(c *framework.Clients, name string, namespace string, inState fu
defer span.End()

return wait.PollImmediate(framework.Interval, framework.Apitimeout, func() (bool, error) {
r, err := c.KubeClient.Kube.CoreV1().Pods(namespace).Get(context.Background(), name, metav1.GetOptions{})
r, err := c.KubeClient.CoreV1().Pods(namespace).Get(context.Background(), name, metav1.GetOptions{})
if err != nil {
return true, err
}
Expand All @@ -80,7 +80,7 @@ func ForPodState(c *framework.Clients, name string, namespace string, inState fu
}

func ForPodStateKube(c *knativetest.KubeClient, namespace string, inState PodRunStateFn, desc string) error {
podlist, err := c.Kube.CoreV1().Pods(namespace).List(context.Background(), metav1.ListOptions{})
podlist, err := c.CoreV1().Pods(namespace).List(context.Background(), metav1.ListOptions{})
if err != nil {
return err
}
Expand All @@ -92,7 +92,7 @@ func ForPodStateKube(c *knativetest.KubeClient, namespace string, inState PodRun

err1 := wait.PollImmediate(framework.Interval, framework.Apitimeout, func() (bool, error) {
fmt.Println("v.Name", v.Name)
r, err := c.Kube.CoreV1().Pods(namespace).Get(context.Background(), v.Name, metav1.GetOptions{})
r, err := c.CoreV1().Pods(namespace).Get(context.Background(), v.Name, metav1.GetOptions{})
if r.Status.Phase == "Running" || r.Status.Phase == "Succeeded" && err != nil {
fmt.Printf("Pods are Running !! in namespace %s podName %s \n", namespace, v.Name)
return true, err
Expand All @@ -109,7 +109,7 @@ func ForPodStateKube(c *knativetest.KubeClient, namespace string, inState PodRun
}

func ForPodStatus(kubeClient *knativetest.KubeClient, namespace string) {
watch, err := kubeClient.Kube.CoreV1().Pods(namespace).Watch(context.Background(), metav1.ListOptions{})
watch, err := kubeClient.CoreV1().Pods(namespace).Watch(context.Background(), metav1.ListOptions{})
if err != nil {
log.Fatal(err.Error())
}
Expand Down Expand Up @@ -177,7 +177,7 @@ func ForServiceExternalIPState(c *framework.Clients, namespace, name string, inS
defer span.End()

return wait.PollImmediate(framework.Interval, framework.Apitimeout, func() (bool, error) {
r, err := c.KubeClient.Kube.CoreV1().Services(namespace).Get(context.Background(), name, metav1.GetOptions{})
r, err := c.KubeClient.CoreV1().Services(namespace).Get(context.Background(), name, metav1.GetOptions{})
if err != nil {
return true, err
}
Expand Down
15 changes: 15 additions & 0 deletions third_party/VENDOR-LICENSE/github.com/blendle/zapdriver/LICENSE
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
ISC License

Copyright (c) Blendle

Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.

THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Loading

0 comments on commit 8976afe

Please sign in to comment.