From 2bd005c38792acf54bd14b569f97de51f4e7efe5 Mon Sep 17 00:00:00 2001 From: Sanket Sudake Date: Thu, 27 Oct 2022 16:24:59 +0530 Subject: [PATCH] Refactor code generator for deepcopy files (#2580) * Refactor code generator for deep copy files * Add timeout to push PR workflow * Add timeout for the fission-dump command * Update helm and kind versions Signed-off-by: Sanket Sudake --- .github/workflows/push_pr.yaml | 11 +- .github/workflows/release.yaml | 2 +- .github/workflows/upgrade_test.yaml | 4 +- Makefile | 3 +- go.mod | 63 ++++---- go.sum | 143 +++++++++--------- hack/update-codegen.sh | 2 +- pkg/apis/core/v1/groupversion_info.go | 41 +++++ pkg/apis/core/v1/register.go | 39 +---- pkg/apis/core/v1/types.go | 24 --- pkg/apis/core/v1/zz_generated.deepcopy.go | 46 +----- pkg/fission-cli/cmd/spec/validate.go | 19 ++- .../clientset/versioned/clientset.go | 3 +- .../externalversions/core/v1/canaryconfig.go | 8 +- .../externalversions/core/v1/environment.go | 8 +- .../externalversions/core/v1/function.go | 8 +- .../externalversions/core/v1/httptrigger.go | 8 +- .../externalversions/core/v1/interface.go | 16 +- .../core/v1/kuberneteswatchtrigger.go | 8 +- .../core/v1/messagequeuetrigger.go | 8 +- .../externalversions/core/v1/package.go | 8 +- .../externalversions/core/v1/timetrigger.go | 8 +- .../informers/externalversions/factory.go | 79 +++++++++- pkg/generated/listers/core/v1/canaryconfig.go | 20 +-- pkg/generated/listers/core/v1/environment.go | 20 +-- pkg/generated/listers/core/v1/function.go | 20 +-- pkg/generated/listers/core/v1/httptrigger.go | 20 +-- .../listers/core/v1/kuberneteswatchtrigger.go | 20 +-- .../listers/core/v1/messagequeuetrigger.go | 20 +-- pkg/generated/listers/core/v1/package.go | 20 +-- pkg/generated/listers/core/v1/timetrigger.go | 20 +-- 31 files changed, 368 insertions(+), 351 deletions(-) create mode 100644 pkg/apis/core/v1/groupversion_info.go diff --git a/.github/workflows/push_pr.yaml b/.github/workflows/push_pr.yaml index 42fa173b..9f7ca4b0 100644 --- a/.github/workflows/push_pr.yaml +++ b/.github/workflows/push_pr.yaml @@ -22,8 +22,8 @@ on: workflow_dispatch: env: - HELM_VERSION: v3.9.0 - KIND_VERSION: v0.14.0 + HELM_VERSION: v3.10.1 + KIND_VERSION: v0.17.0 jobs: # Job to run change detection @@ -33,7 +33,7 @@ jobs: strategy: fail-fast: false matrix: - kindversion: ["v1.19.16", "v1.20.15", "v1.21.12"] + kindversion: ["v1.19.16", "v1.20.15", "v1.21.14"] os: [ubuntu-latest] steps: - name: Checkout sources @@ -102,6 +102,7 @@ jobs: sudo chmod +x /usr/local/bin/fission - name: Build and Install Fission + timeout-minutes: 10 run: | kubectl create ns fission make create-crds @@ -117,9 +118,11 @@ jobs: fission version - name: Integration tests + timeout-minutes: 90 run: ./test/kind_CI.sh - name: Collect Fission Dump + timeout-minutes: 5 if: ${{ always() }} run: | command -v fission && fission support dump @@ -130,7 +133,7 @@ jobs: kind export logs --name kind kind-logs - name: Archive fission dump - if: ${{ failure() }} + if: ${{ failure() || cancelled() }} uses: actions/upload-artifact@v3 with: name: fission-dump-${{ github.run_id }}-${{ matrix.kindversion }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 0a37314b..68ad1d9f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -6,7 +6,7 @@ on: - v2.** env: - KIND_VERSION: v0.14.0 + KIND_VERSION: v0.17.0 KIND_NODE_IMAGE_TAG: v1.19.16 jobs: diff --git a/.github/workflows/upgrade_test.yaml b/.github/workflows/upgrade_test.yaml index c98e9db3..de11b79a 100644 --- a/.github/workflows/upgrade_test.yaml +++ b/.github/workflows/upgrade_test.yaml @@ -22,8 +22,8 @@ on: workflow_dispatch: env: - HELM_VERSION: v3.9.0 - KIND_VERSION: v0.14.0 + HELM_VERSION: v3.10.1 + KIND_VERSION: v0.17.0 jobs: upgrade-test: diff --git a/Makefile b/Makefile index 8f01d870..46056fc8 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,8 @@ install-fission-cli: mv dist/fission-cli_$(GOOS)_$(GOARCH)_v1/fission$(FISSION-CLI-SUFFIX) /usr/local/bin/fission ### Codegen -codegen: +codegen: controller-gen-install + @controller-gen object:headerFile="hack/boilerplate.txt" paths="./..." @./hack/update-codegen.sh ### CRDs diff --git a/go.mod b/go.mod index 62ffe40e..b6c51b34 100644 --- a/go.mod +++ b/go.mod @@ -3,14 +3,14 @@ module github.com/fission/fission go 1.19 require ( - github.com/Shopify/sarama v1.36.0 - github.com/dchest/uniuri v0.0.0-20200228104902-7aecb25e1fe5 + github.com/Shopify/sarama v1.37.2 + github.com/dchest/uniuri v1.2.0 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 github.com/dustin/go-humanize v1.0.0 github.com/emicklei/go-restful-openapi/v2 v2.9.1 github.com/emicklei/go-restful/v3 v3.9.0 github.com/fatih/color v1.13.0 - github.com/fsnotify/fsnotify v1.5.4 + github.com/fsnotify/fsnotify v1.6.0 github.com/go-git/go-git/v5 v5.4.2 github.com/go-openapi/spec v0.20.7 github.com/golang-jwt/jwt/v4 v4.4.2 @@ -29,25 +29,25 @@ require ( github.com/robfig/cron v1.2.0 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b - github.com/spf13/cobra v1.5.0 + github.com/spf13/cobra v1.6.1 github.com/spf13/pflag v1.0.5 - github.com/stretchr/testify v1.8.0 + github.com/stretchr/testify v1.8.1 github.com/wcharczuk/go-chart v2.0.1+incompatible - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.0 - go.opentelemetry.io/contrib/propagators/autoprop v0.36.0 - go.opentelemetry.io/otel v1.10.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 - go.opentelemetry.io/otel/sdk v1.10.0 - go.opentelemetry.io/otel/trace v1.10.0 + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 + go.opentelemetry.io/contrib/propagators/autoprop v0.36.4 + go.opentelemetry.io/otel v1.11.1 + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.11.1 + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.11.1 + go.opentelemetry.io/otel/sdk v1.11.1 + go.opentelemetry.io/otel/trace v1.11.1 go.uber.org/zap v1.23.0 - golang.org/x/net v0.0.0-20220923203811-8be639271d50 - google.golang.org/grpc v1.49.0 - k8s.io/api v0.25.2 - k8s.io/apiextensions-apiserver v0.25.2 - k8s.io/apimachinery v0.25.2 - k8s.io/client-go v0.25.2 - k8s.io/metrics v0.25.2 + golang.org/x/net v0.1.0 + google.golang.org/grpc v1.50.1 + k8s.io/api v0.25.3 + k8s.io/apiextensions-apiserver v0.25.3 + k8s.io/apimachinery v0.25.3 + k8s.io/client-go v0.25.3 + k8s.io/metrics v0.25.3 sigs.k8s.io/controller-runtime v0.13.0 sigs.k8s.io/yaml v1.3.0 ) @@ -106,7 +106,7 @@ require ( github.com/hashicorp/errwrap v1.0.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.1 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect - github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/inconshreveable/mousetrap v1.0.1 // indirect github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect github.com/jcmturner/aescts/v2 v2.0.0 // indirect github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect @@ -117,7 +117,7 @@ require ( github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect - github.com/klauspost/compress v1.15.9 // indirect + github.com/klauspost/compress v1.15.11 // indirect github.com/klauspost/pgzip v1.2.5 // indirect github.com/lib/pq v1.10.4 // indirect github.com/mailru/easyjson v0.7.6 // indirect @@ -133,32 +133,33 @@ require ( github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.2 // indirect github.com/opencontainers/runc v1.1.2 // indirect - github.com/pierrec/lz4/v4 v4.1.15 // indirect + github.com/pierrec/lz4/v4 v4.1.17 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.2.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect + github.com/rogpeppe/go-internal v1.9.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sergi/go-diff v1.1.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/ulikunitz/xz v0.5.9 // indirect github.com/xanzy/ssh-agent v0.3.0 // indirect github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect - go.opentelemetry.io/contrib/propagators/aws v1.10.0 // indirect - go.opentelemetry.io/contrib/propagators/b3 v1.10.0 // indirect - go.opentelemetry.io/contrib/propagators/jaeger v1.10.0 // indirect - go.opentelemetry.io/contrib/propagators/ot v1.10.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect - go.opentelemetry.io/otel/metric v0.32.0 // indirect + go.opentelemetry.io/contrib/propagators/aws v1.11.1 // indirect + go.opentelemetry.io/contrib/propagators/b3 v1.11.1 // indirect + go.opentelemetry.io/contrib/propagators/jaeger v1.11.1 // indirect + go.opentelemetry.io/contrib/propagators/ot v1.11.1 // indirect + go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.1 // indirect + go.opentelemetry.io/otel/metric v0.33.0 // indirect go.opentelemetry.io/proto/otlp v0.19.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect golang.org/x/image v0.0.0-20190802002840-cff245a6509b // indirect golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect - golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect - golang.org/x/text v0.3.7 // indirect + golang.org/x/sys v0.1.0 // indirect + golang.org/x/term v0.1.0 // indirect + golang.org/x/text v0.4.0 // indirect golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03 // indirect diff --git a/go.sum b/go.sum index 0ee681c8..6fd02232 100644 --- a/go.sum +++ b/go.sum @@ -86,10 +86,9 @@ github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 h1:YoJbenK9C6 github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -github.com/Shopify/sarama v1.36.0 h1:0OJs3eCcnezkWniVjwBbCJVaa0B1k7ImCRS3WN6NsSk= -github.com/Shopify/sarama v1.36.0/go.mod h1:9glG3eX83tgVYJ5aVtrjVUnEsOPqQIBGx1BWfN+X51I= -github.com/Shopify/toxiproxy/v2 v2.4.0 h1:O1e4Jfvr/hefNTNu+8VtdEG5lSeamJRo4aKhMOKNM64= -github.com/Shopify/toxiproxy/v2 v2.4.0/go.mod h1:3ilnjng821bkozDRxNoo64oI/DKqM+rOyJzb564+bvg= +github.com/Shopify/sarama v1.37.2 h1:LoBbU0yJPte0cE5TZCGdlzZRmMgMtZU/XgnUKZg9Cv4= +github.com/Shopify/sarama v1.37.2/go.mod h1:Nxye/E+YPru//Bpaorfhc3JsSGYwCaDDj+R4bK52U5o= +github.com/Shopify/toxiproxy/v2 v2.5.0 h1:i4LPT+qrSlKNtQf5QliVjdP08GyAH8+BUIc9gT0eahc= github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk= github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -160,8 +159,8 @@ github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxG github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dchest/uniuri v0.0.0-20200228104902-7aecb25e1fe5 h1:RAV05c0xOkJ3dZGS0JFybxFKZ2WMLabgx3uXnd7rpGs= -github.com/dchest/uniuri v0.0.0-20200228104902-7aecb25e1fe5/go.mod h1:GgB8SF9nRG+GqaDtLcwJZsQFhcogVCJ79j4EdT0c2V4= +github.com/dchest/uniuri v1.2.0 h1:koIcOUdrTIivZgSLhHQvKgqdWZq5d7KdMEWF1Ud6+5g= +github.com/dchest/uniuri v1.2.0/go.mod h1:fSzm4SLHzNZvWLvWJew423PhAzkpNQYq+uNLq4kxhkY= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko= @@ -208,11 +207,10 @@ github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBd github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= -github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= -github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= +github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0= github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= @@ -398,8 +396,9 @@ github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1: github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= +github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/influxdata/influxdb v1.10.0 h1:8xDpt8KO3lzrzf/ss+l8r42AGUZvoITu5824berK7SE= github.com/influxdata/influxdb v1.10.0/go.mod h1:IVPuoA2pOOxau/NguX7ipW0Jp9Bn+dMWlo0+VOscevU= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= @@ -443,8 +442,8 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY= -github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= +github.com/klauspost/compress v1.15.11 h1:Lcadnb3RKGin4FYM/orgq0qde+nc15E5Cbqg4B9Sx9c= +github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE= github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= @@ -456,7 +455,6 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= -github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -524,8 +522,8 @@ github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4 github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pierrec/lz4/v4 v4.1.2/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= -github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0= -github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= +github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -571,8 +569,8 @@ github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfm github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= -github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -598,8 +596,8 @@ github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= -github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU= -github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= +github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= +github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= @@ -609,6 +607,7 @@ github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -616,8 +615,9 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod h1:hzIxponao9Kjc7aWznkXaL4U4TWaDSs8zcsY4Ka08nM= @@ -626,16 +626,12 @@ github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oW github.com/ulikunitz/xz v0.5.9 h1:RsKRIA2MO8x56wkkcd3LbtcE/uMszhb6DpRf+3uwa3I= github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= github.com/wcharczuk/go-chart v2.0.1+incompatible h1:0pz39ZAycJFF7ju/1mepnk26RLVLBCWz1STcD3doU0A= github.com/wcharczuk/go-chart v2.0.1+incompatible/go.mod h1:PF5tmL4EIx/7Wf+hEkpCqYi5He4u90sw+0+6FhrryuE= github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI= github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0= -github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= -github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g= -github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= @@ -653,32 +649,32 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.0 h1:qZ3KzA4qPzLBDtQyPk4ydjlg8zvXbNysnFHaVMKJbVo= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.0/go.mod h1:14Oo79mRwusSI02L0EfG3Gp1uF3+1wSL+D4zDysxyqs= -go.opentelemetry.io/contrib/propagators/autoprop v0.36.0 h1:BCr2H/NIhiyrv12cRbsqA5zxErkpWtPi2NNj/Ar5lrI= -go.opentelemetry.io/contrib/propagators/autoprop v0.36.0/go.mod h1:YO90FHfpwzkzUrGZiRI67Mj/1lKwXcQDvHfPzB6Klrc= -go.opentelemetry.io/contrib/propagators/aws v1.10.0 h1:EEQ6YK48gtT2e6DtnFAEEFMiakN7WW0I4KK6Sc1NyEc= -go.opentelemetry.io/contrib/propagators/aws v1.10.0/go.mod h1:YCy6JRD/MdPJzUQJuwQTW+X6F/5C/NsWZnYS91+k7fE= -go.opentelemetry.io/contrib/propagators/b3 v1.10.0 h1:6AD2VV8edRdEYNaD8cNckpzgdMLU2kbV9OYyxt2kvCg= -go.opentelemetry.io/contrib/propagators/b3 v1.10.0/go.mod h1:oxvamQ/mTDFQVugml/uFS59+aEUnFLhmd1wsG+n5MOE= -go.opentelemetry.io/contrib/propagators/jaeger v1.10.0 h1:BemHdERnBHu4VHPgZAMCJmWrtkPHZ63P+eaZLa7Phzc= -go.opentelemetry.io/contrib/propagators/jaeger v1.10.0/go.mod h1:j8BPU1bBdUcOksJylVZ2XG6Qugsc/WF6Gx0ELeMLvL8= -go.opentelemetry.io/contrib/propagators/ot v1.10.0 h1:l2L3A2wj97MnDDTFnA/wZ0767e3lxdUmxaHb3rt8y3I= -go.opentelemetry.io/contrib/propagators/ot v1.10.0/go.mod h1:GzJoe4tBD1K/Aba958n2K0JpTvzKCFziagzHHAEx994= -go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= -go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= -go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 h1:TaB+1rQhddO1sF71MpZOZAuSPW1klK2M8XxfrBMfK7Y= -go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0/go.mod h1:78XhIg8Ht9vR4tbLNUhXsiOnE2HOuSeKAiAcoVQEpOY= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 h1:pDDYmo0QadUPal5fwXoY1pmMpFcdyhXOmL5drCrI3vU= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0/go.mod h1:Krqnjl22jUJ0HgMzw5eveuCvFDXY4nSYb4F8t5gdrag= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 h1:KtiUEhQmj/Pa874bVYKGNVdq8NPKiacPbaRRtgXi+t4= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0/go.mod h1:OfUCyyIiDvNXHWpcWgbF+MWvqPZiNa3YDEnivcnYsV0= -go.opentelemetry.io/otel/metric v0.32.0 h1:lh5KMDB8xlMM4kwE38vlZJ3rZeiWrjw3As1vclfC01k= -go.opentelemetry.io/otel/metric v0.32.0/go.mod h1:PVDNTt297p8ehm949jsIzd+Z2bIZJYQQG/uuHTeWFHY= -go.opentelemetry.io/otel/sdk v1.10.0 h1:jZ6K7sVn04kk/3DNUdJ4mqRlGDiXAVuIG+MMENpTNdY= -go.opentelemetry.io/otel/sdk v1.10.0/go.mod h1:vO06iKzD5baltJz1zarxMCNHFpUlUiOy4s65ECtn6kE= -go.opentelemetry.io/otel/trace v1.10.0 h1:npQMbR8o7mum8uF95yFbOEJffhs1sbCOfDh8zAJiH5E= -go.opentelemetry.io/otel/trace v1.10.0/go.mod h1:Sij3YYczqAdz+EhmGhE6TpTxUO5/F/AzrK+kxfGqySM= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4 h1:aUEBEdCa6iamGzg6fuYxDA8ThxvOG240mAvWDU+XLio= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.4/go.mod h1:l2MdsbKTocpPS5nQZscqTR9jd8u96VYZdcpF8Sye7mA= +go.opentelemetry.io/contrib/propagators/autoprop v0.36.4 h1:j3vDrBTpDmr8OowuTxj/Jw+5YBeOYkRYFvMd/G+bBjw= +go.opentelemetry.io/contrib/propagators/autoprop v0.36.4/go.mod h1:MjAC3Fl7Ds8KghJpMq6G2pdGdrx09kn6En0vooHEpSg= +go.opentelemetry.io/contrib/propagators/aws v1.11.1 h1:bPoZrezYKRb3HXrW6I7QmYLz5bStFrb4ZWmcRw8k+Gg= +go.opentelemetry.io/contrib/propagators/aws v1.11.1/go.mod h1:5jZiQXbiLiVtJP2YRe/IbHURUnWMVsnj8MVinGPAKJs= +go.opentelemetry.io/contrib/propagators/b3 v1.11.1 h1:icQ6ttRV+r/2fnU46BIo/g/mPu6Rs5Ug8Rtohe3KqzI= +go.opentelemetry.io/contrib/propagators/b3 v1.11.1/go.mod h1:ECIveyMXgnl4gorxFcA7RYjJY/Ql9n20ubhbfDc3QfA= +go.opentelemetry.io/contrib/propagators/jaeger v1.11.1 h1:Gw+P9NQzw4bjNGZXsoDhwwDWLnk4Y1waF8MQZAq/eYM= +go.opentelemetry.io/contrib/propagators/jaeger v1.11.1/go.mod h1:dP/N3ZFADH8azBcZfGXEFNBXpEmPTXYcNj9rkw1+2Oc= +go.opentelemetry.io/contrib/propagators/ot v1.11.1 h1:iezQwYW2sAaXwbXXA6Zg+PLjNnzc+M4hLKvOR6Q/CvI= +go.opentelemetry.io/contrib/propagators/ot v1.11.1/go.mod h1:oBced35DewKV7xvvIWC/oCaCFvthvTa6zjyvP2JhPAY= +go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4= +go.opentelemetry.io/otel v1.11.1/go.mod h1:1nNhXBbWSD0nsL38H6btgnFN2k4i0sNLHNNMZMSbUGE= +go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.1 h1:X2GndnMCsUPh6CiY2a+frAbNsXaPLbB0soHRYhAZ5Ig= +go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.1/go.mod h1:i8vjiSzbiUC7wOQplijSXMYUpNM93DtlS5CbUT+C6oQ= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.11.1 h1:MEQNafcNCB0uQIti/oHgU7CZpUMYQ7qigBwMVKycHvc= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.11.1/go.mod h1:19O5I2U5iys38SsmT2uDJja/300woyzE1KPIQxEUBUc= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.11.1 h1:LYyG/f1W/jzAix16jbksJfMQFpOH/Ma6T639pVPMgfI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.11.1/go.mod h1:QrRRQiY3kzAoYPNLP0W/Ikg0gR6V3LMc+ODSxr7yyvg= +go.opentelemetry.io/otel/metric v0.33.0 h1:xQAyl7uGEYvrLAiV/09iTJlp1pZnQ9Wl793qbVvED1E= +go.opentelemetry.io/otel/metric v0.33.0/go.mod h1:QlTYc+EnYNq/M2mNk1qDDMRLpqCOj2f/r5c7Fd5FYaI= +go.opentelemetry.io/otel/sdk v1.11.1 h1:F7KmQgoHljhUuJyA+9BiU+EkJfyX5nVVF4wyzWZpKxs= +go.opentelemetry.io/otel/sdk v1.11.1/go.mod h1:/l3FE4SupHJ12TduVjUkZtlfFqDCQJlOlithYrdktys= +go.opentelemetry.io/otel/trace v1.11.1 h1:ofxdnzsNrGBYXbP7t7zpUK281+go5rF7dvdIZXF8gdQ= +go.opentelemetry.io/otel/trace v1.11.1/go.mod h1:f/Q9G7vzk5u91PhbmKbg1Qn0rzH1LJ4vbPHFGkTPtOk= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.19.0 h1:IVN6GR+mhC4s5yfcTbmzHYODqvWAp3ZedA2SJPI1Nnw= go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= @@ -687,7 +683,7 @@ go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= +go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= 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.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= @@ -795,9 +791,8 @@ golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220725212005-46097bf591d3/go.mod h1:AaygXjzTFtRAg2ttMY5RMuhpJ3cNnI0XpyFJD1iQRSM= -golang.org/x/net v0.0.0-20220809184613-07c6da5e1ced/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= -golang.org/x/net v0.0.0-20220923203811-8be639271d50 h1:vKyz8L3zkd+xrMeIaBsQ/MNVPVFSffdaU3ZyYlBGFnI= -golang.org/x/net v0.0.0-20220923203811-8be639271d50/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0= +golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -828,8 +823,7 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7 h1:ZrnxWX62AgTKOSagEqxvb3ffipvEDX2pl7E1TdqLqIc= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -901,13 +895,14 @@ golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg= -golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw= +golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -916,8 +911,9 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1109,8 +1105,8 @@ google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= -google.golang.org/grpc v1.49.0 h1:WTLtQzmQori5FUH25Pq4WT22oCsv8USpQ+F6rqtsmxw= -google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= +google.golang.org/grpc v1.50.1 h1:DS/BukOZWp8s6p4Dt/tOaJaTQyPyOoCcrjroHuCeLzY= +google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -1141,7 +1137,6 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/kothar/go-backblaze.v0 v0.0.0-20190520213052-702d4e7eb465/go.mod h1:zJ2QpyDCYo1KvLXlmdnFlQAyF/Qfth0fB8239Qg7BIE= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= @@ -1169,21 +1164,21 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.25.2 h1:v6G8RyFcwf0HR5jQGIAYlvtRNrxMJQG1xJzaSeVnIS8= -k8s.io/api v0.25.2/go.mod h1:qP1Rn4sCVFwx/xIhe+we2cwBLTXNcheRyYXwajonhy0= -k8s.io/apiextensions-apiserver v0.25.2 h1:8uOQX17RE7XL02ngtnh3TgifY7EhekpK+/piwzQNnBo= -k8s.io/apiextensions-apiserver v0.25.2/go.mod h1:iRwwRDlWPfaHhuBfQ0WMa5skdQfrE18QXJaJvIDLvE8= -k8s.io/apimachinery v0.25.2 h1:WbxfAjCx+AeN8Ilp9joWnyJ6xu9OMeS/fsfjK/5zaQs= -k8s.io/apimachinery v0.25.2/go.mod h1:hqqA1X0bsgsxI6dXsJ4HnNTBOmJNxyPp8dw3u2fSHwA= -k8s.io/client-go v0.25.2 h1:SUPp9p5CwM0yXGQrwYurw9LWz+YtMwhWd0GqOsSiefo= -k8s.io/client-go v0.25.2/go.mod h1:i7cNU7N+yGQmJkewcRD2+Vuj4iz7b30kI8OcL3horQ4= +k8s.io/api v0.25.3 h1:Q1v5UFfYe87vi5H7NU0p4RXC26PPMT8KOpr1TLQbCMQ= +k8s.io/api v0.25.3/go.mod h1:o42gKscFrEVjHdQnyRenACrMtbuJsVdP+WVjqejfzmI= +k8s.io/apiextensions-apiserver v0.25.3 h1:bfI4KS31w2f9WM1KLGwnwuVlW3RSRPuIsfNF/3HzR0k= +k8s.io/apiextensions-apiserver v0.25.3/go.mod h1:ZJqwpCkxIx9itilmZek7JgfUAM0dnTsA48I4krPqRmo= +k8s.io/apimachinery v0.25.3 h1:7o9ium4uyUOM76t6aunP0nZuex7gDf8VGwkR5RcJnQc= +k8s.io/apimachinery v0.25.3/go.mod h1:jaF9C/iPNM1FuLl7Zuy5b9v+n35HGSh6AQ4HYRkCqwo= +k8s.io/client-go v0.25.3 h1:oB4Dyl8d6UbfDHD8Bv8evKylzs3BXzzufLiO27xuPs0= +k8s.io/client-go v0.25.3/go.mod h1:t39LPczAIMwycjcXkVc+CB+PZV69jQuNx4um5ORDjQA= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ= k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= -k8s.io/metrics v0.25.2 h1:105TuPaIFfr4EHzN56WwZJO7r1UesuDytNTzeMqGySo= -k8s.io/metrics v0.25.2/go.mod h1:4NDAauOuEJ+NWO2+hWkhFE4rWBx/plLWJOYU3vGl0sA= +k8s.io/metrics v0.25.3 h1:fp5RuALkbwI3UbKITdNYu6sa3LF4JPANR/ofq3oe+Fg= +k8s.io/metrics v0.25.3/go.mod h1:5j5FKJb8RHsb3Q2PLsD/p1mLiA1fTrl+a62Les+KDhc= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4= k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 6a2a8465..5127872a 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -11,7 +11,7 @@ fi SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)} -bash "${CODEGEN_PKG}"/generate-groups.sh "deepcopy,client,informer,lister" \ +bash "${CODEGEN_PKG}"/generate-groups.sh "client,informer,lister" \ github.com/fission/fission/pkg/generated \ github.com/fission/fission/pkg/apis \ "core:v1" \ diff --git a/pkg/apis/core/v1/groupversion_info.go b/pkg/apis/core/v1/groupversion_info.go new file mode 100644 index 00000000..92be73ec --- /dev/null +++ b/pkg/apis/core/v1/groupversion_info.go @@ -0,0 +1,41 @@ +/* +Copyright 2022. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// Package v1 contains API Schema definitions for the fission.io v1 API group +// +kubebuilder:object:generate=true +// +groupName=fission.io +package v1 + +import ( + "k8s.io/apimachinery/pkg/runtime/schema" + "sigs.k8s.io/controller-runtime/pkg/scheme" +) + +var ( + // GroupVersion is group version used to register these objects + SchemeGroupVersion = schema.GroupVersion{Group: "fission.io", Version: "v1"} + + // SchemeBuilder is used to add go types to the GroupVersionKind scheme + SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion} + + // AddToScheme adds the types in this group-version to the given scheme. + AddToScheme = SchemeBuilder.AddToScheme +) + +// Resource takes an unqualified resource and returns a Group qualified GroupResource +func Resource(resource string) schema.GroupResource { + return SchemeGroupVersion.WithResource(resource).GroupResource() +} diff --git a/pkg/apis/core/v1/register.go b/pkg/apis/core/v1/register.go index f0c844aa..fa238bcc 100644 --- a/pkg/apis/core/v1/register.go +++ b/pkg/apis/core/v1/register.go @@ -16,43 +16,11 @@ limitations under the License. package v1 -import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" -) - -// In order not to break the backward compatibility, keep coreV1 types stay -// at "fission.io" group instead of moving them to "core.fission.io". -// If the value of group is different from the one we register, the -// CRD client will not be able to get anything from the API server. -var SchemeGroupVersion = schema.GroupVersion{Group: "fission.io", Version: "v1"} - -var ( - // TODO: move SchemeBuilder with zz_generated.deepcopy.go to k8s.io/api. - // localSchemeBuilder and AddToScheme will stay in k8s.io/kubernetes. - SchemeBuilder runtime.SchemeBuilder - localSchemeBuilder = &SchemeBuilder - AddToScheme = localSchemeBuilder.AddToScheme -) - func init() { // We only register manually written functions here. The registration of the // generated functions takes place in the generated files. The separation // makes the code compile even when the generated files are missing. - localSchemeBuilder.Register(addKnownTypes) -} - -// Resource takes an unqualified resource and returns a Group qualified GroupResource -func Resource(resource string) schema.GroupResource { - return SchemeGroupVersion.WithResource(resource).GroupResource() -} - -// Adds the list of known types to the given scheme. -func addKnownTypes(scheme *runtime.Scheme) error { - scheme.AddKnownTypes( - SchemeGroupVersion, - &Function{}, + SchemeBuilder.Register(&Function{}, &FunctionList{}, &Environment{}, &EnvironmentList{}, @@ -67,8 +35,5 @@ func addKnownTypes(scheme *runtime.Scheme) error { &Package{}, &PackageList{}, &CanaryConfig{}, - &CanaryConfigList{}, - ) - metav1.AddToGroupVersion(scheme, SchemeGroupVersion) - return nil + &CanaryConfigList{}) } diff --git a/pkg/apis/core/v1/types.go b/pkg/apis/core/v1/types.go index 4fd70f88..f39706f6 100644 --- a/pkg/apis/core/v1/types.go +++ b/pkg/apis/core/v1/types.go @@ -20,7 +20,6 @@ import ( asv2beta2 "k8s.io/api/autoscaling/v2beta2" apiv1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime/schema" ) // @@ -41,7 +40,6 @@ type ( // Package Think of these as function-level images. // +genclient - // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +kubebuilder:object:root=true // +kubebuilder:resource:singular="package",scope="Namespaced",shortName={pkg} Package struct { @@ -56,7 +54,6 @@ type ( } // PackageList is a list of Packages. - // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +kubebuilder:object:root=true PackageList struct { metav1.TypeMeta `json:",inline"` @@ -66,7 +63,6 @@ type ( // Function is function runs within environment runtime with given package and secrets/configmaps. // +genclient - // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +kubebuilder:object:root=true // +kubebuilder:subresource:status // +kubebuilder:resource:singular="function",scope="Namespaced",shortName={fn} @@ -77,7 +73,6 @@ type ( } // FunctionList is a list of Functions. - // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object //+kubebuilder:object:root=true FunctionList struct { metav1.TypeMeta `json:",inline"` @@ -87,7 +82,6 @@ type ( // Environment is environment for building and running user functions. // +genclient - // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +kubebuilder:object:root=true // +kubebuilder:subresource:status Environment struct { @@ -97,7 +91,6 @@ type ( } // EnvironmentList is a list of Environments. - // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object //+kubebuilder:object:root=true EnvironmentList struct { metav1.TypeMeta `json:",inline"` @@ -107,7 +100,6 @@ type ( // HTTPTrigger is the trigger invokes user functions when receiving HTTP requests. // +genclient - // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +kubebuilder:object:root=true // +kubebuilder:subresource:status HTTPTrigger struct { @@ -117,7 +109,6 @@ type ( } // HTTPTriggerList is a list of HTTPTriggers - // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object //+kubebuilder:object:root=true HTTPTriggerList struct { metav1.TypeMeta `json:",inline"` @@ -127,7 +118,6 @@ type ( // KubernetesWatchTrigger watches kubernetes resource events and invokes functions. // +genclient - // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +kubebuilder:object:root=true // +kubebuilder:subresource:status KubernetesWatchTrigger struct { @@ -137,7 +127,6 @@ type ( } // KubernetesWatchTriggerList is a list of KubernetesWatchTriggers - // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +kubebuilder:object:root=true KubernetesWatchTriggerList struct { metav1.TypeMeta `json:",inline"` @@ -147,7 +136,6 @@ type ( // TimeTrigger invokes functions based on given cron schedule. // +genclient - // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +kubebuilder:object:root=true // +kubebuilder:subresource:status TimeTrigger struct { @@ -158,7 +146,6 @@ type ( } // TimeTriggerList is a list of TimeTriggers. - // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +kubebuilder:object:root=true TimeTriggerList struct { metav1.TypeMeta `json:",inline"` @@ -169,7 +156,6 @@ type ( // MessageQueueTrigger invokes functions when messages arrive to certain topic that trigger subscribes to. // +genclient - // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +kubebuilder:object:root=true MessageQueueTrigger struct { metav1.TypeMeta `json:",inline"` @@ -179,7 +165,6 @@ type ( } // MessageQueueTriggerList is a list of MessageQueueTriggers. - // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +kubebuilder:object:root=true MessageQueueTriggerList struct { metav1.TypeMeta `json:",inline"` @@ -189,7 +174,6 @@ type ( // CanaryConfig is for canary deployment of two functions. // +genclient - // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +kubebuilder:object:root=true CanaryConfig struct { metav1.TypeMeta `json:",inline"` @@ -199,7 +183,6 @@ type ( } // CanaryConfigList is a list of CanaryConfigs. - // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +kubebuilder:object:root=true CanaryConfigList struct { metav1.TypeMeta `json:",inline"` @@ -863,13 +846,6 @@ type ( Status string `json:"status"` } - // MetadataAccessor lets you work with object metadata and type metadata - // from any of the versioned or internal API objects. - MetadataAccessor interface { - GetObjectKind() schema.ObjectKind - GetObjectMeta() metav1.Object - } - // AuthLogin defines the body for router login AuthLogin struct { Username string `json:"username"` diff --git a/pkg/apis/core/v1/zz_generated.deepcopy.go b/pkg/apis/core/v1/zz_generated.deepcopy.go index 7651a349..a9a7c98d 100644 --- a/pkg/apis/core/v1/zz_generated.deepcopy.go +++ b/pkg/apis/core/v1/zz_generated.deepcopy.go @@ -17,12 +17,12 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by deepcopy-gen. DO NOT EDIT. +// Code generated by controller-gen. DO NOT EDIT. package v1 import ( - v2beta2 "k8s.io/api/autoscaling/v2beta2" + "k8s.io/api/autoscaling/v2beta2" corev1 "k8s.io/api/core/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) @@ -36,7 +36,6 @@ func (in *Archive) DeepCopyInto(out *Archive) { copy(*out, *in) } out.Checksum = in.Checksum - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Archive. @@ -52,7 +51,6 @@ func (in *Archive) DeepCopy() *Archive { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AuthLogin) DeepCopyInto(out *AuthLogin) { *out = *in - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AuthLogin. @@ -78,7 +76,6 @@ func (in *Builder) DeepCopyInto(out *Builder) { *out = new(corev1.PodSpec) (*in).DeepCopyInto(*out) } - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Builder. @@ -98,7 +95,6 @@ func (in *CanaryConfig) DeepCopyInto(out *CanaryConfig) { in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) out.Spec = in.Spec out.Status = in.Status - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CanaryConfig. @@ -131,7 +127,6 @@ func (in *CanaryConfigList) DeepCopyInto(out *CanaryConfigList) { (*in)[i].DeepCopyInto(&(*out)[i]) } } - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CanaryConfigList. @@ -155,7 +150,6 @@ func (in *CanaryConfigList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CanaryConfigSpec) DeepCopyInto(out *CanaryConfigSpec) { *out = *in - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CanaryConfigSpec. @@ -171,7 +165,6 @@ func (in *CanaryConfigSpec) DeepCopy() *CanaryConfigSpec { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CanaryConfigStatus) DeepCopyInto(out *CanaryConfigStatus) { *out = *in - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CanaryConfigStatus. @@ -187,7 +180,6 @@ func (in *CanaryConfigStatus) DeepCopy() *CanaryConfigStatus { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Checksum) DeepCopyInto(out *Checksum) { *out = *in - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Checksum. @@ -203,7 +195,6 @@ func (in *Checksum) DeepCopy() *Checksum { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ConfigMapReference) DeepCopyInto(out *ConfigMapReference) { *out = *in - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConfigMapReference. @@ -222,7 +213,6 @@ func (in *Environment) DeepCopyInto(out *Environment) { out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.Spec.DeepCopyInto(&out.Spec) - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Environment. @@ -255,7 +245,6 @@ func (in *EnvironmentList) DeepCopyInto(out *EnvironmentList) { (*in)[i].DeepCopyInto(&(*out)[i]) } } - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvironmentList. @@ -279,7 +268,6 @@ func (in *EnvironmentList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *EnvironmentReference) DeepCopyInto(out *EnvironmentReference) { *out = *in - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvironmentReference. @@ -298,7 +286,6 @@ func (in *EnvironmentSpec) DeepCopyInto(out *EnvironmentSpec) { in.Runtime.DeepCopyInto(&out.Runtime) in.Builder.DeepCopyInto(&out.Builder) in.Resources.DeepCopyInto(&out.Resources) - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EnvironmentSpec. @@ -326,7 +313,6 @@ func (in *ExecutionStrategy) DeepCopyInto(out *ExecutionStrategy) { *out = new(v2beta2.HorizontalPodAutoscalerBehavior) (*in).DeepCopyInto(*out) } - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ExecutionStrategy. @@ -345,7 +331,6 @@ func (in *Function) DeepCopyInto(out *Function) { out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.Spec.DeepCopyInto(&out.Spec) - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Function. @@ -378,7 +363,6 @@ func (in *FunctionList) DeepCopyInto(out *FunctionList) { (*in)[i].DeepCopyInto(&(*out)[i]) } } - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FunctionList. @@ -403,7 +387,6 @@ func (in *FunctionList) DeepCopyObject() runtime.Object { func (in *FunctionPackageRef) DeepCopyInto(out *FunctionPackageRef) { *out = *in out.PackageRef = in.PackageRef - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FunctionPackageRef. @@ -426,7 +409,6 @@ func (in *FunctionReference) DeepCopyInto(out *FunctionReference) { (*out)[key] = val } } - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FunctionReference. @@ -466,7 +448,6 @@ func (in *FunctionSpec) DeepCopyInto(out *FunctionSpec) { *out = new(corev1.PodSpec) (*in).DeepCopyInto(*out) } - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new FunctionSpec. @@ -485,7 +466,6 @@ func (in *HTTPTrigger) DeepCopyInto(out *HTTPTrigger) { out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.Spec.DeepCopyInto(&out.Spec) - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HTTPTrigger. @@ -518,7 +498,6 @@ func (in *HTTPTriggerList) DeepCopyInto(out *HTTPTriggerList) { (*in)[i].DeepCopyInto(&(*out)[i]) } } - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HTTPTriggerList. @@ -554,7 +533,6 @@ func (in *HTTPTriggerSpec) DeepCopyInto(out *HTTPTriggerSpec) { } in.FunctionReference.DeepCopyInto(&out.FunctionReference) in.IngressConfig.DeepCopyInto(&out.IngressConfig) - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HTTPTriggerSpec. @@ -577,7 +555,6 @@ func (in *IngressConfig) DeepCopyInto(out *IngressConfig) { (*out)[key] = val } } - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new IngressConfig. @@ -594,7 +571,6 @@ func (in *IngressConfig) DeepCopy() *IngressConfig { func (in *InvokeStrategy) DeepCopyInto(out *InvokeStrategy) { *out = *in in.ExecutionStrategy.DeepCopyInto(&out.ExecutionStrategy) - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new InvokeStrategy. @@ -613,7 +589,6 @@ func (in *KubernetesWatchTrigger) DeepCopyInto(out *KubernetesWatchTrigger) { out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.Spec.DeepCopyInto(&out.Spec) - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KubernetesWatchTrigger. @@ -646,7 +621,6 @@ func (in *KubernetesWatchTriggerList) DeepCopyInto(out *KubernetesWatchTriggerLi (*in)[i].DeepCopyInto(&(*out)[i]) } } - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KubernetesWatchTriggerList. @@ -678,7 +652,6 @@ func (in *KubernetesWatchTriggerSpec) DeepCopyInto(out *KubernetesWatchTriggerSp } } in.FunctionReference.DeepCopyInto(&out.FunctionReference) - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KubernetesWatchTriggerSpec. @@ -697,7 +670,6 @@ func (in *MessageQueueTrigger) DeepCopyInto(out *MessageQueueTrigger) { out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.Spec.DeepCopyInto(&out.Spec) - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MessageQueueTrigger. @@ -730,7 +702,6 @@ func (in *MessageQueueTriggerList) DeepCopyInto(out *MessageQueueTriggerList) { (*in)[i].DeepCopyInto(&(*out)[i]) } } - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MessageQueueTriggerList. @@ -787,7 +758,6 @@ func (in *MessageQueueTriggerSpec) DeepCopyInto(out *MessageQueueTriggerSpec) { *out = new(corev1.PodSpec) (*in).DeepCopyInto(*out) } - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MessageQueueTriggerSpec. @@ -807,7 +777,6 @@ func (in *Package) DeepCopyInto(out *Package) { in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.Spec.DeepCopyInto(&out.Spec) in.Status.DeepCopyInto(&out.Status) - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Package. @@ -840,7 +809,6 @@ func (in *PackageList) DeepCopyInto(out *PackageList) { (*in)[i].DeepCopyInto(&(*out)[i]) } } - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PackageList. @@ -864,7 +832,6 @@ func (in *PackageList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *PackageRef) DeepCopyInto(out *PackageRef) { *out = *in - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PackageRef. @@ -883,7 +850,6 @@ func (in *PackageSpec) DeepCopyInto(out *PackageSpec) { out.Environment = in.Environment in.Source.DeepCopyInto(&out.Source) in.Deployment.DeepCopyInto(&out.Deployment) - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PackageSpec. @@ -900,7 +866,6 @@ func (in *PackageSpec) DeepCopy() *PackageSpec { func (in *PackageStatus) DeepCopyInto(out *PackageStatus) { *out = *in in.LastUpdateTimestamp.DeepCopyInto(&out.LastUpdateTimestamp) - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PackageStatus. @@ -916,7 +881,6 @@ func (in *PackageStatus) DeepCopy() *PackageStatus { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *RouterAuthToken) DeepCopyInto(out *RouterAuthToken) { *out = *in - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RouterAuthToken. @@ -942,7 +906,6 @@ func (in *Runtime) DeepCopyInto(out *Runtime) { *out = new(corev1.PodSpec) (*in).DeepCopyInto(*out) } - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Runtime. @@ -958,7 +921,6 @@ func (in *Runtime) DeepCopy() *Runtime { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *SecretReference) DeepCopyInto(out *SecretReference) { *out = *in - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SecretReference. @@ -977,7 +939,6 @@ func (in *TimeTrigger) DeepCopyInto(out *TimeTrigger) { out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.Spec.DeepCopyInto(&out.Spec) - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TimeTrigger. @@ -1010,7 +971,6 @@ func (in *TimeTriggerList) DeepCopyInto(out *TimeTriggerList) { (*in)[i].DeepCopyInto(&(*out)[i]) } } - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TimeTriggerList. @@ -1035,7 +995,6 @@ func (in *TimeTriggerList) DeepCopyObject() runtime.Object { func (in *TimeTriggerSpec) DeepCopyInto(out *TimeTriggerSpec) { *out = *in in.FunctionReference.DeepCopyInto(&out.FunctionReference) - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TimeTriggerSpec. @@ -1051,7 +1010,6 @@ func (in *TimeTriggerSpec) DeepCopy() *TimeTriggerSpec { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ValidationError) DeepCopyInto(out *ValidationError) { *out = *in - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ValidationError. diff --git a/pkg/fission-cli/cmd/spec/validate.go b/pkg/fission-cli/cmd/spec/validate.go index a914019c..5b230261 100644 --- a/pkg/fission-cli/cmd/spec/validate.go +++ b/pkg/fission-cli/cmd/spec/validate.go @@ -25,6 +25,8 @@ import ( "github.com/hashicorp/go-multierror" "github.com/pkg/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" fv1 "github.com/fission/fission/pkg/apis/core/v1" "github.com/fission/fission/pkg/controller/client" @@ -200,15 +202,20 @@ func resourceConflictCheck(c client.Interface, fr *FissionResources, specAllowCo return result.ErrorOrNil() } -func isResourceConflicts(deployUID string, specObj fv1.MetadataAccessor, clusterObj fv1.MetadataAccessor, specAllowConflicts bool) error { - if specObj.GetObjectMeta().GetName() == clusterObj.GetObjectMeta().GetName() && - specObj.GetObjectMeta().GetNamespace() == clusterObj.GetObjectMeta().GetNamespace() && - deployUID != clusterObj.GetObjectMeta().GetAnnotations()[FISSION_DEPLOYMENT_UID_KEY] { +type objectWithKind interface { + schema.ObjectKind + metav1.Object +} + +func isResourceConflicts(deployUID string, specObj objectWithKind, clusterObj objectWithKind, specAllowConflicts bool) error { + if specObj.GetName() == clusterObj.GetName() && + specObj.GetNamespace() == clusterObj.GetNamespace() && + deployUID != clusterObj.GetAnnotations()[FISSION_DEPLOYMENT_UID_KEY] { if specAllowConflicts { return nil } - return fmt.Errorf("%v: '%v/%v' with different deploy uid already exists", - clusterObj.GetObjectKind().GroupVersionKind().Kind, clusterObj.GetObjectMeta().GetName(), clusterObj.GetObjectMeta().GetNamespace()) + return fmt.Errorf("%s: '%s/%s' with different deploy uid already exists", + clusterObj.GroupVersionKind().Kind, clusterObj.GetName(), clusterObj.GetNamespace()) } return nil } diff --git a/pkg/generated/clientset/versioned/clientset.go b/pkg/generated/clientset/versioned/clientset.go index afdb2d94..6c217743 100644 --- a/pkg/generated/clientset/versioned/clientset.go +++ b/pkg/generated/clientset/versioned/clientset.go @@ -33,8 +33,7 @@ type Interface interface { CoreV1() corev1.CoreV1Interface } -// Clientset contains the clients for groups. Each group has exactly one -// version included in a Clientset. +// Clientset contains the clients for groups. type Clientset struct { *discovery.DiscoveryClient coreV1 *corev1.CoreV1Client diff --git a/pkg/generated/informers/externalversions/core/v1/canaryconfig.go b/pkg/generated/informers/externalversions/core/v1/canaryconfig.go index e70b7105..4dc780f3 100644 --- a/pkg/generated/informers/externalversions/core/v1/canaryconfig.go +++ b/pkg/generated/informers/externalversions/core/v1/canaryconfig.go @@ -39,7 +39,7 @@ type CanaryConfigInformer interface { Lister() v1.CanaryConfigLister } -type _canaryConfigInformer struct { +type canaryConfigInformer struct { factory internalinterfaces.SharedInformerFactory tweakListOptions internalinterfaces.TweakListOptionsFunc namespace string @@ -77,14 +77,14 @@ func NewFilteredCanaryConfigInformer(client versioned.Interface, namespace strin ) } -func (f *_canaryConfigInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func (f *canaryConfigInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { return NewFilteredCanaryConfigInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } -func (f *_canaryConfigInformer) Informer() cache.SharedIndexInformer { +func (f *canaryConfigInformer) Informer() cache.SharedIndexInformer { return f.factory.InformerFor(&corev1.CanaryConfig{}, f.defaultInformer) } -func (f *_canaryConfigInformer) Lister() v1.CanaryConfigLister { +func (f *canaryConfigInformer) Lister() v1.CanaryConfigLister { return v1.NewCanaryConfigLister(f.Informer().GetIndexer()) } diff --git a/pkg/generated/informers/externalversions/core/v1/environment.go b/pkg/generated/informers/externalversions/core/v1/environment.go index 2541a728..d40c97ff 100644 --- a/pkg/generated/informers/externalversions/core/v1/environment.go +++ b/pkg/generated/informers/externalversions/core/v1/environment.go @@ -39,7 +39,7 @@ type EnvironmentInformer interface { Lister() v1.EnvironmentLister } -type _environmentInformer struct { +type environmentInformer struct { factory internalinterfaces.SharedInformerFactory tweakListOptions internalinterfaces.TweakListOptionsFunc namespace string @@ -77,14 +77,14 @@ func NewFilteredEnvironmentInformer(client versioned.Interface, namespace string ) } -func (f *_environmentInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func (f *environmentInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { return NewFilteredEnvironmentInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } -func (f *_environmentInformer) Informer() cache.SharedIndexInformer { +func (f *environmentInformer) Informer() cache.SharedIndexInformer { return f.factory.InformerFor(&corev1.Environment{}, f.defaultInformer) } -func (f *_environmentInformer) Lister() v1.EnvironmentLister { +func (f *environmentInformer) Lister() v1.EnvironmentLister { return v1.NewEnvironmentLister(f.Informer().GetIndexer()) } diff --git a/pkg/generated/informers/externalversions/core/v1/function.go b/pkg/generated/informers/externalversions/core/v1/function.go index aa248ed5..301b4218 100644 --- a/pkg/generated/informers/externalversions/core/v1/function.go +++ b/pkg/generated/informers/externalversions/core/v1/function.go @@ -39,7 +39,7 @@ type FunctionInformer interface { Lister() v1.FunctionLister } -type _functionInformer struct { +type functionInformer struct { factory internalinterfaces.SharedInformerFactory tweakListOptions internalinterfaces.TweakListOptionsFunc namespace string @@ -77,14 +77,14 @@ func NewFilteredFunctionInformer(client versioned.Interface, namespace string, r ) } -func (f *_functionInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func (f *functionInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { return NewFilteredFunctionInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } -func (f *_functionInformer) Informer() cache.SharedIndexInformer { +func (f *functionInformer) Informer() cache.SharedIndexInformer { return f.factory.InformerFor(&corev1.Function{}, f.defaultInformer) } -func (f *_functionInformer) Lister() v1.FunctionLister { +func (f *functionInformer) Lister() v1.FunctionLister { return v1.NewFunctionLister(f.Informer().GetIndexer()) } diff --git a/pkg/generated/informers/externalversions/core/v1/httptrigger.go b/pkg/generated/informers/externalversions/core/v1/httptrigger.go index add38693..db35a49d 100644 --- a/pkg/generated/informers/externalversions/core/v1/httptrigger.go +++ b/pkg/generated/informers/externalversions/core/v1/httptrigger.go @@ -39,7 +39,7 @@ type HTTPTriggerInformer interface { Lister() v1.HTTPTriggerLister } -type _hTTPTriggerInformer struct { +type hTTPTriggerInformer struct { factory internalinterfaces.SharedInformerFactory tweakListOptions internalinterfaces.TweakListOptionsFunc namespace string @@ -77,14 +77,14 @@ func NewFilteredHTTPTriggerInformer(client versioned.Interface, namespace string ) } -func (f *_hTTPTriggerInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func (f *hTTPTriggerInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { return NewFilteredHTTPTriggerInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } -func (f *_hTTPTriggerInformer) Informer() cache.SharedIndexInformer { +func (f *hTTPTriggerInformer) Informer() cache.SharedIndexInformer { return f.factory.InformerFor(&corev1.HTTPTrigger{}, f.defaultInformer) } -func (f *_hTTPTriggerInformer) Lister() v1.HTTPTriggerLister { +func (f *hTTPTriggerInformer) Lister() v1.HTTPTriggerLister { return v1.NewHTTPTriggerLister(f.Informer().GetIndexer()) } diff --git a/pkg/generated/informers/externalversions/core/v1/interface.go b/pkg/generated/informers/externalversions/core/v1/interface.go index 73a3ff01..a38773ff 100644 --- a/pkg/generated/informers/externalversions/core/v1/interface.go +++ b/pkg/generated/informers/externalversions/core/v1/interface.go @@ -55,40 +55,40 @@ func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakList // CanaryConfigs returns a CanaryConfigInformer. func (v *version) CanaryConfigs() CanaryConfigInformer { - return &_canaryConfigInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} + return &canaryConfigInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } // Environments returns a EnvironmentInformer. func (v *version) Environments() EnvironmentInformer { - return &_environmentInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} + return &environmentInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } // Functions returns a FunctionInformer. func (v *version) Functions() FunctionInformer { - return &_functionInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} + return &functionInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } // HTTPTriggers returns a HTTPTriggerInformer. func (v *version) HTTPTriggers() HTTPTriggerInformer { - return &_hTTPTriggerInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} + return &hTTPTriggerInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } // KubernetesWatchTriggers returns a KubernetesWatchTriggerInformer. func (v *version) KubernetesWatchTriggers() KubernetesWatchTriggerInformer { - return &_kubernetesWatchTriggerInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} + return &kubernetesWatchTriggerInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } // MessageQueueTriggers returns a MessageQueueTriggerInformer. func (v *version) MessageQueueTriggers() MessageQueueTriggerInformer { - return &_messageQueueTriggerInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} + return &messageQueueTriggerInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } // Packages returns a PackageInformer. func (v *version) Packages() PackageInformer { - return &_packageInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} + return &packageInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } // TimeTriggers returns a TimeTriggerInformer. func (v *version) TimeTriggers() TimeTriggerInformer { - return &_timeTriggerInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} + return &timeTriggerInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions} } diff --git a/pkg/generated/informers/externalversions/core/v1/kuberneteswatchtrigger.go b/pkg/generated/informers/externalversions/core/v1/kuberneteswatchtrigger.go index 5a3541a3..0791c526 100644 --- a/pkg/generated/informers/externalversions/core/v1/kuberneteswatchtrigger.go +++ b/pkg/generated/informers/externalversions/core/v1/kuberneteswatchtrigger.go @@ -39,7 +39,7 @@ type KubernetesWatchTriggerInformer interface { Lister() v1.KubernetesWatchTriggerLister } -type _kubernetesWatchTriggerInformer struct { +type kubernetesWatchTriggerInformer struct { factory internalinterfaces.SharedInformerFactory tweakListOptions internalinterfaces.TweakListOptionsFunc namespace string @@ -77,14 +77,14 @@ func NewFilteredKubernetesWatchTriggerInformer(client versioned.Interface, names ) } -func (f *_kubernetesWatchTriggerInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func (f *kubernetesWatchTriggerInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { return NewFilteredKubernetesWatchTriggerInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } -func (f *_kubernetesWatchTriggerInformer) Informer() cache.SharedIndexInformer { +func (f *kubernetesWatchTriggerInformer) Informer() cache.SharedIndexInformer { return f.factory.InformerFor(&corev1.KubernetesWatchTrigger{}, f.defaultInformer) } -func (f *_kubernetesWatchTriggerInformer) Lister() v1.KubernetesWatchTriggerLister { +func (f *kubernetesWatchTriggerInformer) Lister() v1.KubernetesWatchTriggerLister { return v1.NewKubernetesWatchTriggerLister(f.Informer().GetIndexer()) } diff --git a/pkg/generated/informers/externalversions/core/v1/messagequeuetrigger.go b/pkg/generated/informers/externalversions/core/v1/messagequeuetrigger.go index e46c7fce..4afab3fe 100644 --- a/pkg/generated/informers/externalversions/core/v1/messagequeuetrigger.go +++ b/pkg/generated/informers/externalversions/core/v1/messagequeuetrigger.go @@ -39,7 +39,7 @@ type MessageQueueTriggerInformer interface { Lister() v1.MessageQueueTriggerLister } -type _messageQueueTriggerInformer struct { +type messageQueueTriggerInformer struct { factory internalinterfaces.SharedInformerFactory tweakListOptions internalinterfaces.TweakListOptionsFunc namespace string @@ -77,14 +77,14 @@ func NewFilteredMessageQueueTriggerInformer(client versioned.Interface, namespac ) } -func (f *_messageQueueTriggerInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func (f *messageQueueTriggerInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { return NewFilteredMessageQueueTriggerInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } -func (f *_messageQueueTriggerInformer) Informer() cache.SharedIndexInformer { +func (f *messageQueueTriggerInformer) Informer() cache.SharedIndexInformer { return f.factory.InformerFor(&corev1.MessageQueueTrigger{}, f.defaultInformer) } -func (f *_messageQueueTriggerInformer) Lister() v1.MessageQueueTriggerLister { +func (f *messageQueueTriggerInformer) Lister() v1.MessageQueueTriggerLister { return v1.NewMessageQueueTriggerLister(f.Informer().GetIndexer()) } diff --git a/pkg/generated/informers/externalversions/core/v1/package.go b/pkg/generated/informers/externalversions/core/v1/package.go index 5ee97292..df85acbf 100644 --- a/pkg/generated/informers/externalversions/core/v1/package.go +++ b/pkg/generated/informers/externalversions/core/v1/package.go @@ -39,7 +39,7 @@ type PackageInformer interface { Lister() v1.PackageLister } -type _packageInformer struct { +type packageInformer struct { factory internalinterfaces.SharedInformerFactory tweakListOptions internalinterfaces.TweakListOptionsFunc namespace string @@ -77,14 +77,14 @@ func NewFilteredPackageInformer(client versioned.Interface, namespace string, re ) } -func (f *_packageInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func (f *packageInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { return NewFilteredPackageInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } -func (f *_packageInformer) Informer() cache.SharedIndexInformer { +func (f *packageInformer) Informer() cache.SharedIndexInformer { return f.factory.InformerFor(&corev1.Package{}, f.defaultInformer) } -func (f *_packageInformer) Lister() v1.PackageLister { +func (f *packageInformer) Lister() v1.PackageLister { return v1.NewPackageLister(f.Informer().GetIndexer()) } diff --git a/pkg/generated/informers/externalversions/core/v1/timetrigger.go b/pkg/generated/informers/externalversions/core/v1/timetrigger.go index ca0de67a..cb4da655 100644 --- a/pkg/generated/informers/externalversions/core/v1/timetrigger.go +++ b/pkg/generated/informers/externalversions/core/v1/timetrigger.go @@ -39,7 +39,7 @@ type TimeTriggerInformer interface { Lister() v1.TimeTriggerLister } -type _timeTriggerInformer struct { +type timeTriggerInformer struct { factory internalinterfaces.SharedInformerFactory tweakListOptions internalinterfaces.TweakListOptionsFunc namespace string @@ -77,14 +77,14 @@ func NewFilteredTimeTriggerInformer(client versioned.Interface, namespace string ) } -func (f *_timeTriggerInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { +func (f *timeTriggerInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { return NewFilteredTimeTriggerInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) } -func (f *_timeTriggerInformer) Informer() cache.SharedIndexInformer { +func (f *timeTriggerInformer) Informer() cache.SharedIndexInformer { return f.factory.InformerFor(&corev1.TimeTrigger{}, f.defaultInformer) } -func (f *_timeTriggerInformer) Lister() v1.TimeTriggerLister { +func (f *timeTriggerInformer) Lister() v1.TimeTriggerLister { return v1.NewTimeTriggerLister(f.Informer().GetIndexer()) } diff --git a/pkg/generated/informers/externalversions/factory.go b/pkg/generated/informers/externalversions/factory.go index 0cc19dfa..f0ec4ce9 100644 --- a/pkg/generated/informers/externalversions/factory.go +++ b/pkg/generated/informers/externalversions/factory.go @@ -47,6 +47,11 @@ type sharedInformerFactory struct { // startedInformers is used for tracking which informers have been started. // This allows Start() to be called multiple times safely. startedInformers map[reflect.Type]bool + // wg tracks how many goroutines were started. + wg sync.WaitGroup + // shuttingDown is true when Shutdown has been called. It may still be running + // because it needs to wait for goroutines. + shuttingDown bool } // WithCustomResyncConfig sets a custom resync period for the specified informer types. @@ -107,20 +112,39 @@ func NewSharedInformerFactoryWithOptions(client versioned.Interface, defaultResy return factory } -// Start initializes all requested informers. func (f *sharedInformerFactory) Start(stopCh <-chan struct{}) { f.lock.Lock() defer f.lock.Unlock() + if f.shuttingDown { + return + } + for informerType, informer := range f.informers { if !f.startedInformers[informerType] { - go informer.Run(stopCh) + f.wg.Add(1) + // We need a new variable in each loop iteration, + // otherwise the goroutine would use the loop variable + // and that keeps changing. + informer := informer + go func() { + defer f.wg.Done() + informer.Run(stopCh) + }() f.startedInformers[informerType] = true } } } -// WaitForCacheSync waits for all started informers' cache were synced. +func (f *sharedInformerFactory) Shutdown() { + f.lock.Lock() + f.shuttingDown = true + f.lock.Unlock() + + // Will return immediately if there is nothing to wait for. + f.wg.Wait() +} + func (f *sharedInformerFactory) WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool { informers := func() map[reflect.Type]cache.SharedIndexInformer { f.lock.Lock() @@ -167,11 +191,58 @@ func (f *sharedInformerFactory) InformerFor(obj runtime.Object, newFunc internal // SharedInformerFactory provides shared informers for resources in all known // API group versions. +// +// It is typically used like this: +// +// ctx, cancel := context.Background() +// defer cancel() +// factory := NewSharedInformerFactory(client, resyncPeriod) +// defer factory.WaitForStop() // Returns immediately if nothing was started. +// genericInformer := factory.ForResource(resource) +// typedInformer := factory.SomeAPIGroup().V1().SomeType() +// factory.Start(ctx.Done()) // Start processing these informers. +// synced := factory.WaitForCacheSync(ctx.Done()) +// for v, ok := range synced { +// if !ok { +// fmt.Fprintf(os.Stderr, "caches failed to sync: %v", v) +// return +// } +// } +// +// // Creating informers can also be created after Start, but then +// // Start must be called again: +// anotherGenericInformer := factory.ForResource(resource) +// factory.Start(ctx.Done()) type SharedInformerFactory interface { internalinterfaces.SharedInformerFactory - ForResource(resource schema.GroupVersionResource) (GenericInformer, error) + + // Start initializes all requested informers. They are handled in goroutines + // which run until the stop channel gets closed. + Start(stopCh <-chan struct{}) + + // Shutdown marks a factory as shutting down. At that point no new + // informers can be started anymore and Start will return without + // doing anything. + // + // In addition, Shutdown blocks until all goroutines have terminated. For that + // to happen, the close channel(s) that they were started with must be closed, + // either before Shutdown gets called or while it is waiting. + // + // Shutdown may be called multiple times, even concurrently. All such calls will + // block until all goroutines have terminated. + Shutdown() + + // WaitForCacheSync blocks until all started informers' caches were synced + // or the stop channel gets closed. WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool + // ForResource gives generic access to a shared informer of the matching type. + ForResource(resource schema.GroupVersionResource) (GenericInformer, error) + + // InternalInformerFor returns the SharedIndexInformer for obj using an internal + // client. + InformerFor(obj runtime.Object, newFunc internalinterfaces.NewInformerFunc) cache.SharedIndexInformer + Core() core.Interface } diff --git a/pkg/generated/listers/core/v1/canaryconfig.go b/pkg/generated/listers/core/v1/canaryconfig.go index ff805dc3..4d50ef25 100644 --- a/pkg/generated/listers/core/v1/canaryconfig.go +++ b/pkg/generated/listers/core/v1/canaryconfig.go @@ -36,18 +36,18 @@ type CanaryConfigLister interface { CanaryConfigListerExpansion } -// _canaryConfigLister implements the CanaryConfigLister interface. -type _canaryConfigLister struct { +// canaryConfigLister implements the CanaryConfigLister interface. +type canaryConfigLister struct { indexer cache.Indexer } // NewCanaryConfigLister returns a new CanaryConfigLister. func NewCanaryConfigLister(indexer cache.Indexer) CanaryConfigLister { - return &_canaryConfigLister{indexer: indexer} + return &canaryConfigLister{indexer: indexer} } // List lists all CanaryConfigs in the indexer. -func (s *_canaryConfigLister) List(selector labels.Selector) (ret []*v1.CanaryConfig, err error) { +func (s *canaryConfigLister) List(selector labels.Selector) (ret []*v1.CanaryConfig, err error) { err = cache.ListAll(s.indexer, selector, func(m interface{}) { ret = append(ret, m.(*v1.CanaryConfig)) }) @@ -55,8 +55,8 @@ func (s *_canaryConfigLister) List(selector labels.Selector) (ret []*v1.CanaryCo } // CanaryConfigs returns an object that can list and get CanaryConfigs. -func (s *_canaryConfigLister) CanaryConfigs(namespace string) CanaryConfigNamespaceLister { - return _canaryConfigNamespaceLister{indexer: s.indexer, namespace: namespace} +func (s *canaryConfigLister) CanaryConfigs(namespace string) CanaryConfigNamespaceLister { + return canaryConfigNamespaceLister{indexer: s.indexer, namespace: namespace} } // CanaryConfigNamespaceLister helps list and get CanaryConfigs. @@ -71,15 +71,15 @@ type CanaryConfigNamespaceLister interface { CanaryConfigNamespaceListerExpansion } -// _canaryConfigNamespaceLister implements the CanaryConfigNamespaceLister +// canaryConfigNamespaceLister implements the CanaryConfigNamespaceLister // interface. -type _canaryConfigNamespaceLister struct { +type canaryConfigNamespaceLister struct { indexer cache.Indexer namespace string } // List lists all CanaryConfigs in the indexer for a given namespace. -func (s _canaryConfigNamespaceLister) List(selector labels.Selector) (ret []*v1.CanaryConfig, err error) { +func (s canaryConfigNamespaceLister) List(selector labels.Selector) (ret []*v1.CanaryConfig, err error) { err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) { ret = append(ret, m.(*v1.CanaryConfig)) }) @@ -87,7 +87,7 @@ func (s _canaryConfigNamespaceLister) List(selector labels.Selector) (ret []*v1. } // Get retrieves the CanaryConfig from the indexer for a given namespace and name. -func (s _canaryConfigNamespaceLister) Get(name string) (*v1.CanaryConfig, error) { +func (s canaryConfigNamespaceLister) Get(name string) (*v1.CanaryConfig, error) { obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name) if err != nil { return nil, err diff --git a/pkg/generated/listers/core/v1/environment.go b/pkg/generated/listers/core/v1/environment.go index c4afc572..7d92ae58 100644 --- a/pkg/generated/listers/core/v1/environment.go +++ b/pkg/generated/listers/core/v1/environment.go @@ -36,18 +36,18 @@ type EnvironmentLister interface { EnvironmentListerExpansion } -// _environmentLister implements the EnvironmentLister interface. -type _environmentLister struct { +// environmentLister implements the EnvironmentLister interface. +type environmentLister struct { indexer cache.Indexer } // NewEnvironmentLister returns a new EnvironmentLister. func NewEnvironmentLister(indexer cache.Indexer) EnvironmentLister { - return &_environmentLister{indexer: indexer} + return &environmentLister{indexer: indexer} } // List lists all Environments in the indexer. -func (s *_environmentLister) List(selector labels.Selector) (ret []*v1.Environment, err error) { +func (s *environmentLister) List(selector labels.Selector) (ret []*v1.Environment, err error) { err = cache.ListAll(s.indexer, selector, func(m interface{}) { ret = append(ret, m.(*v1.Environment)) }) @@ -55,8 +55,8 @@ func (s *_environmentLister) List(selector labels.Selector) (ret []*v1.Environme } // Environments returns an object that can list and get Environments. -func (s *_environmentLister) Environments(namespace string) EnvironmentNamespaceLister { - return _environmentNamespaceLister{indexer: s.indexer, namespace: namespace} +func (s *environmentLister) Environments(namespace string) EnvironmentNamespaceLister { + return environmentNamespaceLister{indexer: s.indexer, namespace: namespace} } // EnvironmentNamespaceLister helps list and get Environments. @@ -71,15 +71,15 @@ type EnvironmentNamespaceLister interface { EnvironmentNamespaceListerExpansion } -// _environmentNamespaceLister implements the EnvironmentNamespaceLister +// environmentNamespaceLister implements the EnvironmentNamespaceLister // interface. -type _environmentNamespaceLister struct { +type environmentNamespaceLister struct { indexer cache.Indexer namespace string } // List lists all Environments in the indexer for a given namespace. -func (s _environmentNamespaceLister) List(selector labels.Selector) (ret []*v1.Environment, err error) { +func (s environmentNamespaceLister) List(selector labels.Selector) (ret []*v1.Environment, err error) { err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) { ret = append(ret, m.(*v1.Environment)) }) @@ -87,7 +87,7 @@ func (s _environmentNamespaceLister) List(selector labels.Selector) (ret []*v1.E } // Get retrieves the Environment from the indexer for a given namespace and name. -func (s _environmentNamespaceLister) Get(name string) (*v1.Environment, error) { +func (s environmentNamespaceLister) Get(name string) (*v1.Environment, error) { obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name) if err != nil { return nil, err diff --git a/pkg/generated/listers/core/v1/function.go b/pkg/generated/listers/core/v1/function.go index ae4f06a2..278ba7da 100644 --- a/pkg/generated/listers/core/v1/function.go +++ b/pkg/generated/listers/core/v1/function.go @@ -36,18 +36,18 @@ type FunctionLister interface { FunctionListerExpansion } -// _functionLister implements the FunctionLister interface. -type _functionLister struct { +// functionLister implements the FunctionLister interface. +type functionLister struct { indexer cache.Indexer } // NewFunctionLister returns a new FunctionLister. func NewFunctionLister(indexer cache.Indexer) FunctionLister { - return &_functionLister{indexer: indexer} + return &functionLister{indexer: indexer} } // List lists all Functions in the indexer. -func (s *_functionLister) List(selector labels.Selector) (ret []*v1.Function, err error) { +func (s *functionLister) List(selector labels.Selector) (ret []*v1.Function, err error) { err = cache.ListAll(s.indexer, selector, func(m interface{}) { ret = append(ret, m.(*v1.Function)) }) @@ -55,8 +55,8 @@ func (s *_functionLister) List(selector labels.Selector) (ret []*v1.Function, er } // Functions returns an object that can list and get Functions. -func (s *_functionLister) Functions(namespace string) FunctionNamespaceLister { - return _functionNamespaceLister{indexer: s.indexer, namespace: namespace} +func (s *functionLister) Functions(namespace string) FunctionNamespaceLister { + return functionNamespaceLister{indexer: s.indexer, namespace: namespace} } // FunctionNamespaceLister helps list and get Functions. @@ -71,15 +71,15 @@ type FunctionNamespaceLister interface { FunctionNamespaceListerExpansion } -// _functionNamespaceLister implements the FunctionNamespaceLister +// functionNamespaceLister implements the FunctionNamespaceLister // interface. -type _functionNamespaceLister struct { +type functionNamespaceLister struct { indexer cache.Indexer namespace string } // List lists all Functions in the indexer for a given namespace. -func (s _functionNamespaceLister) List(selector labels.Selector) (ret []*v1.Function, err error) { +func (s functionNamespaceLister) List(selector labels.Selector) (ret []*v1.Function, err error) { err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) { ret = append(ret, m.(*v1.Function)) }) @@ -87,7 +87,7 @@ func (s _functionNamespaceLister) List(selector labels.Selector) (ret []*v1.Func } // Get retrieves the Function from the indexer for a given namespace and name. -func (s _functionNamespaceLister) Get(name string) (*v1.Function, error) { +func (s functionNamespaceLister) Get(name string) (*v1.Function, error) { obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name) if err != nil { return nil, err diff --git a/pkg/generated/listers/core/v1/httptrigger.go b/pkg/generated/listers/core/v1/httptrigger.go index ef475336..fabb24aa 100644 --- a/pkg/generated/listers/core/v1/httptrigger.go +++ b/pkg/generated/listers/core/v1/httptrigger.go @@ -36,18 +36,18 @@ type HTTPTriggerLister interface { HTTPTriggerListerExpansion } -// _hTTPTriggerLister implements the HTTPTriggerLister interface. -type _hTTPTriggerLister struct { +// hTTPTriggerLister implements the HTTPTriggerLister interface. +type hTTPTriggerLister struct { indexer cache.Indexer } // NewHTTPTriggerLister returns a new HTTPTriggerLister. func NewHTTPTriggerLister(indexer cache.Indexer) HTTPTriggerLister { - return &_hTTPTriggerLister{indexer: indexer} + return &hTTPTriggerLister{indexer: indexer} } // List lists all HTTPTriggers in the indexer. -func (s *_hTTPTriggerLister) List(selector labels.Selector) (ret []*v1.HTTPTrigger, err error) { +func (s *hTTPTriggerLister) List(selector labels.Selector) (ret []*v1.HTTPTrigger, err error) { err = cache.ListAll(s.indexer, selector, func(m interface{}) { ret = append(ret, m.(*v1.HTTPTrigger)) }) @@ -55,8 +55,8 @@ func (s *_hTTPTriggerLister) List(selector labels.Selector) (ret []*v1.HTTPTrigg } // HTTPTriggers returns an object that can list and get HTTPTriggers. -func (s *_hTTPTriggerLister) HTTPTriggers(namespace string) HTTPTriggerNamespaceLister { - return _hTTPTriggerNamespaceLister{indexer: s.indexer, namespace: namespace} +func (s *hTTPTriggerLister) HTTPTriggers(namespace string) HTTPTriggerNamespaceLister { + return hTTPTriggerNamespaceLister{indexer: s.indexer, namespace: namespace} } // HTTPTriggerNamespaceLister helps list and get HTTPTriggers. @@ -71,15 +71,15 @@ type HTTPTriggerNamespaceLister interface { HTTPTriggerNamespaceListerExpansion } -// _hTTPTriggerNamespaceLister implements the HTTPTriggerNamespaceLister +// hTTPTriggerNamespaceLister implements the HTTPTriggerNamespaceLister // interface. -type _hTTPTriggerNamespaceLister struct { +type hTTPTriggerNamespaceLister struct { indexer cache.Indexer namespace string } // List lists all HTTPTriggers in the indexer for a given namespace. -func (s _hTTPTriggerNamespaceLister) List(selector labels.Selector) (ret []*v1.HTTPTrigger, err error) { +func (s hTTPTriggerNamespaceLister) List(selector labels.Selector) (ret []*v1.HTTPTrigger, err error) { err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) { ret = append(ret, m.(*v1.HTTPTrigger)) }) @@ -87,7 +87,7 @@ func (s _hTTPTriggerNamespaceLister) List(selector labels.Selector) (ret []*v1.H } // Get retrieves the HTTPTrigger from the indexer for a given namespace and name. -func (s _hTTPTriggerNamespaceLister) Get(name string) (*v1.HTTPTrigger, error) { +func (s hTTPTriggerNamespaceLister) Get(name string) (*v1.HTTPTrigger, error) { obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name) if err != nil { return nil, err diff --git a/pkg/generated/listers/core/v1/kuberneteswatchtrigger.go b/pkg/generated/listers/core/v1/kuberneteswatchtrigger.go index 48831c76..910a655e 100644 --- a/pkg/generated/listers/core/v1/kuberneteswatchtrigger.go +++ b/pkg/generated/listers/core/v1/kuberneteswatchtrigger.go @@ -36,18 +36,18 @@ type KubernetesWatchTriggerLister interface { KubernetesWatchTriggerListerExpansion } -// _kubernetesWatchTriggerLister implements the KubernetesWatchTriggerLister interface. -type _kubernetesWatchTriggerLister struct { +// kubernetesWatchTriggerLister implements the KubernetesWatchTriggerLister interface. +type kubernetesWatchTriggerLister struct { indexer cache.Indexer } // NewKubernetesWatchTriggerLister returns a new KubernetesWatchTriggerLister. func NewKubernetesWatchTriggerLister(indexer cache.Indexer) KubernetesWatchTriggerLister { - return &_kubernetesWatchTriggerLister{indexer: indexer} + return &kubernetesWatchTriggerLister{indexer: indexer} } // List lists all KubernetesWatchTriggers in the indexer. -func (s *_kubernetesWatchTriggerLister) List(selector labels.Selector) (ret []*v1.KubernetesWatchTrigger, err error) { +func (s *kubernetesWatchTriggerLister) List(selector labels.Selector) (ret []*v1.KubernetesWatchTrigger, err error) { err = cache.ListAll(s.indexer, selector, func(m interface{}) { ret = append(ret, m.(*v1.KubernetesWatchTrigger)) }) @@ -55,8 +55,8 @@ func (s *_kubernetesWatchTriggerLister) List(selector labels.Selector) (ret []*v } // KubernetesWatchTriggers returns an object that can list and get KubernetesWatchTriggers. -func (s *_kubernetesWatchTriggerLister) KubernetesWatchTriggers(namespace string) KubernetesWatchTriggerNamespaceLister { - return _kubernetesWatchTriggerNamespaceLister{indexer: s.indexer, namespace: namespace} +func (s *kubernetesWatchTriggerLister) KubernetesWatchTriggers(namespace string) KubernetesWatchTriggerNamespaceLister { + return kubernetesWatchTriggerNamespaceLister{indexer: s.indexer, namespace: namespace} } // KubernetesWatchTriggerNamespaceLister helps list and get KubernetesWatchTriggers. @@ -71,15 +71,15 @@ type KubernetesWatchTriggerNamespaceLister interface { KubernetesWatchTriggerNamespaceListerExpansion } -// _kubernetesWatchTriggerNamespaceLister implements the KubernetesWatchTriggerNamespaceLister +// kubernetesWatchTriggerNamespaceLister implements the KubernetesWatchTriggerNamespaceLister // interface. -type _kubernetesWatchTriggerNamespaceLister struct { +type kubernetesWatchTriggerNamespaceLister struct { indexer cache.Indexer namespace string } // List lists all KubernetesWatchTriggers in the indexer for a given namespace. -func (s _kubernetesWatchTriggerNamespaceLister) List(selector labels.Selector) (ret []*v1.KubernetesWatchTrigger, err error) { +func (s kubernetesWatchTriggerNamespaceLister) List(selector labels.Selector) (ret []*v1.KubernetesWatchTrigger, err error) { err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) { ret = append(ret, m.(*v1.KubernetesWatchTrigger)) }) @@ -87,7 +87,7 @@ func (s _kubernetesWatchTriggerNamespaceLister) List(selector labels.Selector) ( } // Get retrieves the KubernetesWatchTrigger from the indexer for a given namespace and name. -func (s _kubernetesWatchTriggerNamespaceLister) Get(name string) (*v1.KubernetesWatchTrigger, error) { +func (s kubernetesWatchTriggerNamespaceLister) Get(name string) (*v1.KubernetesWatchTrigger, error) { obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name) if err != nil { return nil, err diff --git a/pkg/generated/listers/core/v1/messagequeuetrigger.go b/pkg/generated/listers/core/v1/messagequeuetrigger.go index 47336421..8adae72b 100644 --- a/pkg/generated/listers/core/v1/messagequeuetrigger.go +++ b/pkg/generated/listers/core/v1/messagequeuetrigger.go @@ -36,18 +36,18 @@ type MessageQueueTriggerLister interface { MessageQueueTriggerListerExpansion } -// _messageQueueTriggerLister implements the MessageQueueTriggerLister interface. -type _messageQueueTriggerLister struct { +// messageQueueTriggerLister implements the MessageQueueTriggerLister interface. +type messageQueueTriggerLister struct { indexer cache.Indexer } // NewMessageQueueTriggerLister returns a new MessageQueueTriggerLister. func NewMessageQueueTriggerLister(indexer cache.Indexer) MessageQueueTriggerLister { - return &_messageQueueTriggerLister{indexer: indexer} + return &messageQueueTriggerLister{indexer: indexer} } // List lists all MessageQueueTriggers in the indexer. -func (s *_messageQueueTriggerLister) List(selector labels.Selector) (ret []*v1.MessageQueueTrigger, err error) { +func (s *messageQueueTriggerLister) List(selector labels.Selector) (ret []*v1.MessageQueueTrigger, err error) { err = cache.ListAll(s.indexer, selector, func(m interface{}) { ret = append(ret, m.(*v1.MessageQueueTrigger)) }) @@ -55,8 +55,8 @@ func (s *_messageQueueTriggerLister) List(selector labels.Selector) (ret []*v1.M } // MessageQueueTriggers returns an object that can list and get MessageQueueTriggers. -func (s *_messageQueueTriggerLister) MessageQueueTriggers(namespace string) MessageQueueTriggerNamespaceLister { - return _messageQueueTriggerNamespaceLister{indexer: s.indexer, namespace: namespace} +func (s *messageQueueTriggerLister) MessageQueueTriggers(namespace string) MessageQueueTriggerNamespaceLister { + return messageQueueTriggerNamespaceLister{indexer: s.indexer, namespace: namespace} } // MessageQueueTriggerNamespaceLister helps list and get MessageQueueTriggers. @@ -71,15 +71,15 @@ type MessageQueueTriggerNamespaceLister interface { MessageQueueTriggerNamespaceListerExpansion } -// _messageQueueTriggerNamespaceLister implements the MessageQueueTriggerNamespaceLister +// messageQueueTriggerNamespaceLister implements the MessageQueueTriggerNamespaceLister // interface. -type _messageQueueTriggerNamespaceLister struct { +type messageQueueTriggerNamespaceLister struct { indexer cache.Indexer namespace string } // List lists all MessageQueueTriggers in the indexer for a given namespace. -func (s _messageQueueTriggerNamespaceLister) List(selector labels.Selector) (ret []*v1.MessageQueueTrigger, err error) { +func (s messageQueueTriggerNamespaceLister) List(selector labels.Selector) (ret []*v1.MessageQueueTrigger, err error) { err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) { ret = append(ret, m.(*v1.MessageQueueTrigger)) }) @@ -87,7 +87,7 @@ func (s _messageQueueTriggerNamespaceLister) List(selector labels.Selector) (ret } // Get retrieves the MessageQueueTrigger from the indexer for a given namespace and name. -func (s _messageQueueTriggerNamespaceLister) Get(name string) (*v1.MessageQueueTrigger, error) { +func (s messageQueueTriggerNamespaceLister) Get(name string) (*v1.MessageQueueTrigger, error) { obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name) if err != nil { return nil, err diff --git a/pkg/generated/listers/core/v1/package.go b/pkg/generated/listers/core/v1/package.go index 66272544..ebc1b6d7 100644 --- a/pkg/generated/listers/core/v1/package.go +++ b/pkg/generated/listers/core/v1/package.go @@ -36,18 +36,18 @@ type PackageLister interface { PackageListerExpansion } -// _packageLister implements the PackageLister interface. -type _packageLister struct { +// packageLister implements the PackageLister interface. +type packageLister struct { indexer cache.Indexer } // NewPackageLister returns a new PackageLister. func NewPackageLister(indexer cache.Indexer) PackageLister { - return &_packageLister{indexer: indexer} + return &packageLister{indexer: indexer} } // List lists all Packages in the indexer. -func (s *_packageLister) List(selector labels.Selector) (ret []*v1.Package, err error) { +func (s *packageLister) List(selector labels.Selector) (ret []*v1.Package, err error) { err = cache.ListAll(s.indexer, selector, func(m interface{}) { ret = append(ret, m.(*v1.Package)) }) @@ -55,8 +55,8 @@ func (s *_packageLister) List(selector labels.Selector) (ret []*v1.Package, err } // Packages returns an object that can list and get Packages. -func (s *_packageLister) Packages(namespace string) PackageNamespaceLister { - return _packageNamespaceLister{indexer: s.indexer, namespace: namespace} +func (s *packageLister) Packages(namespace string) PackageNamespaceLister { + return packageNamespaceLister{indexer: s.indexer, namespace: namespace} } // PackageNamespaceLister helps list and get Packages. @@ -71,15 +71,15 @@ type PackageNamespaceLister interface { PackageNamespaceListerExpansion } -// _packageNamespaceLister implements the PackageNamespaceLister +// packageNamespaceLister implements the PackageNamespaceLister // interface. -type _packageNamespaceLister struct { +type packageNamespaceLister struct { indexer cache.Indexer namespace string } // List lists all Packages in the indexer for a given namespace. -func (s _packageNamespaceLister) List(selector labels.Selector) (ret []*v1.Package, err error) { +func (s packageNamespaceLister) List(selector labels.Selector) (ret []*v1.Package, err error) { err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) { ret = append(ret, m.(*v1.Package)) }) @@ -87,7 +87,7 @@ func (s _packageNamespaceLister) List(selector labels.Selector) (ret []*v1.Packa } // Get retrieves the Package from the indexer for a given namespace and name. -func (s _packageNamespaceLister) Get(name string) (*v1.Package, error) { +func (s packageNamespaceLister) Get(name string) (*v1.Package, error) { obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name) if err != nil { return nil, err diff --git a/pkg/generated/listers/core/v1/timetrigger.go b/pkg/generated/listers/core/v1/timetrigger.go index 0edcd6f9..c8651369 100644 --- a/pkg/generated/listers/core/v1/timetrigger.go +++ b/pkg/generated/listers/core/v1/timetrigger.go @@ -36,18 +36,18 @@ type TimeTriggerLister interface { TimeTriggerListerExpansion } -// _timeTriggerLister implements the TimeTriggerLister interface. -type _timeTriggerLister struct { +// timeTriggerLister implements the TimeTriggerLister interface. +type timeTriggerLister struct { indexer cache.Indexer } // NewTimeTriggerLister returns a new TimeTriggerLister. func NewTimeTriggerLister(indexer cache.Indexer) TimeTriggerLister { - return &_timeTriggerLister{indexer: indexer} + return &timeTriggerLister{indexer: indexer} } // List lists all TimeTriggers in the indexer. -func (s *_timeTriggerLister) List(selector labels.Selector) (ret []*v1.TimeTrigger, err error) { +func (s *timeTriggerLister) List(selector labels.Selector) (ret []*v1.TimeTrigger, err error) { err = cache.ListAll(s.indexer, selector, func(m interface{}) { ret = append(ret, m.(*v1.TimeTrigger)) }) @@ -55,8 +55,8 @@ func (s *_timeTriggerLister) List(selector labels.Selector) (ret []*v1.TimeTrigg } // TimeTriggers returns an object that can list and get TimeTriggers. -func (s *_timeTriggerLister) TimeTriggers(namespace string) TimeTriggerNamespaceLister { - return _timeTriggerNamespaceLister{indexer: s.indexer, namespace: namespace} +func (s *timeTriggerLister) TimeTriggers(namespace string) TimeTriggerNamespaceLister { + return timeTriggerNamespaceLister{indexer: s.indexer, namespace: namespace} } // TimeTriggerNamespaceLister helps list and get TimeTriggers. @@ -71,15 +71,15 @@ type TimeTriggerNamespaceLister interface { TimeTriggerNamespaceListerExpansion } -// _timeTriggerNamespaceLister implements the TimeTriggerNamespaceLister +// timeTriggerNamespaceLister implements the TimeTriggerNamespaceLister // interface. -type _timeTriggerNamespaceLister struct { +type timeTriggerNamespaceLister struct { indexer cache.Indexer namespace string } // List lists all TimeTriggers in the indexer for a given namespace. -func (s _timeTriggerNamespaceLister) List(selector labels.Selector) (ret []*v1.TimeTrigger, err error) { +func (s timeTriggerNamespaceLister) List(selector labels.Selector) (ret []*v1.TimeTrigger, err error) { err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) { ret = append(ret, m.(*v1.TimeTrigger)) }) @@ -87,7 +87,7 @@ func (s _timeTriggerNamespaceLister) List(selector labels.Selector) (ret []*v1.T } // Get retrieves the TimeTrigger from the indexer for a given namespace and name. -func (s _timeTriggerNamespaceLister) Get(name string) (*v1.TimeTrigger, error) { +func (s timeTriggerNamespaceLister) Get(name string) (*v1.TimeTrigger, error) { obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name) if err != nil { return nil, err