Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.7 patch #511

Merged
merged 2 commits into from
Feb 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ require (
k8s.io/client-go v0.23.9
k8s.io/code-generator v0.23.9
k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf
knative.dev/eventing v0.34.1-0.20220906111743-7f1f49f5b4e0
knative.dev/hack v0.0.0-20220906140443-f9dc7220d362
knative.dev/pkg v0.0.0-20220826162920-93b66e6a8700
knative.dev/eventing v0.34.7
knative.dev/hack v0.0.0-20220823140917-8d1e4ccf9dc3
knative.dev/pkg v0.0.0-20221123011941-9d7bd235ceed
)

require (
Expand All @@ -41,7 +41,7 @@ require (
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
gotest.tools/v3 v3.1.0
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
knative.dev/client v0.34.1-0.20220906114442-59948bb3723d
knative.dev/client v0.34.1
)

require (
Expand Down Expand Up @@ -149,7 +149,7 @@ require (
k8s.io/gengo v0.0.0-20220613173612-397b4ae3bce7 // indirect
k8s.io/klog/v2 v2.70.2-0.20220707122935-0990e81f1a8f // indirect
knative.dev/networking v0.0.0-20220831065816-215bac90b28b // indirect
knative.dev/serving v0.34.1-0.20220905171742-62685b3b4a5a // indirect
knative.dev/serving v0.34.0 // indirect
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
sigs.k8s.io/kustomize/api v0.10.1 // indirect
sigs.k8s.io/kustomize/kyaml v0.13.0 // indirect
Expand Down
28 changes: 10 additions & 18 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,8 @@ github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL
github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
Expand Down Expand Up @@ -332,8 +329,6 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
github.com/google/go-containerregistry v0.8.1-0.20220414143355-892d7a808387 h1:GWICy4b02s8EA1M9H5krRQ48BKpIHO5LtBBm2BQLhx0=
github.com/google/go-containerregistry v0.8.1-0.20220414143355-892d7a808387 h1:GWICy4b02s8EA1M9H5krRQ48BKpIHO5LtBBm2BQLhx0=
github.com/google/go-containerregistry v0.8.1-0.20220414143355-892d7a808387/go.mod h1:eTLvLZaEe2FoQsb25t7BLxQQryyrwHTzFfwxN87mhAw=
github.com/google/go-containerregistry v0.8.1-0.20220414143355-892d7a808387/go.mod h1:eTLvLZaEe2FoQsb25t7BLxQQryyrwHTzFfwxN87mhAw=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
Expand Down Expand Up @@ -654,8 +649,6 @@ github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig=
github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig=
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
Expand Down Expand Up @@ -790,7 +783,6 @@ go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ
go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA=
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8=
go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
Expand Down Expand Up @@ -1378,18 +1370,18 @@ k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc=
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
knative.dev/client v0.34.1-0.20220906114442-59948bb3723d h1:2VReV5z4UELaRYJDo/+QU7gYd4LVcOKMeZDC9hfi4sI=
knative.dev/client v0.34.1-0.20220906114442-59948bb3723d/go.mod h1:2Z3qxDjIiniQCGrpvTRbbn9nxB8D5pzVH36E3xql+ko=
knative.dev/eventing v0.34.1-0.20220906111743-7f1f49f5b4e0 h1:IVLZkOQlBL8MMwSYw28WVMru36UdXTZW+FkKuZACMhs=
knative.dev/eventing v0.34.1-0.20220906111743-7f1f49f5b4e0/go.mod h1:6UnNnPrEUNAM9PfCpf7L8N7G/1vq+HQlpOjzndY6ryw=
knative.dev/hack v0.0.0-20220906140443-f9dc7220d362 h1:z3MkroifHD8RBAJv3zD6PDYhE/XRRJdrMpuIYHd3cFI=
knative.dev/hack v0.0.0-20220906140443-f9dc7220d362/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q=
knative.dev/client v0.34.1 h1:TfZd+Yt54n9YEgA1O+yFfNg0hrC/Erc5iw1IthXQ6oM=
knative.dev/client v0.34.1/go.mod h1:mquhJiwkZytOKzLjRu3K+5HWRM6YAplWfvGUbCFZI4M=
knative.dev/eventing v0.34.7 h1:P2YmnDBxpqQatVTZRVHftPv3wuO/+GN83kCXQVgtM20=
knative.dev/eventing v0.34.7/go.mod h1:6UnNnPrEUNAM9PfCpf7L8N7G/1vq+HQlpOjzndY6ryw=
knative.dev/hack v0.0.0-20220823140917-8d1e4ccf9dc3 h1:umaeMRecA0g5g48L9tnEAkTBIitr9eKWMyJYo9YttAA=
knative.dev/hack v0.0.0-20220823140917-8d1e4ccf9dc3/go.mod h1:t/azP8I/Cygaw+87O7rkAPrNRjCelmtfSzWzu/9TM7I=
knative.dev/networking v0.0.0-20220831065816-215bac90b28b h1:NhaGPmanHDyWMsl/LudsCmTMcdEEjZFk3qkSIUOW9Jw=
knative.dev/networking v0.0.0-20220831065816-215bac90b28b/go.mod h1:vMMT540KNAh6TWmpGEFnExTxJ/j9cee5qNV7Bs0kzUk=
knative.dev/pkg v0.0.0-20220826162920-93b66e6a8700 h1:6xjS69vf5Pbwu+dWckqPALmm5pc3p0/XScPpRBhugRc=
knative.dev/pkg v0.0.0-20220826162920-93b66e6a8700/go.mod h1:WIQZyPTLzT+z0V3/gB91aWugIi3E1mkU9rjCrLfjOwY=
knative.dev/serving v0.34.1-0.20220905171742-62685b3b4a5a h1:GT7gPwH4JkKScyZBKwNpE2w4hPDbbVFG66iZWbTxI4M=
knative.dev/serving v0.34.1-0.20220905171742-62685b3b4a5a/go.mod h1:F1+qPPtn78vmrDdOoOsapHEOCzVqRcmDcFFJolWVuE0=
knative.dev/pkg v0.0.0-20221123011941-9d7bd235ceed h1:Xk4DRdbRdI7Ky8vOGQK4S3nUHTRRpTjRMsK+9Zif94s=
knative.dev/pkg v0.0.0-20221123011941-9d7bd235ceed/go.mod h1:M+Amt1YZl5Nkl6+5FDFVIPaivsk2o5K/cIzOVq6Nsg0=
knative.dev/serving v0.34.0 h1:x3fS4e0AcNBBlQv5Dd5y30W2gtrxndUEwIEPknZfeVg=
knative.dev/serving v0.34.0/go.mod h1:IyfedOBq3KzcD5dZONjbix2BfS0jOwDq5td8UE9CjCk=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
Expand Down
14 changes: 7 additions & 7 deletions pkg/client/clientset/versioned/fake/register.go

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

14 changes: 7 additions & 7 deletions pkg/client/clientset/versioned/scheme/register.go

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

4 changes: 2 additions & 2 deletions pkg/horizon/horizon.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"crypto/tls"
"encoding/json"
"fmt"
"io/ioutil"
"net/http"
"os"
"path/filepath"
"time"

Expand Down Expand Up @@ -74,7 +74,7 @@ func readSecretKey(key string) (string, error) {
mountPath = env.SecretPath
}

data, err := ioutil.ReadFile(filepath.Join(mountPath, key))
data, err := os.ReadFile(filepath.Join(mountPath, key))
if err != nil {
return "", err
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/vsphere/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ package vsphere
import (
"context"
"errors"
"io/ioutil"
"net/http"
"net/url"
"os"
"path/filepath"
"time"

Expand Down Expand Up @@ -51,7 +51,7 @@ func ReadKey(key string) (string, error) {
mountPath = env.SecretPath
}

data, err := ioutil.ReadFile(filepath.Join(mountPath, key))
data, err := os.ReadFile(filepath.Join(mountPath, key))
if err != nil {
return "", err
}
Expand Down
6 changes: 4 additions & 2 deletions pkg/vsphere/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ SPDX-License-Identifier: Apache-2.0
// Package vsphere holds utilities for bootstrapping a vSphere API client
// from the metadata injected by the VSphereSource. Within a receive adapter,
// users can create a new vSphere SOAP API client with automatic keep-alive:
// client, err := vsphere.NewSOAPClient(ctx)
//
// client, err := vsphere.NewSOAPClient(ctx)
//
// To properly release vSphere API resources, it is recommended to log out when the client is not needed anymore:
// defer client.Logout(context.Background())
//
// defer client.Logout(context.Background())
//
// This is modeled after the Bindings pattern.
package vsphere
6 changes: 3 additions & 3 deletions plugins/vsphere/pkg/command/auth/auth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SPDX-License-Identifier: Apache-2.0
package auth_test

import (
"io/ioutil"
"io"
"testing"

"github.com/spf13/cobra"
Expand Down Expand Up @@ -45,7 +45,7 @@ func authTestCommand(clientConfig clientcmd.ClientConfig, objects ...runtime.Obj
ClientSet: client,
ClientConfig: clientConfig,
})
cmd.SetErr(ioutil.Discard)
cmd.SetOut(ioutil.Discard)
cmd.SetErr(io.Discard)
cmd.SetOut(io.Discard)
return cmd, client
}
4 changes: 2 additions & 2 deletions plugins/vsphere/pkg/command/auth/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package auth
import (
"context"
"fmt"
"io/ioutil"
"io"
"net/url"
"syscall"

Expand Down Expand Up @@ -136,6 +136,6 @@ func readPassword(cmd *cobra.Command, options *Options) (string, error) {
cmd.Println()
return string(password), err
}
password, err := ioutil.ReadAll(cmd.InOrStdin())
password, err := io.ReadAll(cmd.InOrStdin())
return string(password), err
}
6 changes: 3 additions & 3 deletions plugins/vsphere/pkg/command/binding/binding_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SPDX-License-Identifier: Apache-2.0
package binding_test

import (
"io/ioutil"
"io"
"testing"

"github.com/spf13/cobra"
Expand Down Expand Up @@ -47,7 +47,7 @@ func bindingTestCommand(clientConfig clientcmd.ClientConfig, objects ...runtime.
ClientConfig: clientConfig,
VSphereClientSet: vSphereSourcesClient,
})
cmd.SetErr(ioutil.Discard)
cmd.SetOut(ioutil.Discard)
cmd.SetErr(io.Discard)
cmd.SetOut(io.Discard)
return cmd, vSphereSourcesClient
}
6 changes: 3 additions & 3 deletions plugins/vsphere/pkg/command/source/source_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SPDX-License-Identifier: Apache-2.0
package source_test

import (
"io/ioutil"
"io"
"testing"

"github.com/spf13/cobra"
Expand Down Expand Up @@ -47,7 +47,7 @@ func sourceTestCommand(clientConfig clientcmd.ClientConfig, objects ...runtime.O
ClientConfig: clientConfig,
VSphereClientSet: vSphereSourcesClient,
})
cmd.SetErr(ioutil.Discard)
cmd.SetOut(ioutil.Discard)
cmd.SetErr(io.Discard)
cmd.SetOut(io.Discard)
return cmd, vSphereSourcesClient
}
Loading