From 4200ae87c441d38f62daf78e69973888404e29f7 Mon Sep 17 00:00:00 2001 From: Dmitry Kartsev Date: Mon, 5 Feb 2024 15:33:49 +0200 Subject: [PATCH 01/10] wip on aicloud si metadata --- charts/cnvrg-all-in-one/values.yaml | 4 +- .../crds/mlops.cnvrg.io_cnvrgapps.yaml | 8 +- cmd/copctl/cmd/create/status.go | 34 +- .../crd/bases/mlops.cnvrg.io_cnvrgapps.yaml | 8 +- go.mod | 239 +++- go.sum | 1050 +++++++++-------- pkg/admission/domain.go | 77 +- .../tmpl/crds/mlops.cnvrg.io_cnvrgapps.yaml | 8 +- .../mlops.cnvrg.io_cnvrgthirdparties.yaml | 3 + 9 files changed, 802 insertions(+), 629 deletions(-) diff --git a/charts/cnvrg-all-in-one/values.yaml b/charts/cnvrg-all-in-one/values.yaml index 7fce3d18..51b54543 100644 --- a/charts/cnvrg-all-in-one/values.yaml +++ b/charts/cnvrg-all-in-one/values.yaml @@ -318,8 +318,8 @@ networking: perTryTimeout: 3600s istioGwEnabled: true istioGwName: '' - istioIngressSelectorKey: 'istio' - istioIngressSelectorValue: 'ingressgateway' + istioIngressSelectorKey: '' + istioIngressSelectorValue: '' ocpSecureRoutes: false https: enabled: false diff --git a/charts/cnvrg-operator/crds/mlops.cnvrg.io_cnvrgapps.yaml b/charts/cnvrg-operator/crds/mlops.cnvrg.io_cnvrgapps.yaml index d6c2ea95..fd142fd7 100644 --- a/charts/cnvrg-operator/crds/mlops.cnvrg.io_cnvrgapps.yaml +++ b/charts/cnvrg-operator/crds/mlops.cnvrg.io_cnvrgapps.yaml @@ -746,12 +746,12 @@ spec: properties: https: properties: + cert: + type: string certSecret: type: string enabled: type: boolean - cert: - type: string key: type: string type: object @@ -765,6 +765,8 @@ spec: type: string istioIngressSelectorValue: type: string + ocpSecureRoutes: + type: boolean perTryTimeout: type: string retriesAttempts: @@ -773,8 +775,6 @@ spec: type: string type: type: string - ocpSecureRoutes: - type: boolean type: object proxy: properties: diff --git a/cmd/copctl/cmd/create/status.go b/cmd/copctl/cmd/create/status.go index c36e0355..651c291d 100644 --- a/cmd/copctl/cmd/create/status.go +++ b/cmd/copctl/cmd/create/status.go @@ -3,14 +3,12 @@ package create import ( "context" "encoding/json" - "fmt" mlopsv1 "github.com/AccessibleAI/cnvrg-operator/api/v1" "github.com/AccessibleAI/cnvrg-operator/cmd/copctl/utils" "github.com/AccessibleAI/cnvrg-shim/apis/metacloud/v1alpha1" "github.com/spf13/cobra" "github.com/spf13/viper" "go.uber.org/zap" - "istio.io/istio/pkg/config/protocol" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -162,13 +160,13 @@ func (s *Status) writeStatus(payload []byte) error { func (s *Status) generateStatus(cnvrgApp *mlopsv1.CnvrgApp) *v1alpha1.ServiceInstanceStatus { - port := 80 - proto := protocol.HTTP + //port := 80 + //proto := protocol.HTTP status := v1alpha1.StatusHealthy if cnvrgApp.Spec.Networking.HTTPS.Enabled { - proto = protocol.HTTPS - port = 443 + //proto = protocol.HTTPS + //port = 443 } if cnvrgApp.Status.Status != "READY" { @@ -177,18 +175,18 @@ func (s *Status) generateStatus(cnvrgApp *mlopsv1.CnvrgApp) *v1alpha1.ServiceIns return &v1alpha1.ServiceInstanceStatus{ Status: status, - Sins: []v1alpha1.Sins{ - { - Name: cnvrgApp.Name, - IngressEndpoints: []v1alpha1.IngressEndpoint{ - { - Protocol: proto, - Address: []string{fmt.Sprintf("app.%s", cnvrgApp.Spec.ClusterDomain)}, - Port: uint32(port), - }, - }, - }, - }, + //Sins: []v1alpha1.Sins{ + // { + // Name: cnvrgApp.Name, + // IngressEndpoints: []v1alpha1.IngressEndpoint{ + // { + // Protocol: proto, + // Address: []string{fmt.Sprintf("app.%s", cnvrgApp.Spec.ClusterDomain)}, + // Port: uint32(port), + // }, + // }, + // }, + //}, } } diff --git a/config/crd/bases/mlops.cnvrg.io_cnvrgapps.yaml b/config/crd/bases/mlops.cnvrg.io_cnvrgapps.yaml index d6c2ea95..fd142fd7 100644 --- a/config/crd/bases/mlops.cnvrg.io_cnvrgapps.yaml +++ b/config/crd/bases/mlops.cnvrg.io_cnvrgapps.yaml @@ -746,12 +746,12 @@ spec: properties: https: properties: + cert: + type: string certSecret: type: string enabled: type: boolean - cert: - type: string key: type: string type: object @@ -765,6 +765,8 @@ spec: type: string istioIngressSelectorValue: type: string + ocpSecureRoutes: + type: boolean perTryTimeout: type: string retriesAttempts: @@ -773,8 +775,6 @@ spec: type: string type: type: string - ocpSecureRoutes: - type: boolean type: object proxy: properties: diff --git a/go.mod b/go.mod index 433c26ac..8cb7eaf0 100644 --- a/go.mod +++ b/go.mod @@ -1,96 +1,231 @@ module github.com/AccessibleAI/cnvrg-operator -go 1.18 +go 1.21 + +toolchain go1.21.3 require ( dario.cat/mergo v1.0.0 - github.com/AccessibleAI/cnvrg-shim v0.0.29 + github.com/AccessibleAI/cnvrg-shim v0.0.31-CLD-1385-remove-as-much-crds-as-possible-21 github.com/Dimss/crypt v0.0.0-20200316065508-bb7000b8a962 github.com/Masterminds/sprig v2.22.0+incompatible - github.com/go-logr/logr v1.2.4 - github.com/go-logr/zapr v1.2.4 - github.com/spf13/cobra v1.7.0 - github.com/spf13/viper v1.16.0 - go.uber.org/zap v1.25.0 - golang.org/x/crypto v0.12.0 + github.com/go-logr/logr v1.4.1 + github.com/go-logr/zapr v1.3.0 + github.com/spf13/cobra v1.8.0 + github.com/spf13/viper v1.18.2 + go.uber.org/zap v1.26.0 + golang.org/x/crypto v0.18.0 gopkg.in/d4l3k/messagediff.v1 v1.2.1 - k8s.io/api v0.27.4 - k8s.io/apimachinery v0.27.4 - k8s.io/client-go v0.27.4 - k8s.io/klog/v2 v2.90.1 - sigs.k8s.io/controller-runtime v0.15.1 + istio.io/istio v0.0.0-20230115095728-c2e069cb6e07 + k8s.io/api v0.29.0 + k8s.io/apimachinery v0.29.0 + k8s.io/client-go v0.29.0 + sigs.k8s.io/controller-runtime v0.16.3 ) require ( + cloud.google.com/go v0.111.0 // indirect + cloud.google.com/go/compute v1.23.3 // indirect + cloud.google.com/go/compute/metadata v0.2.3 // indirect + cloud.google.com/go/logging v1.9.0 // indirect + cloud.google.com/go/longrunning v0.5.4 // indirect + github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect + github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect + github.com/BurntSushi/toml v1.3.2 // indirect github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5 // indirect + github.com/MakeNowJust/heredoc v1.0.0 // indirect github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/semver v1.5.0 // indirect + github.com/Masterminds/semver/v3 v3.2.1 // indirect + github.com/Masterminds/sprig/v3 v3.2.3 // indirect + github.com/Masterminds/squirrel v1.5.4 // indirect + github.com/Microsoft/go-winio v0.6.1 // indirect + github.com/Microsoft/hcsshim v0.11.4 // indirect + github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect + github.com/aws/aws-sdk-go-v2 v1.24.1 // indirect + github.com/aws/aws-sdk-go-v2/config v1.26.3 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.16.14 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2 // indirect + github.com/aws/aws-sdk-go-v2/service/ecr v1.24.7 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10 // indirect + github.com/aws/aws-sdk-go-v2/service/route53 v1.36.1 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.18.6 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.6 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.26.7 // indirect + github.com/aws/smithy-go v1.19.0 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/blang/semver/v4 v4.0.0 // indirect + github.com/cenkalti/backoff/v3 v3.2.2 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/chai2010/gettext-go v1.0.2 // indirect + github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa // indirect + github.com/containerd/containerd v1.7.11 // indirect + github.com/containerd/log v0.1.0 // indirect + github.com/cyphar/filepath-securejoin v0.2.4 // indirect github.com/d4l3k/messagediff v1.2.1 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/emicklei/go-restful/v3 v3.10.1 // indirect - github.com/evanphx/json-patch/v5 v5.6.0 // indirect - github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/go-openapi/jsonpointer v0.19.6 // indirect - github.com/go-openapi/jsonreference v0.20.1 // indirect - github.com/go-openapi/swag v0.22.3 // indirect + github.com/distribution/reference v0.5.0 // indirect + github.com/docker/cli v24.0.7+incompatible // indirect + github.com/docker/distribution v2.8.3+incompatible // indirect + github.com/docker/docker v24.0.7+incompatible // indirect + github.com/docker/docker-credential-helpers v0.8.0 // indirect + github.com/docker/go-connections v0.5.0 // indirect + github.com/docker/go-metrics v0.0.1 // indirect + github.com/docker/go-units v0.5.0 // indirect + github.com/emicklei/go-restful/v3 v3.11.1 // indirect + github.com/evanphx/json-patch v5.7.0+incompatible // indirect + github.com/evanphx/json-patch/v5 v5.7.0 // indirect + github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect + github.com/fatih/color v1.16.0 // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/go-errors/errors v1.5.1 // indirect + github.com/go-gorp/gorp/v3 v3.1.0 // indirect + github.com/go-jose/go-jose/v3 v3.0.1 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/go-openapi/jsonpointer v0.20.2 // indirect + github.com/go-openapi/jsonreference v0.20.4 // indirect + github.com/go-openapi/swag v0.22.7 // indirect + github.com/gobwas/glob v0.2.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/google/gnostic v0.6.9 // indirect - github.com/google/go-cmp v0.5.9 // indirect + github.com/google/btree v1.1.2 // indirect + github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect + github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/s2a-go v0.1.7 // indirect + github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect + github.com/google/uuid v1.5.0 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect + github.com/googleapis/gax-go/v2 v2.12.0 // indirect + github.com/gorilla/mux v1.8.1 // indirect + github.com/gorilla/websocket v1.5.1 // indirect + github.com/gosuri/uitable v0.0.4 // indirect + github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect + github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-cleanhttp v0.5.2 // indirect + github.com/hashicorp/go-multierror v1.1.1 // indirect + github.com/hashicorp/go-retryablehttp v0.7.5 // indirect + github.com/hashicorp/go-rootcerts v1.0.2 // indirect + github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 // indirect + github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect + github.com/hashicorp/go-sockaddr v1.0.6 // indirect github.com/hashicorp/hcl v1.0.1-vault-5 // indirect + github.com/hashicorp/vault/api v1.10.0 // indirect github.com/huandu/xstrings v1.4.0 // indirect - github.com/imdario/mergo v0.3.13 // indirect + github.com/imdario/mergo v0.3.16 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/jmoiron/sqlx v1.3.5 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/compress v1.17.4 // indirect + github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect + github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect + github.com/lib/pq v1.10.9 // indirect + github.com/libdns/libdns v0.2.1 // indirect + github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect + github.com/lithammer/shortuuid v3.0.0+incompatible // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mailru/easyjson v0.7.7 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mattn/go-runewidth v0.0.15 // indirect + github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/go-wordwrap v1.0.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/moby/locker v1.0.1 // indirect + github.com/moby/spdystream v0.2.0 // indirect + github.com/moby/term v0.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect + github.com/morikuni/aec v1.0.0 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/pelletier/go-toml/v2 v2.0.8 // indirect + github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/opencontainers/image-spec v1.1.0-rc5 // indirect + github.com/pelletier/go-toml/v2 v2.1.1 // indirect + github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/prometheus/client_golang v1.15.1 // indirect - github.com/prometheus/client_model v0.4.0 // indirect - github.com/prometheus/common v0.42.0 // indirect - github.com/prometheus/procfs v0.9.0 // indirect - github.com/spf13/afero v1.9.5 // indirect - github.com/spf13/cast v1.5.1 // indirect - github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/prometheus/client_golang v1.18.0 // indirect + github.com/prometheus/client_model v0.5.0 // indirect + github.com/prometheus/common v0.45.0 // indirect + github.com/prometheus/procfs v0.12.0 // indirect + github.com/rivo/uniseg v0.4.4 // indirect + github.com/rubenv/sql-migrate v1.6.0 // indirect + github.com/russross/blackfriday/v2 v2.1.0 // indirect + github.com/ryanuber/go-glob v1.0.0 // indirect + github.com/sagikazarmark/locafero v0.4.0 // indirect + github.com/sagikazarmark/slog-shim v0.1.0 // indirect + github.com/shopspring/decimal v1.3.1 // indirect + github.com/sirupsen/logrus v1.9.3 // indirect + github.com/sourcegraph/conc v0.3.0 // indirect + github.com/spf13/afero v1.11.0 // indirect + github.com/spf13/cast v1.6.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/subosito/gotenv v1.4.2 // indirect + github.com/spiffe/go-spiffe/v2 v2.1.6 // indirect + github.com/subosito/gotenv v1.6.0 // indirect + github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect + github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect + github.com/xeipuuv/gojsonschema v1.2.0 // indirect + github.com/xlab/treeprint v1.2.0 // indirect + github.com/zeebo/errs v1.3.0 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect + go.opentelemetry.io/otel v1.21.0 // indirect + go.opentelemetry.io/otel/metric v1.21.0 // indirect + go.opentelemetry.io/otel/trace v1.21.0 // indirect + go.starlark.net v0.0.0-20231121155337-90ade8b19d09 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.10.0 // indirect - golang.org/x/oauth2 v0.7.0 // indirect - golang.org/x/sys v0.11.0 // indirect - golang.org/x/term v0.11.0 // indirect - golang.org/x/text v0.12.0 // indirect - golang.org/x/time v0.3.0 // indirect - gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect - google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.30.0 // indirect + golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect + golang.org/x/mod v0.14.0 // indirect + golang.org/x/net v0.20.0 // indirect + golang.org/x/oauth2 v0.16.0 // indirect + golang.org/x/sync v0.6.0 // indirect + golang.org/x/sys v0.16.0 // indirect + golang.org/x/term v0.16.0 // indirect + golang.org/x/text v0.14.0 // indirect + golang.org/x/time v0.5.0 // indirect + golang.org/x/tools v0.16.1 // indirect + gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect + google.golang.org/api v0.155.0 // indirect + google.golang.org/appengine v1.6.8 // indirect + google.golang.org/genproto v0.0.0-20240108191215-35c7eff3a6b1 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240108191215-35c7eff3a6b1 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect + google.golang.org/grpc v1.60.1 // indirect + google.golang.org/protobuf v1.32.0 // indirect + gopkg.in/evanphx/json-patch.v5 v5.7.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect + gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - istio.io/istio v0.0.0-20230115095728-c2e069cb6e07 // indirect - k8s.io/apiextensions-apiserver v0.27.2 // indirect - k8s.io/apiserver v0.27.2 // indirect - k8s.io/component-base v0.27.2 // indirect - k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect - k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect - sigs.k8s.io/apiserver-runtime v1.1.1 // indirect + helm.sh/helm/v3 v3.13.3 // indirect + istio.io/api v1.20.1 // indirect + istio.io/client-go v1.20.1 // indirect + istio.io/pkg v0.0.0-20231221211216-7635388a563e // indirect + k8s.io/apiextensions-apiserver v0.29.0 // indirect + k8s.io/apiserver v0.29.0 // indirect + k8s.io/cli-runtime v0.29.0 // indirect + k8s.io/component-base v0.29.0 // indirect + k8s.io/klog/v2 v2.110.1 // indirect + k8s.io/kube-openapi v0.0.0-20240105020646-a37d4de58910 // indirect + k8s.io/kubectl v0.29.0 // indirect + k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect + oras.land/oras-go v1.2.4 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect - sigs.k8s.io/yaml v1.3.0 // indirect + sigs.k8s.io/kustomize/api v0.16.0 // indirect + sigs.k8s.io/kustomize/kyaml v0.16.0 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect + sigs.k8s.io/yaml v1.4.0 // indirect ) diff --git a/go.sum b/go.sum index acf43244..632c1889 100644 --- a/go.sum +++ b/go.sum @@ -1,651 +1,664 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= -cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= -cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= -cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= -cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= -cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= +cloud.google.com/go v0.111.0 h1:YHLKNupSD1KqjDbQ3+LVdQ81h/UJbJyZG203cEfnQgM= +cloud.google.com/go v0.111.0/go.mod h1:0mibmpKP1TyOOFYQY5izo0LnT+ecvOQ0Sg3OdmMiNRU= +cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= +cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= +cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= +cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= +cloud.google.com/go/iam v1.1.5 h1:1jTsCu4bcsNsE4iiqNT5SHwrDRCfRmIaaaVFhRveTJI= +cloud.google.com/go/iam v1.1.5/go.mod h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXEbzv8= +cloud.google.com/go/logging v1.9.0 h1:iEIOXFO9EmSiTjDmfpbRjOxECO7R8C7b8IXUGOj7xZw= +cloud.google.com/go/logging v1.9.0/go.mod h1:1Io0vnZv4onoUnsVUQY3HZ3Igb1nBchky0A0y7BBBhE= +cloud.google.com/go/longrunning v0.5.4 h1:w8xEcbZodnA2BbW6sVirkkoC+1gP8wS57EUUgGS0GVg= +cloud.google.com/go/longrunning v0.5.4/go.mod h1:zqNVncI0BOP8ST6XQD1+VcvuShMmq7+xFSzOL++V0dI= dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/AccessibleAI/cnvrg-shim v0.0.29 h1:yF8OzXi1ieEYO0ZM1imJ2+jFTokl0RpKnbVu9FJsMdU= -github.com/AccessibleAI/cnvrg-shim v0.0.29/go.mod h1:PNjF5Vv+S0OdIXe9HMrA6/hrP+1PE7xmphB1Szd1bj8= +github.com/AccessibleAI/cnvrg-shim v0.0.31-CLD-1385-remove-as-much-crds-as-possible-16 h1:L/zbcjfp0kU6ZjHmbNRw/RKhFtKFqadaSmFF1QViUpw= +github.com/AccessibleAI/cnvrg-shim v0.0.31-CLD-1385-remove-as-much-crds-as-possible-16/go.mod h1:L+BMB1q2K7Dt2vNPUXRZMkSHeQ8yvxHZMJYOGm1zHqw= +github.com/AccessibleAI/cnvrg-shim v0.0.31-CLD-1385-remove-as-much-crds-as-possible-21 h1:JOF/o+XReOPncXtAEapLPJziUrdUpbIZBSgA/+zwDig= +github.com/AccessibleAI/cnvrg-shim v0.0.31-CLD-1385-remove-as-much-crds-as-possible-21/go.mod h1:L+BMB1q2K7Dt2vNPUXRZMkSHeQ8yvxHZMJYOGm1zHqw= +github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU= +github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8= +github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= +github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= +github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= +github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/Dimss/crypt v0.0.0-20200316065508-bb7000b8a962 h1:wHHpcKhpmxMizXUsDlSoq6OcCiJYL8xmypdYiQyhq40= github.com/Dimss/crypt v0.0.0-20200316065508-bb7000b8a962/go.mod h1:DffeQoa6PAsP5eZY1tCBvPP+4pnt4uEPsG1qpAhg0S8= github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5 h1:IEjq88XO4PuBDcvmjQJcQGg+w+UaafSy8G5Kcb5tBhI= github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5/go.mod h1:exZ0C/1emQJAw5tHOaUDyY1ycttqBAPcxuzf7QbY6ec= +github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= +github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= +github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= +github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0= +github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= github.com/Masterminds/sprig v2.22.0+incompatible h1:z4yfnGrZ7netVz+0EDJ0Wi+5VZCSYp4Z0m2dk6cEM60= github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= -github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I= -github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 h1:yL7+Jz0jTC6yykIK/Wh74gnTJnrGr5AyrNMXuA0gves= -github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ= -github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= +github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA= +github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM= +github.com/Masterminds/squirrel v1.5.4 h1:uUcX/aBc8O7Fg9kaISIUsHXdKuqehiXAMQTYX8afzqM= +github.com/Masterminds/squirrel v1.5.4/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10= +github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= +github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= +github.com/Microsoft/hcsshim v0.11.4 h1:68vKo2VN8DE9AdN4tnkWnmdhqdbpUFM8OF3Airm7fz8= +github.com/Microsoft/hcsshim v0.11.4/go.mod h1:smjE4dvqPX9Zldna+t5FG3rnoHhaB7QYxPRqGcpAD9w= +github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs= +github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= +github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= +github.com/aws/aws-sdk-go-v2 v1.24.1 h1:xAojnj+ktS95YZlDf0zxWBkbFtymPeDP+rvUQIH3uAU= +github.com/aws/aws-sdk-go-v2 v1.24.1/go.mod h1:LNh45Br1YAkEKaAqvmE1m8FUx6a5b/V0oAKV7of29b4= +github.com/aws/aws-sdk-go-v2/config v1.26.3 h1:dKuc2jdp10y13dEEvPqWxqLoc0vF3Z9FC45MvuQSxOA= +github.com/aws/aws-sdk-go-v2/config v1.26.3/go.mod h1:Bxgi+DeeswYofcYO0XyGClwlrq3DZEXli0kLf4hkGA0= +github.com/aws/aws-sdk-go-v2/credentials v1.16.14 h1:mMDTwwYO9A0/JbOCOG7EOZHtYM+o7OfGWfu0toa23VE= +github.com/aws/aws-sdk-go-v2/credentials v1.16.14/go.mod h1:cniAUh3ErQPHtCQGPT5ouvSAQ0od8caTO9OOuufZOAE= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11 h1:c5I5iH+DZcH3xOIMlz3/tCKJDaHFwYEmxvlh2fAcFo8= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11/go.mod h1:cRrYDYAMUohBJUtUnOhydaMHtiK/1NZ0Otc9lIb6O0Y= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 h1:vF+Zgd9s+H4vOXd5BMaPWykta2a6Ih0AKLq/X6NYKn4= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10/go.mod h1:6BkRjejp/GR4411UGqkX8+wFMbFbqsUIimfK4XjOKR4= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 h1:nYPe006ktcqUji8S2mqXf9c/7NdiKriOwMvWQHgYztw= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10/go.mod h1:6UV4SZkVvmODfXKql4LCbaZUpF7HO2BX38FgBf9ZOLw= +github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2 h1:GrSw8s0Gs/5zZ0SX+gX4zQjRnRsMJDJ2sLur1gRBhEM= +github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2/go.mod h1:6fQQgfuGmw8Al/3M2IgIllycxV7ZW7WCdVSqfBeUiCY= +github.com/aws/aws-sdk-go-v2/service/ecr v1.24.7 h1:3iaT/LnGV6jNtbBkvHZDlzz7Ky3wMHDJAyFtGd5GUJI= +github.com/aws/aws-sdk-go-v2/service/ecr v1.24.7/go.mod h1:mtzCLxk6M+KZbkJdq3cUH9GCrudw8qCy5C3EHO+5vLc= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 h1:/b31bi3YVNlkzkBrm9LfpaKoaYZUxIAj4sHfOTmLfqw= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4/go.mod h1:2aGXHFmbInwgP9ZfpmdIfOELL79zhdNYNmReK8qDfdQ= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10 h1:DBYTXwIGQSGs9w4jKm60F5dmCQ3EEruxdc0MFh+3EY4= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10/go.mod h1:wohMUQiFdzo0NtxbBg0mSRGZ4vL3n0dKjLTINdcIino= +github.com/aws/aws-sdk-go-v2/service/route53 v1.36.1 h1:dc3cH08KcmVkeh762FrB7/10UJydwpGKJU/6lLJ/KxM= +github.com/aws/aws-sdk-go-v2/service/route53 v1.36.1/go.mod h1:8qqfpG4mug2JLlEyWPSFhEGvJiaZ9iPmMDDMYc5Xtas= +github.com/aws/aws-sdk-go-v2/service/sso v1.18.6 h1:dGrs+Q/WzhsiUKh82SfTVN66QzyulXuMDTV/G8ZxOac= +github.com/aws/aws-sdk-go-v2/service/sso v1.18.6/go.mod h1:+mJNDdF+qiUlNKNC3fxn74WWNN+sOiGOEImje+3ScPM= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.6 h1:Yf2MIo9x+0tyv76GljxzqA3WtC5mw7NmazD2chwjxE4= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.6/go.mod h1:ykf3COxYI0UJmxcfcxcVuz7b6uADi1FkiUz6Eb7AgM8= +github.com/aws/aws-sdk-go-v2/service/sts v1.26.7 h1:NzO4Vrau795RkUdSHKEwiR01FaGzGOH1EETJ+5QHnm0= +github.com/aws/aws-sdk-go-v2/service/sts v1.26.7/go.mod h1:6h2YuIoxaMSCFf5fi1EgZAwdfkGMgDY+DVfa61uLe4U= +github.com/aws/smithy-go v1.19.0 h1:KWFKQV80DpP3vJrrA9sVAHQ5gc2z8i4EzrLhLlWXcBM= +github.com/aws/smithy-go v1.19.0/go.mod h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= -github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= -github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= -github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+MN3u4= +github.com/bshuster-repo/logrus-logstash-hook v1.0.0 h1:e+C0SB5R1pu//O4MQ3f9cFuPGoOVeF2fE4Og9otCc70= +github.com/bshuster-repo/logrus-logstash-hook v1.0.0/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= +github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd h1:rFt+Y/IK1aEZkEHchZRSq9OQbsSzIT/OrI8YFFmRIng= +github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= +github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b h1:otBG+dV+YK+Soembjv71DPz3uX/V/6MMlSyD9JBQ6kQ= +github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50= +github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0 h1:nvj0OLI3YqYXer/kZD8Ri1aaunCxIEsOst1BVJswV0o= +github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= +github.com/cenkalti/backoff/v3 v3.2.2 h1:cfUAAO3yvKMYKPrvhDuHSwQnhZNk/RMHKdZqKTxfm6M= +github.com/cenkalti/backoff/v3 v3.2.2/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/chai2010/gettext-go v1.0.2 h1:1Lwwip6Q2QGsAdl/ZKPCwTe9fe0CjlUbqj5bFNSjIRk= +github.com/chai2010/gettext-go v1.0.2/go.mod h1:y+wnP2cHYaVj19NZhYKAwEMH2CI1gNHeQQ+5AjwawxA= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= -github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= +github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= +github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM= +github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw= +github.com/containerd/containerd v1.7.11 h1:lfGKw3eU35sjV0aG2eYZTiwFEY1pCzxdzicHP3SZILw= +github.com/containerd/containerd v1.7.11/go.mod h1:5UluHxHTX2rdvYuZ5OJTC5m/KJNs0Zs9wVoJm9zf5ZE= +github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM= +github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ= +github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= +github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= +github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= +github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= +github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= +github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/d4l3k/messagediff v1.2.1 h1:ZcAIMYsUg0EAp9X+tt8/enBE/Q8Yd5kzPynLyKptt9U= github.com/d4l3k/messagediff v1.2.1/go.mod h1:Oozbb1TVXFac9FtSIxHBMnBCq2qeH/2KkEQxENCrlLo= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= -github.com/emicklei/go-restful/v3 v3.10.1 h1:rc42Y5YTp7Am7CS630D7JmhRjq4UlEUuEKfrDac4bSQ= -github.com/emicklei/go-restful/v3 v3.10.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2 h1:aBfCb7iqHmDEIp6fBvC/hQUddQfg+3qdYjwzaiP9Hnc= +github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2/go.mod h1:WHNsWjnIn2V1LYOrME7e8KxSeKunYHsxEm4am0BUtcI= +github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= +github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= +github.com/docker/cli v24.0.7+incompatible h1:wa/nIwYFW7BVTGa7SWPVyyXU9lgORqUb1xfI36MSkFg= +github.com/docker/cli v24.0.7+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= +github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM= +github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker-credential-helpers v0.8.0 h1:YQFtbBQb4VrpoPxhFuzEBPQ9E16qz5SpHLS+uswaCp8= +github.com/docker/docker-credential-helpers v0.8.0/go.mod h1:UGFXcuoQ5TxPiB54nHOZ32AWRqQdECoh/Mg0AlEYb40= +github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= +github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= +github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8= +github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= +github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8= +github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= +github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1 h1:ZClxb8laGDf5arXfYcAtECDFgAgHklGI8CxgjHnXKJ4= +github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= +github.com/emicklei/go-restful/v3 v3.11.1 h1:S+9bSbua1z3FgCnV0KKOSSZ3mDthb5NyEPL5gEpCvyk= +github.com/emicklei/go-restful/v3 v3.11.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= +github.com/envoyproxy/go-control-plane v0.11.1 h1:wSUXTlLfiAQRWs2F+p+EKOY9rUyis1MyGqJ2DIk5HpM= +github.com/envoyproxy/go-control-plane v0.11.1/go.mod h1:uhMcXKCQMEJHiAb0w+YGefQLaTEw+YhGluxZkrTmD0g= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= -github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww= -github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= -github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= -github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0= -github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= -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/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= -github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA= +github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE= +github.com/evanphx/json-patch v5.7.0+incompatible h1:vgGkfT/9f8zE6tvSCe74nfpAVDQ2tG6yudJd8LBksgI= +github.com/evanphx/json-patch v5.7.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch/v5 v5.7.0 h1:nJqP7uwL84RJInrohHfW0Fx3awjbm8qZeFv0nW9SYGc= +github.com/evanphx/json-patch/v5 v5.7.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= +github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f h1:Wl78ApPPB2Wvf/TIe2xdyJxTlb6obmF18d8QdkxNDu4= +github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f/go.mod h1:OSYXu++VVOHnXeitef/D8n/6y4QV8uLHSFXX4NeXMGc= +github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= +github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/foxcpp/go-mockdns v1.0.0 h1:7jBqxd3WDWwi/6WhDvacvH1XsN3rOLXyHM1uhvIx6FI= +github.com/foxcpp/go-mockdns v1.0.0/go.mod h1:lgRN6+KxQBawyIghpnl5CezHFGS9VLzvtVlwxvzXTQ4= +github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= +github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk= +github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= +github.com/go-gorp/gorp/v3 v3.1.0 h1:ItKF/Vbuj31dmV4jxA1qblpSwkl9g1typ24xoe70IGs= +github.com/go-gorp/gorp/v3 v3.1.0/go.mod h1:dLEjIyyRNiXvNZ8PSmzpt1GsWAUK8kjVhEpjH8TixEw= +github.com/go-jose/go-jose/v3 v3.0.1 h1:pWmKFVtt+Jl0vBZTIpz/eAKwsm6LkIxDVVbFHKkchhA= +github.com/go-jose/go-jose/v3 v3.0.1/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= -github.com/go-logr/zapr v1.2.4 h1:QHVo+6stLbfJmYGkQ7uGHUCu5hnAFAj6mDe6Ea0SeOo= -github.com/go-logr/zapr v1.2.4/go.mod h1:FyHWQIzQORZ0QVE1BtVHv3cKtNLuXsbNLtpuhNapBOA= -github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= -github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= -github.com/go-openapi/jsonreference v0.20.1 h1:FBLnyygC4/IZZr893oiomc9XaghoveYTrLC1F86HID8= -github.com/go-openapi/jsonreference v0.20.1/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= -github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= -github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= +github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg= +github.com/go-openapi/jsonpointer v0.20.2 h1:mQc3nmndL8ZBzStEo3JYF8wzmeWffDH4VbXz58sAx6Q= +github.com/go-openapi/jsonpointer v0.20.2/go.mod h1:bHen+N0u1KEO3YlmqOjTT9Adn1RfD91Ar825/PuiRVs= +github.com/go-openapi/jsonreference v0.20.4 h1:bKlDxQxQJgwpUSgOENiMPzCTBVuc7vTdXSSgNeAhojU= +github.com/go-openapi/jsonreference v0.20.4/go.mod h1:5pZJyJP2MnYCpoeoMAql78cCHauHj0V9Lhc506VOpw4= +github.com/go-openapi/swag v0.22.7 h1:JWrc1uc/P9cSomxfnsFSVWoE1FW6bNbrVPmpQYpCcR8= +github.com/go-openapi/swag v0.22.7/go.mod h1:Gl91UqO+btAM0plGGxHqJcQZ1ZTy6jbmridBTsDy8A0= +github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= +github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg= +github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= +github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= +github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/cel-go v0.13.0 h1:z+8OBOcmh7IeKyqwT/6IlnMvy621fYUqnTVPEdegGlU= -github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0= -github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E= +github.com/gomodule/redigo v1.8.2 h1:H5XSIre1MB5NbPYFp+i1NBbb5qN1W8Y8YAQoAYbkm8k= +github.com/gomodule/redigo v1.8.2/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= +github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= +github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= +github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 h1:0VpGH+cDhbDtdcweoyCVsF3fhN8kejK6rFe/2FFX2nU= +github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49/go.mod h1:BkkQ4L1KS1xMt2aWSPStnn55ChGC0DPOn2FQYj+f25M= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20221212185716-aee1124e3a93 h1:D5iJJZKAi0rU4e/5E58BkrnN+xeCDjAIqcm1GGxAGSI= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/pprof v0.0.0-20221212185716-aee1124e3a93/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= +github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= +github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= -github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= -github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 h1:lLT7ZLSzGLI08vc9cpd+tYmNWjdKDqyr/2L+f6U12Fk= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= +github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= +github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= +github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas= +github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= +github.com/gorilla/handlers v1.5.2 h1:cLTUSsNkgcwhgRqvCNmdbRWG0A3N4F+M2nWKdScwyEE= +github.com/gorilla/handlers v1.5.2/go.mod h1:dX+xVpaxdSw+q0Qek8SSsl3dfMk3jNddUkMzo0GtH0w= +github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= +github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= +github.com/gosuri/uitable v0.0.4 h1:IG2xLKRvErL3uhY6e1BylFzG+aJiwQviDDTfOKeKTpY= +github.com/gosuri/uitable v0.0.4/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo= +github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA= +github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= +github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= +github.com/hashicorp/go-hclog v1.6.2 h1:NOtoftovWkDheyUM/8JW3QMiXyxJK3uHRK7wV04nD2I= +github.com/hashicorp/go-hclog v1.6.2/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= +github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/hashicorp/go-retryablehttp v0.7.5 h1:bJj+Pj19UZMIweq/iie+1u5YCdGrnxCT9yvm0e+Nd5M= +github.com/hashicorp/go-retryablehttp v0.7.5/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8= +github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= +github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= +github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 h1:iBt4Ew4XEGLfh6/bPk4rSYmuZJGizr6/x/AEizP0CQc= +github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8/go.mod h1:aiJI+PIApBRQG7FZTEBx5GiiX+HbOHilUdNxUZi4eV0= +github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9CdjCtrXrXGuOpxEA7Ts= +github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4= +github.com/hashicorp/go-sockaddr v1.0.6 h1:RSG8rKU28VTUTvEKghe5gIhIQpv8evvNpnDEyqO4u9I= +github.com/hashicorp/go-sockaddr v1.0.6/go.mod h1:uoUUmtwU7n9Dv3O4SNLeFvg0SxQ3lyjsj6+CCykpaxI= +github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= +github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.1-vault-5 h1:kI3hhbbyzr4dldA8UdTb7ZlVVlI2DACdCfz31RPDgJM= github.com/hashicorp/hcl v1.0.1-vault-5/go.mod h1:XYhtn6ijBSAj6n4YqAaf7RBPS4I06AItNorpy+MoQNM= +github.com/hashicorp/vault/api v1.10.0 h1:/US7sIjWN6Imp4o/Rj1Ce2Nr5bki/AXi9vAW3p2tOJQ= +github.com/hashicorp/vault/api v1.10.0/go.mod h1:jo5Y/ET+hNyz+JnKDt8XLAdKs+AM0G5W0Vp1IrFI8N8= +github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU= github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= -github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= +github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= +github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= +github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= +github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g= +github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -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/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= +github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -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/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq6+3iTQz8KNCLtVX6idSoTLdUw= +github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o= +github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 h1:P6pPBnrTSX3DEVR4fDembhRWSsG5rVo6hYhAB/ADZrk= +github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6FmdpVm2joNMFikkuWg0EoCKLGUMNw= +github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= +github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/libdns/libdns v0.2.1 h1:Wu59T7wSHRgtA0cfxC+n1c/e+O3upJGWytknkmFEDis= +github.com/libdns/libdns v0.2.1/go.mod h1:yQCXzk1lEZmmCPa857bnk4TsOiqYasqpyOEeSObbb40= +github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= +github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= +github.com/lithammer/shortuuid v3.0.0+incompatible h1:NcD0xWW/MZYXEHa6ITy6kaXN5nwm/V115vj2YXfhS0w= +github.com/lithammer/shortuuid v3.0.0+incompatible/go.mod h1:FR74pbAuElzOUuenUHTK2Tciko1/vKuIKS9dSkDrA4w= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= -github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= +github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= +github.com/mattn/go-sqlite3 v1.14.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI= +github.com/mattn/go-sqlite3 v1.14.19/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg= +github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k= +github.com/miekg/dns v1.1.57 h1:Jzi7ApEIzwEPLHWRcafCN9LZSBbqQpxjt/wpgvg7wcM= +github.com/miekg/dns v1.1.57/go.mod h1:uqRjCRUuEAA6qsOiJvDd+CFo/vW+y5WR6SNmHE55hZk= +github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= +github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= +github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg= +github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= +github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8= +github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= +github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78= +github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI= +github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= +github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0= +github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4= +github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= +github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q= -github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU= -github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= -github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus= +github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= +github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= +github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg= +github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= +github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= +github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= +github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI= +github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8= +github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI= +github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= +github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= +github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= +github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 h1:Ii+DKncOVM8Cu1Hc+ETb5K+23HdAMvESYE3ZJ5b5cMI= +github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= -github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI= -github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY= +github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= +github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= +github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY= -github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= -github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= -github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= -github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= -github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= -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/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= +github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= +github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM= +github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= +github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= +github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= +github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= +github.com/rubenv/sql-migrate v1.6.0 h1:IZpcTlAx/VKXphWEpwWJ7BaMq05tYtE80zYz+8a5Il8= +github.com/rubenv/sql-migrate v1.6.0/go.mod h1:m3ilnKP7sNb4eYkLsp6cGdPOl4OBcXM6rcbzU+Oqc5k= +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= -github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= -github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= -github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= -github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= -github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= -github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= -github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= -github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= +github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk= +github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= +github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= +github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= +github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= +github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= +github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= +github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= +github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= +github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= +github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= +github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= +github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= +github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= +github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= +github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= +github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= -github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= -github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= -github.com/stoewer/go-strcase v1.2.1 h1:/1JWd+AcWPzkcGLEmjUCka99YqGOtTnp1H/wcP+uap4= +github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ= +github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk= +github.com/spiffe/go-spiffe/v2 v2.1.6 h1:4SdizuQieFyL9eNU+SPiCArH4kynzaKOOj0VvM8R7Xo= +github.com/spiffe/go-spiffe/v2 v2.1.6/go.mod h1:eVDqm9xFvyqao6C+eQensb9ZPkyNEeaUbqbBpOhBnNk= 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/objx v0.5.1 h1:4VhoImhV/Bm0ToFkXFi8hXNXwpDRZ/ynw3amt82mzq0= +github.com/stretchr/objx v0.5.1/go.mod h1:/iHQpkQwBD6DLUmQ4pE+s1TXdob1mORJ4/UFdrifcy0= 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= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +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/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= -github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= +github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= +github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= +github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ= +github.com/xlab/treeprint v1.2.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.etcd.io/etcd v0.0.0-20200513171258-e048e166ab9c h1:/RwRVN9EdXAVtdHxP7Ndn/tfmM9/goiwU0QTnLBgS4w= -go.etcd.io/etcd/api/v3 v3.5.9 h1:4wSsluwyTbGGmyjJktOf3wFQoTBIURXHnq9n/G/JQHs= -go.etcd.io/etcd/client/pkg/v3 v3.5.9 h1:oidDC4+YEuSIQbsR94rY9gur91UPL6DnxDCIYd2IGsE= -go.etcd.io/etcd/client/v3 v3.5.9 h1:r5xghnU7CwbUxD/fbUtRyJGaYNfDun8sp/gTr1hew6E= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -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.opentelemetry.io/contrib v0.20.0 h1:ubFQUn0VCZ0gPwIoJfBJVpeBlyRMxu8Mm/huKWYd9p0= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 h1:xFSRQBbXF6VvYRf2lqMJXxoB72XI1K/azav8TekHHSw= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.0 h1:qZ3KzA4qPzLBDtQyPk4ydjlg8zvXbNysnFHaVMKJbVo= -go.opentelemetry.io/otel v1.13.0 h1:1ZAKnNQKwBBxFtww/GwxNUyTf0AxkZzrukO8MeXqe4Y= -go.opentelemetry.io/otel/exporters/otlp v0.20.0 h1:PTNgq9MRmQqqJY0REVbZFvwkYOA85vbdQU/nVfxDyqg= -go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.13.0 h1:pa05sNT/P8OsIQ8mPZKTIyiBuzS/xDGLVx+DCt0y6Vs= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.13.0 h1:Any/nVxaoMq1T2w0W85d6w5COlLuCCgOYKQhJJWEMwQ= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.13.0 h1:Wz7UQn7/eIqZVDJbuNEM6PmqeA71cWXrWcXekP5HZgU= -go.opentelemetry.io/otel/metric v0.32.0 h1:lh5KMDB8xlMM4kwE38vlZJ3rZeiWrjw3As1vclfC01k= -go.opentelemetry.io/otel/sdk v1.13.0 h1:BHib5g8MvdqS65yo2vV1s6Le42Hm6rrw08qU6yz5JaM= -go.opentelemetry.io/otel/trace v1.13.0 h1:CBgRZ6ntv+Amuj1jDsMhZtlAPT6gbyIRdaIzFhfBSdY= -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.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= -go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43 h1:+lm10QQTNSBd8DVTNGHx7o/IKu9HYDvLMffDhbyLccI= +github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= +github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50 h1:hlE8//ciYMztlGpl/VA+Zm1AcTPHYkHJPbHqE6WJUXE= +github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= +github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f h1:ERexzlUfuTvpE74urLSbIQW0Z/6hF9t8U4NsJLaioAY= +github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= +github.com/zeebo/errs v1.3.0 h1:hmiaKqgYZzcVgRL1Vkc1Mn2914BbzB0IBxs+ebeutGs= +github.com/zeebo/errs v1.3.0/go.mod h1:sgbWHsvVuTPHcqJJGQ1WhI5KbWlHYz+2+2C/LSEtCw4= +go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= +go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo= +go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= +go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= +go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= +go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= +go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= +go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E= +go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc= +go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ= +go.starlark.net v0.0.0-20231121155337-90ade8b19d09 h1:hzy3LFnSN8kuQK8h9tHl4ndF6UruMj47OqwqsS+/Ai4= +go.starlark.net v0.0.0-20231121155337-90ade8b19d09/go.mod h1:LcLNIzVOMp4oV+uusnpk+VU+SzXaJakUuBjoCSWH5dM= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= -go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= -go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c= -go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk= +go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= +go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= -golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= +golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= +golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc h1:ao2WRsKSzW6KuUY9IWPwWahcHCgR0s52IfwutMfEbdM= +golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= +golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= +golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= +golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= 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= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g= -golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= +golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= +golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= 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-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/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-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= -golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= +golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= +golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= 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= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= 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/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= -golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -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= -golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= -golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA= +golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gomodules.xyz/jsonpatch/v2 v2.3.0 h1:8NFhfS6gzxNqjLIYnZxg319wZ5Qjnx4m/CcX+Klzazc= -gomodules.xyz/jsonpatch/v2 v2.3.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= -google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= -google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= -google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= +gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= +gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= +google.golang.org/api v0.155.0 h1:vBmGhCYs0djJttDNynWo44zosHlPvHmA0XiN2zP2DtA= +google.golang.org/api v0.155.0/go.mod h1:GI5qK5f40kCpHfPn6+YzGAByIKWv8ujFnmoWm7Igduk= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= +google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= +google.golang.org/genproto v0.0.0-20240108191215-35c7eff3a6b1 h1:/IWabOtPziuXTEtI1KYCpM6Ss7vaAkeMxk+uXV/xvZs= +google.golang.org/genproto v0.0.0-20240108191215-35c7eff3a6b1/go.mod h1:+Rvu7ElI+aLzyDQhpHMFMMltsD6m7nqpuWDd2CwJw3k= +google.golang.org/genproto/googleapis/api v0.0.0-20240108191215-35c7eff3a6b1 h1:OPXtXn7fNMaXwO3JvOmF1QyTc00jsSFFz1vXXBOdCDo= +google.golang.org/genproto/googleapis/api v0.0.0-20240108191215-35c7eff3a6b1/go.mod h1:B5xPO//w8qmBDjGReYLpR6UJPnkldGkCSMoH/2vxJeg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 h1:gphdwh0npgs8elJ4T6J+DQJHPVF7RsuJHCfwztUb4J4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1/go.mod h1:daQN87bsDqDoe316QbbvX60nMoJQa4r6Ds0ZuoAe5yA= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= -google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag= +google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU= +google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= 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= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -654,76 +667,83 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= +google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/d4l3k/messagediff.v1 v1.2.1 h1:70AthpjunwzUiarMHyED52mj9UwtAnE89l1Gmrt3EU0= gopkg.in/d4l3k/messagediff.v1 v1.2.1/go.mod h1:EUzikiKadqXWcD1AzJLagx0j/BeeWGtn++04Xniyg44= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/evanphx/json-patch.v5 v5.7.0 h1:dGKGylPlZ/jus2g1YqhhyzfH0gPy2R8/MYUpW/OslTY= +gopkg.in/evanphx/json-patch.v5 v5.7.0/go.mod h1:/kvTRh1TVm5wuM6OkHxqXtE/1nUZZpihg29RtuIyfvk= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= +gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= +gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY= +gotest.tools/v3 v3.5.0/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= +helm.sh/helm/v3 v3.13.3 h1:0zPEdGqHcubehJHP9emCtzRmu8oYsJFRrlVF3TFj8xY= +helm.sh/helm/v3 v3.13.3/go.mod h1:3OKO33yI3p4YEXtTITN2+4oScsHeQe71KuzhlZ+aPfg= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -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= +istio.io/api v1.20.1 h1:Itku+LK5FwNzkKJY+5BGRCTRimVA5gShwFXdNNXtAHk= +istio.io/api v1.20.1/go.mod h1:hm1PE/mGdIAsjCDkTIAplP53H7TjO5LUQCiVvF26SVg= +istio.io/client-go v1.20.1 h1:0kObqt2b6mJ1lM+PEOWQ9/MQbhJFMBZ2K7krAz/Qrto= +istio.io/client-go v1.20.1/go.mod h1:5Je53KEbCFhBedeu1wIf02ekK2v7bAQEAfR9e0/u1LI= istio.io/istio v0.0.0-20230115095728-c2e069cb6e07 h1:Ylvl/9gJYimUrxSicE00ow+ZL8E9aYTWa7EaBnvc9lA= istio.io/istio v0.0.0-20230115095728-c2e069cb6e07/go.mod h1:uEoaHXCOq8JC144/2u1IJ693UquCL6a9FUljDz/7z3k= -k8s.io/api v0.27.4 h1:0pCo/AN9hONazBKlNUdhQymmnfLRbSZjd5H5H3f0bSs= -k8s.io/api v0.27.4/go.mod h1:O3smaaX15NfxjzILfiln1D8Z3+gEYpjEpiNA/1EVK1Y= -k8s.io/apiextensions-apiserver v0.27.2 h1:iwhyoeS4xj9Y7v8YExhUwbVuBhMr3Q4bd/laClBV6Bo= -k8s.io/apiextensions-apiserver v0.27.2/go.mod h1:Oz9UdvGguL3ULgRdY9QMUzL2RZImotgxvGjdWRq6ZXQ= -k8s.io/apimachinery v0.27.4 h1:CdxflD4AF61yewuid0fLl6bM4a3q04jWel0IlP+aYjs= -k8s.io/apimachinery v0.27.4/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E= -k8s.io/apiserver v0.27.2 h1:p+tjwrcQEZDrEorCZV2/qE8osGTINPuS5ZNqWAvKm5E= -k8s.io/apiserver v0.27.2/go.mod h1:EsOf39d75rMivgvvwjJ3OW/u9n1/BmUMK5otEOJrb1Y= -k8s.io/client-go v0.27.4 h1:vj2YTtSJ6J4KxaC88P4pMPEQECWMY8gqPqsTgUKzvjk= -k8s.io/client-go v0.27.4/go.mod h1:ragcly7lUlN0SRPk5/ZkGnDjPknzb37TICq07WhI6Xc= -k8s.io/component-base v0.27.2 h1:neju+7s/r5O4x4/txeUONNTS9r1HsPbyoPBAtHsDCpo= -k8s.io/component-base v0.27.2/go.mod h1:5UPk7EjfgrfgRIuDBFtsEFAe4DAvP3U+M8RTzoSJkpo= -k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= -k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= -k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kms v0.27.2 h1:wCdmPCa3kubcVd3AssOeaVjLQSu45k5g/vruJ3iqwDU= -k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg= -k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg= -k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY= -k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 h1:trsWhjU5jZrx6UvFu4WzQDrN7Pga4a7Qg+zcfcj64PA= -sigs.k8s.io/apiserver-runtime v1.1.1 h1:cN/+Gq78DKGxQHi7j+bET4/h54vg9VEwg5atJV5YbCI= -sigs.k8s.io/apiserver-runtime v1.1.1/go.mod h1:cmahVEn9R791yUnSiFMFdwTqi2dOe5WQRNwcY6jb7l0= -sigs.k8s.io/controller-runtime v0.15.1 h1:9UvgKD4ZJGcj24vefUFgZFP3xej/3igL9BsOUTb/+4c= -sigs.k8s.io/controller-runtime v0.15.1/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk= +istio.io/pkg v0.0.0-20231221211216-7635388a563e h1:ZlLVbKDlCzfP0MPbWc6VRcY23d9NdjLxwpPQpDrh3Gc= +istio.io/pkg v0.0.0-20231221211216-7635388a563e/go.mod h1:fvmqEdHhZjYYwf6dSiIwvwc7db54kMWVTfsb91KmhzY= +k8s.io/api v0.29.0 h1:NiCdQMY1QOp1H8lfRyeEf8eOwV6+0xA6XEE44ohDX2A= +k8s.io/api v0.29.0/go.mod h1:sdVmXoz2Bo/cb77Pxi71IPTSErEW32xa4aXwKH7gfBA= +k8s.io/apiextensions-apiserver v0.29.0 h1:0VuspFG7Hj+SxyF/Z/2T0uFbI5gb5LRgEyUVE3Q4lV0= +k8s.io/apiextensions-apiserver v0.29.0/go.mod h1:TKmpy3bTS0mr9pylH0nOt/QzQRrW7/h7yLdRForMZwc= +k8s.io/apimachinery v0.29.0 h1:+ACVktwyicPz0oc6MTMLwa2Pw3ouLAfAon1wPLtG48o= +k8s.io/apimachinery v0.29.0/go.mod h1:eVBxQ/cwiJxH58eK/jd/vAk4mrxmVlnpBH5J2GbMeis= +k8s.io/apiserver v0.29.0 h1:Y1xEMjJkP+BIi0GSEv1BBrf1jLU9UPfAnnGGbbDdp7o= +k8s.io/apiserver v0.29.0/go.mod h1:31n78PsRKPmfpee7/l9NYEv67u6hOL6AfcE761HapDM= +k8s.io/cli-runtime v0.29.0 h1:q2kC3cex4rOBLfPOnMSzV2BIrrQlx97gxHJs21KxKS4= +k8s.io/cli-runtime v0.29.0/go.mod h1:VKudXp3X7wR45L+nER85YUzOQIru28HQpXr0mTdeCrk= +k8s.io/client-go v0.29.0 h1:KmlDtFcrdUzOYrBhXHgKw5ycWzc3ryPX5mQe0SkG3y8= +k8s.io/client-go v0.29.0/go.mod h1:yLkXH4HKMAywcrD82KMSmfYg2DlE8mepPR4JGSo5n38= +k8s.io/component-base v0.29.0 h1:T7rjd5wvLnPBV1vC4zWd/iWRbV8Mdxs+nGaoaFzGw3s= +k8s.io/component-base v0.29.0/go.mod h1:sADonFTQ9Zc9yFLghpDpmNXEdHyQmFIGbiuZbqAXQ1M= +k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= +k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= +k8s.io/kube-openapi v0.0.0-20240105020646-a37d4de58910 h1:1Rp/XEKP5uxPs6QrsngEHAxBjaAR78iJRiJq5Fi7LSU= +k8s.io/kube-openapi v0.0.0-20240105020646-a37d4de58910/go.mod h1:Pa1PvrP7ACSkuX6I7KYomY6cmMA0Tx86waBhDUgoKPw= +k8s.io/kubectl v0.29.0 h1:Oqi48gXjikDhrBF67AYuZRTcJV4lg2l42GmvsP7FmYI= +k8s.io/kubectl v0.29.0/go.mod h1:0jMjGWIcMIQzmUaMgAzhSELv5WtHo2a8pq67DtviAJs= +k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ= +k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +oras.land/oras-go v1.2.4 h1:djpBY2/2Cs1PV87GSJlxv4voajVOMZxqqtq9AB8YNvY= +oras.land/oras-go v1.2.4/go.mod h1:DYcGfb3YF1nKjcezfX2SNlDAeQFKSXmf+qrFmrh4324= +sigs.k8s.io/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4= +sigs.k8s.io/controller-runtime v0.16.3/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0= +sigs.k8s.io/gateway-api v0.6.0 h1:v2FqrN2ROWZLrSnI2o91taHR8Sj3s+Eh3QU7gLNWIqA= +sigs.k8s.io/gateway-api v0.6.0/go.mod h1:EYJT+jlPWTeNskjV0JTki/03WX1cyAnBhwBJfYHpV/0= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= -sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= -sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= -sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= +sigs.k8s.io/kustomize/api v0.16.0 h1:/zAR4FOQDCkgSDmVzV2uiFbuy9bhu3jEzthrHCuvm1g= +sigs.k8s.io/kustomize/api v0.16.0/go.mod h1:MnFZ7IP2YqVyVwMWoRxPtgl/5hpA+eCCrQR/866cm5c= +sigs.k8s.io/kustomize/kyaml v0.16.0 h1:6J33uKSoATlKZH16unr2XOhDI+otoe2sR3M8PDzW3K0= +sigs.k8s.io/kustomize/kyaml v0.16.0/go.mod h1:xOK/7i+vmE14N2FdFyugIshB8eF6ALpy7jI87Q2nRh4= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/pkg/admission/domain.go b/pkg/admission/domain.go index 4de3e8ad..38306104 100644 --- a/pkg/admission/domain.go +++ b/pkg/admission/domain.go @@ -5,26 +5,24 @@ import ( "encoding/json" "fmt" mlopsv1 "github.com/AccessibleAI/cnvrg-operator/api/v1" - mcv1alpha1 "github.com/AccessibleAI/cnvrg-shim/apis/metacloud/v1alpha1" + simetadata "github.com/AccessibleAI/cnvrg-shim/pkg/serviceinstaller/metadata" + "go.uber.org/zap" + "gopkg.in/yaml.v3" "io" v1 "k8s.io/api/admission/v1" admissionv1 "k8s.io/api/admissionregistration/v1" + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/types" - "k8s.io/klog/v2" "net/http" "sigs.k8s.io/controller-runtime/pkg/client" "strings" ) -const ( - patchClusterDomainTpl = `[{"op":"replace","path":"/spec/clusterDomain","value":"%s"}]` -) - type AICloudDomainHandler struct { deserializer runtime.Decoder } @@ -51,12 +49,13 @@ func (h *AICloudDomainHandler) Handler(w http.ResponseWriter, r *http.Request) { return } - clusterDomain, err := h.discoverClusterDomain(cnvrgApp) + patchBody, err := h.patchBody(cnvrgApp) if err != nil { endWithError(err, w) return } - resp, err := h.mutationResponse(ar.Request.UID, clusterDomain) + + resp, err := h.mutationResponse(ar.Request.UID, patchBody) if err != nil { endWithError(err, w) return @@ -65,6 +64,30 @@ func (h *AICloudDomainHandler) Handler(w http.ResponseWriter, r *http.Request) { endWithOk(resp, w) } +func (h *AICloudDomainHandler) patchBody(cap *mlopsv1.CnvrgApp) (string, error) { + patchCnvrgAppTpl := `[ + {"op":"replace","path":"/spec/clusterDomain","value":"%s"}, + {"op":"replace","path":"/spec/networking/ingress/istioIngressSelectorKey","value":"%s"}, + {"op":"replace","path":"/spec/networking/ingress/istioIngressSelectorValue","value":"%s"}]` + + serviceInstanceMetadata, err := h.ServiceInstanceMetadata(cap.Namespace) + if err != nil { + return "", err + } + clusterDomain, err := h.ClusterDomain(cap, serviceInstanceMetadata) + if err != nil { + return "", err + } + + patch := fmt.Sprintf(patchCnvrgAppTpl, + clusterDomain, + serviceInstanceMetadata.Ingress.SelectorKey, + serviceInstanceMetadata.Ingress.SelectorValue, + ) + zap.S().Info(patch) + return patch, nil +} + func (h *AICloudDomainHandler) HookCfg(ns, svc string, caBundle []byte) *admissionv1.MutatingWebhookConfiguration { hookName := fmt.Sprintf("%s.%s.svc", svc, ns) @@ -142,36 +165,30 @@ func (h *AICloudDomainHandler) cnvrgAppDecode(b []byte) (*mlopsv1.CnvrgApp, erro return cnvrgApp, nil } -func (h *AICloudDomainHandler) discoverClusterDomain(cap *mlopsv1.CnvrgApp) (clusterDomain string, err error) { +func (h *AICloudDomainHandler) ClusterDomain(cap *mlopsv1.CnvrgApp, siMeta *simetadata.ServiceInstanceMetadata) (clusterDomain string, err error) { // do nothing if cluster domain already set if cap.Spec.ClusterDomain != "" { return cap.Spec.ClusterDomain, nil } - // discover cluster domain based on Domain & DomainPool & Release Name - return h.clusterDomain(cap.Name) + return strings.Replace(siMeta.Domain, "*.", "", 1), nil } -func (h *AICloudDomainHandler) clusterDomain(releaseName string) (string, error) { - - // compose list options based on label selector domainFromReleaseNameDomainpool-pool= - opts, err := h.domainListOptions(releaseName) - if err != nil { - return "", err +func (h *AICloudDomainHandler) ServiceInstanceMetadata(releaseNs string) (*simetadata.ServiceInstanceMetadata, error) { + aiCloudMetadataCm := &corev1.ConfigMap{ + ObjectMeta: metav1.ObjectMeta{Namespace: releaseNs, Name: "serviceinstancemetadata"}, } - // list all the domains who match the selector - domains := &mcv1alpha1.DomainList{} - if err := KubeClient().List(context.Background(), domains, opts...); err != nil { - return "", err + cmKey := types.NamespacedName{Namespace: releaseNs, Name: "serviceinstancemetadata"} + if err := KubeClient().Get(context.Background(), cmKey, aiCloudMetadataCm, []client.GetOption{}...); err != nil { + return nil, err } - // return an error in case of empty list - if len(domains.Items) == 0 { - return "", fmt.Errorf("empty domains list, unable to detect MLOps clusterDomain") + + instanceMetadata := &simetadata.ServiceInstanceMetadata{} + if err := yaml.Unmarshal([]byte(aiCloudMetadataCm.Data[simetadata.IngressKeyName]), instanceMetadata); err != nil { + return nil, err } - clusterDomain := strings.Replace(domains.Items[0].Spec.CommonName, "*.", "", 1) - // log and return - klog.Infof("going to use %s for MLOps instance", clusterDomain) - return clusterDomain, nil + + return instanceMetadata, nil } @@ -190,7 +207,7 @@ func (h *AICloudDomainHandler) domainListOptions(releaseName string) ([]client.L } -func (h *AICloudDomainHandler) mutationResponse(uuid types.UID, clusterDomain string) ([]byte, error) { +func (h *AICloudDomainHandler) mutationResponse(uuid types.UID, patchBody string) ([]byte, error) { pt := v1.PatchTypeJSONPatch ar := &v1.AdmissionReview{} ar.SetGroupVersionKind(schema.GroupVersionKind{ @@ -202,7 +219,7 @@ func (h *AICloudDomainHandler) mutationResponse(uuid types.UID, clusterDomain st UID: uuid, Allowed: true, PatchType: &pt, - Patch: []byte(fmt.Sprintf(patchClusterDomainTpl, clusterDomain)), + Patch: []byte(patchBody), Result: &metav1.Status{Message: "ok"}, } diff --git a/pkg/app/controlplane/tmpl/crds/mlops.cnvrg.io_cnvrgapps.yaml b/pkg/app/controlplane/tmpl/crds/mlops.cnvrg.io_cnvrgapps.yaml index f060f2ce..f07e0905 100644 --- a/pkg/app/controlplane/tmpl/crds/mlops.cnvrg.io_cnvrgapps.yaml +++ b/pkg/app/controlplane/tmpl/crds/mlops.cnvrg.io_cnvrgapps.yaml @@ -749,12 +749,12 @@ spec: properties: https: properties: + cert: + type: string certSecret: type: string enabled: type: boolean - cert: - type: string key: type: string type: object @@ -768,6 +768,8 @@ spec: type: string istioIngressSelectorValue: type: string + ocpSecureRoutes: + type: boolean perTryTimeout: type: string retriesAttempts: @@ -776,8 +778,6 @@ spec: type: string type: type: string - ocpSecureRoutes: - type: boolean type: object proxy: properties: diff --git a/pkg/app/controlplane/tmpl/crds/mlops.cnvrg.io_cnvrgthirdparties.yaml b/pkg/app/controlplane/tmpl/crds/mlops.cnvrg.io_cnvrgthirdparties.yaml index fd8a0ba7..ccd6b4ab 100644 --- a/pkg/app/controlplane/tmpl/crds/mlops.cnvrg.io_cnvrgthirdparties.yaml +++ b/pkg/app/controlplane/tmpl/crds/mlops.cnvrg.io_cnvrgthirdparties.yaml @@ -18,6 +18,9 @@ metadata: mlops.cnvrg.io/default-loader: "true" mlops.cnvrg.io/own: "false" mlops.cnvrg.io/updatable: "true" + mlops.cnvrg.io/default-loader: "true" + mlops.cnvrg.io/own: "false" + mlops.cnvrg.io/updatable: "true" controller-gen.kubebuilder.io/version: v0.9.2 creationTimestamp: null name: cnvrgthirdparties.mlops.cnvrg.io From 072a930eed59e7ed9c5efc5f1904f9bab8dedc1c Mon Sep 17 00:00:00 2001 From: Dmitry Kartsev Date: Tue, 6 Feb 2024 11:53:12 +0200 Subject: [PATCH 02/10] migrate to service instance metadata --- Dockerfile | 2 +- charts/cnvrg-admission/templates/rbac.yml | 6 ++++++ charts/cnvrg-cap/templates/cap.yml | 2 ++ cmd/operator/main.go | 4 ++-- pkg/admission/domain.go | 11 +++++------ pkg/admission/utils.go | 3 +++ 6 files changed, 19 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index d07b5c2c..f44d99f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.19.1 as builder +FROM golang:1.21.1 as builder ARG git_auth ENV GOPRIVATE=github.com/AccessibleAI/cnvrg-shim WORKDIR /workspace diff --git a/charts/cnvrg-admission/templates/rbac.yml b/charts/cnvrg-admission/templates/rbac.yml index 23b6111a..7f0dc761 100644 --- a/charts/cnvrg-admission/templates/rbac.yml +++ b/charts/cnvrg-admission/templates/rbac.yml @@ -33,6 +33,12 @@ rules: - domains verbs: - list +- apiGroups: + - "" + resources: + - configmaps + verbs: + - get --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding diff --git a/charts/cnvrg-cap/templates/cap.yml b/charts/cnvrg-cap/templates/cap.yml index 8d39f7b2..6bddfbe4 100644 --- a/charts/cnvrg-cap/templates/cap.yml +++ b/charts/cnvrg-cap/templates/cap.yml @@ -3,6 +3,8 @@ kind: CnvrgApp metadata: name: cnvrg-app namespace: {{ .Release.Namespace}} + labels: + mlops.cnvrg.io/domain.auto.discovery: "true" spec: clusterDomain: {{.Values.clusterDomain}} clusterInternalDomain: {{.Values.clusterInternalDomain}} diff --git a/cmd/operator/main.go b/cmd/operator/main.go index 098e94fe..c9f4cf94 100644 --- a/cmd/operator/main.go +++ b/cmd/operator/main.go @@ -13,6 +13,7 @@ import ( "os" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/healthz" + metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" "strings" mlopsv1 "github.com/AccessibleAI/cnvrg-operator/api/v1" @@ -111,9 +112,8 @@ func runOperator() { mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{ Scheme: scheme, - MetricsBindAddress: viper.GetString("metrics-addr"), + Metrics: metricsserver.Options{BindAddress: viper.GetString("metrics-addr")}, HealthProbeBindAddress: viper.GetString("health-probe-addr"), - Port: 9443, LeaderElection: viper.GetBool("enable-leader-election"), LeaderElectionID: "99748453.cnvrg.io", }) diff --git a/pkg/admission/domain.go b/pkg/admission/domain.go index 38306104..691218ee 100644 --- a/pkg/admission/domain.go +++ b/pkg/admission/domain.go @@ -36,7 +36,7 @@ func NewAICloudDomainHandler() *AICloudDomainHandler { } func (h *AICloudDomainHandler) Handler(w http.ResponseWriter, r *http.Request) { - + zap.S().Infof("admission review request received from: %s ", r.RemoteAddr) ar, err := h.admissionReviewDecode(h.body(r)) if err != nil { endWithError(err, w) @@ -62,6 +62,7 @@ func (h *AICloudDomainHandler) Handler(w http.ResponseWriter, r *http.Request) { } endWithOk(resp, w) + zap.S().Info("admission response sent") } func (h *AICloudDomainHandler) patchBody(cap *mlopsv1.CnvrgApp) (string, error) { @@ -78,13 +79,11 @@ func (h *AICloudDomainHandler) patchBody(cap *mlopsv1.CnvrgApp) (string, error) if err != nil { return "", err } - patch := fmt.Sprintf(patchCnvrgAppTpl, clusterDomain, serviceInstanceMetadata.Ingress.SelectorKey, serviceInstanceMetadata.Ingress.SelectorValue, ) - zap.S().Info(patch) return patch, nil } @@ -101,8 +100,8 @@ func (h *AICloudDomainHandler) HookCfg(ns, svc string, caBundle []byte) *admissi Webhooks: []admissionv1.MutatingWebhook{ { Name: hookName, - NamespaceSelector: &metav1.LabelSelector{ - MatchLabels: map[string]string{"name": ns}, + ObjectSelector: &metav1.LabelSelector{ + MatchLabels: map[string]string{"mlops.cnvrg.io/domain.auto.discovery": "true"}, }, ClientConfig: admissionv1.WebhookClientConfig{ Service: &admissionv1.ServiceReference{ @@ -215,6 +214,7 @@ func (h *AICloudDomainHandler) mutationResponse(uuid types.UID, patchBody string Version: "v1", Kind: "AdmissionReview", }) + zap.S().Infof("patch body: %s", patchBody) ar.Response = &v1.AdmissionResponse{ UID: uuid, Allowed: true, @@ -222,6 +222,5 @@ func (h *AICloudDomainHandler) mutationResponse(uuid types.UID, patchBody string Patch: []byte(patchBody), Result: &metav1.Status{Message: "ok"}, } - return json.Marshal(ar) } diff --git a/pkg/admission/utils.go b/pkg/admission/utils.go index b5716b36..17a2d16e 100644 --- a/pkg/admission/utils.go +++ b/pkg/admission/utils.go @@ -7,8 +7,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "net/http" + ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/config" + ctrlzap "sigs.k8s.io/controller-runtime/pkg/log/zap" ) func endWithError(err error, w http.ResponseWriter) { @@ -24,6 +26,7 @@ func endWithOk(data []byte, w http.ResponseWriter) { } func KubeClient() client.Client { + ctrl.SetLogger(ctrlzap.New(ctrlzap.UseFlagOptions(&ctrlzap.Options{Development: false}))) rc, err := config.GetConfig() if err != nil { zap.S().Fatal(err) From 40f90ce8c181379c6e9420514a04a9037cabe085 Mon Sep 17 00:00:00 2001 From: Dmitry Kartsev Date: Wed, 7 Feb 2024 12:09:30 +0200 Subject: [PATCH 03/10] wip --- charts/cnvrg-non-privileged/Chart.yaml | 6 + .../crds/mlops.cnvrg.io_cnvrgapps.yaml | 979 ++++++++++++++++++ .../cnvrg-non-privileged/templates/NOTES.txt | 13 + charts/cnvrg-non-privileged/templates/cap.yml | 377 +++++++ .../templates/operator.yml | 77 ++ charts/cnvrg-non-privileged/values.yaml | 374 +++++++ cmd/operator/main.go | 16 +- controllers/app/controller.go | 6 +- hack/sa-token-secret.yaml | 8 + pkg/app/controlplane/tmpl/nomex/role.tpl | 11 +- .../controlplane/tmpl/nomex/rolebinding.tpl | 11 +- .../tmpl/jwks/{clusterrole.tpl => role.tpl} | 2 +- ...clusterrolebinding.tpl => rolebinding.tpl} | 5 +- .../tmpl/proxy/{clusterrole.tpl => role.tpl} | 2 +- ...clusterrolebinding.tpl => rolebinding.tpl} | 5 +- pkg/desired/kinds.go | 22 +- pkg/desired/types.go | 26 - 17 files changed, 1872 insertions(+), 68 deletions(-) create mode 100644 charts/cnvrg-non-privileged/Chart.yaml create mode 100644 charts/cnvrg-non-privileged/crds/mlops.cnvrg.io_cnvrgapps.yaml create mode 100644 charts/cnvrg-non-privileged/templates/NOTES.txt create mode 100644 charts/cnvrg-non-privileged/templates/cap.yml create mode 100644 charts/cnvrg-non-privileged/templates/operator.yml create mode 100644 charts/cnvrg-non-privileged/values.yaml create mode 100644 hack/sa-token-secret.yaml rename pkg/app/sso/tmpl/jwks/{clusterrole.tpl => role.tpl} (96%) rename pkg/app/sso/tmpl/jwks/{clusterrolebinding.tpl => rolebinding.tpl} (87%) rename pkg/app/sso/tmpl/proxy/{clusterrole.tpl => role.tpl} (97%) rename pkg/app/sso/tmpl/proxy/{clusterrolebinding.tpl => rolebinding.tpl} (87%) delete mode 100644 pkg/desired/types.go diff --git a/charts/cnvrg-non-privileged/Chart.yaml b/charts/cnvrg-non-privileged/Chart.yaml new file mode 100644 index 00000000..eba31390 --- /dev/null +++ b/charts/cnvrg-non-privileged/Chart.yaml @@ -0,0 +1,6 @@ +apiVersion: v2 +name: cnvrg-operator +description: A cnvrg.io operator v3 chart for K8s +type: application +version: 5.0.0 +appVersion: 1.2.3 diff --git a/charts/cnvrg-non-privileged/crds/mlops.cnvrg.io_cnvrgapps.yaml b/charts/cnvrg-non-privileged/crds/mlops.cnvrg.io_cnvrgapps.yaml new file mode 100644 index 00000000..fd142fd7 --- /dev/null +++ b/charts/cnvrg-non-privileged/crds/mlops.cnvrg.io_cnvrgapps.yaml @@ -0,0 +1,979 @@ +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.9.2 + creationTimestamp: null + name: cnvrgapps.mlops.cnvrg.io +spec: + group: mlops.cnvrg.io + names: + kind: CnvrgApp + listKind: CnvrgAppList + plural: cnvrgapps + shortNames: + - cap + singular: cnvrgapp + scope: Namespaced + versions: + - additionalPrinterColumns: + - jsonPath: .spec.controlPlane.image + name: Version + type: string + - jsonPath: .status.status + name: Status + type: string + - jsonPath: .status.message + name: Message + type: string + name: v1 + schema: + openAPIV3Schema: + description: CnvrgApp represent the cnvrg.io AI/MLOps control plane stack, + which includes frontend and backend services & persistent workloads (DBs). + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + properties: + annotations: + additionalProperties: + type: string + type: object + clusterDomain: + type: string + clusterInternalDomain: + type: string + controlPlane: + properties: + baseConfig: + properties: + agentCustomTag: + type: string + cnvrgJobRbacStrict: + type: boolean + cnvrgJobUid: + type: string + cnvrgPrivilegedJob: + type: boolean + featureFlags: + additionalProperties: + type: string + type: object + intercom: + type: string + jobsStorageClass: + type: string + metagpuEnabled: + type: boolean + runJobsOnSelfCluster: + type: string + sentryUrl: + type: string + type: object + cnvrgClusterProvisionerOperator: + properties: + awsCredsRef: + type: string + enabled: + type: boolean + image: + type: string + limits: + properties: + cpu: + type: string + memory: + type: string + type: object + requests: + properties: + cpu: + type: string + memory: + type: string + type: object + type: object + cnvrgRouter: + properties: + enabled: + type: boolean + image: + type: string + nodePort: + type: integer + svcName: + type: string + type: object + cnvrgScheduler: + properties: + enabled: + type: boolean + limits: + properties: + cpu: + type: string + memory: + type: string + type: object + replicas: + type: integer + requests: + properties: + cpu: + type: string + memory: + type: string + type: object + type: object + hyper: + properties: + cpuLimit: + type: string + enabled: + type: boolean + image: + type: string + limits: + properties: + cpu: + type: string + memory: + type: string + type: object + memoryLimit: + type: string + nodePort: + type: integer + port: + type: integer + readinessPeriodSeconds: + type: integer + readinessTimeoutSeconds: + type: integer + replicas: + type: integer + requests: + properties: + cpu: + type: string + memory: + type: string + type: object + svcName: + type: string + token: + type: string + type: object + image: + type: string + ldap: + properties: + account: + type: string + adminPassword: + type: string + adminUser: + type: string + base: + type: string + enabled: + type: boolean + host: + type: string + port: + type: string + ssl: + type: string + type: object + mpi: + properties: + enabled: + type: boolean + extraArgs: + additionalProperties: + type: string + type: object + image: + type: string + kubectlDeliveryImage: + type: string + limits: + properties: + cpu: + type: string + memory: + type: string + type: object + registry: + properties: + name: + type: string + password: + type: string + url: + type: string + user: + type: string + type: object + requests: + properties: + cpu: + type: string + memory: + type: string + type: object + type: object + nomex: + properties: + enabled: + type: boolean + image: + type: string + type: object + objectStorage: + properties: + accessKey: + type: string + azureAccountName: + type: string + azureContainer: + type: string + bucket: + type: string + endpoint: + type: string + gcpProject: + type: string + gcpSecretRef: + type: string + region: + type: string + secretKey: + type: string + type: + enum: + - minio + - aws + - azure + - gcp + type: string + type: object + searchkiq: + properties: + enabled: + type: boolean + hpa: + properties: + enabled: + type: boolean + maxReplicas: + type: integer + utilization: + type: integer + type: object + limits: + properties: + cpu: + type: string + memory: + type: string + type: object + replicas: + type: integer + requests: + properties: + cpu: + type: string + memory: + type: string + type: object + type: object + sidekiq: + properties: + enabled: + type: boolean + hpa: + properties: + enabled: + type: boolean + maxReplicas: + type: integer + utilization: + type: integer + type: object + limits: + properties: + cpu: + type: string + memory: + type: string + type: object + replicas: + type: integer + requests: + properties: + cpu: + type: string + memory: + type: string + type: object + split: + type: boolean + type: object + smtp: + properties: + domain: + type: string + opensslVerifyMode: + type: string + password: + type: string + port: + type: integer + sender: + type: string + server: + type: string + username: + type: string + type: object + systemkiq: + properties: + enabled: + type: boolean + hpa: + properties: + enabled: + type: boolean + maxReplicas: + type: integer + utilization: + type: integer + type: object + limits: + properties: + cpu: + type: string + memory: + type: string + type: object + replicas: + type: integer + requests: + properties: + cpu: + type: string + memory: + type: string + type: object + type: object + webapp: + properties: + enabled: + type: boolean + failureThreshold: + type: integer + hpa: + properties: + enabled: + type: boolean + maxReplicas: + type: integer + utilization: + type: integer + type: object + initialDelaySeconds: + type: integer + limits: + properties: + cpu: + type: string + memory: + type: string + type: object + nodePort: + type: integer + passengerMaxPoolSize: + type: integer + port: + type: integer + readinessPeriodSeconds: + type: integer + readinessTimeoutSeconds: + type: integer + replicas: + type: integer + requests: + properties: + cpu: + type: string + memory: + type: string + type: object + svcName: + type: string + type: object + type: object + dbs: + properties: + es: + properties: + cleanupPolicy: + properties: + all: + type: string + app: + type: string + endpoints: + type: string + jobs: + type: string + type: object + credsRef: + type: string + elastalert: + properties: + authProxyImage: + type: string + credsRef: + type: string + enabled: + type: boolean + image: + type: string + limits: + properties: + cpu: + type: string + memory: + type: string + type: object + nodePort: + type: integer + nodeSelector: + additionalProperties: + type: string + type: object + port: + type: integer + pvcName: + type: string + requests: + properties: + cpu: + type: string + memory: + type: string + type: object + storageClass: + type: string + storageSize: + type: string + svcName: + type: string + type: object + enabled: + type: boolean + image: + type: string + javaOpts: + type: string + kibana: + properties: + credsRef: + type: string + enabled: + type: boolean + image: + type: string + limits: + properties: + cpu: + type: string + memory: + type: string + type: object + nodePort: + type: integer + port: + type: integer + requests: + properties: + cpu: + type: string + memory: + type: string + type: object + serviceAccount: + type: string + svcName: + type: string + type: object + limits: + properties: + cpu: + type: string + memory: + type: string + type: object + nodePort: + type: integer + nodeSelector: + additionalProperties: + type: string + type: object + patchEsNodes: + type: boolean + port: + type: integer + pvcName: + type: string + replicas: + type: integer + requests: + properties: + cpu: + type: string + memory: + type: string + type: object + serviceAccount: + type: string + storageClass: + type: string + storageSize: + type: string + svcName: + type: string + type: object + minio: + properties: + enabled: + type: boolean + image: + type: string + limits: + properties: + cpu: + type: string + memory: + type: string + type: object + nodePort: + type: integer + nodeSelector: + additionalProperties: + type: string + type: object + port: + type: integer + pvcName: + type: string + replicas: + type: integer + requests: + properties: + cpu: + type: string + memory: + type: string + type: object + serviceAccount: + type: string + storageClass: + type: string + storageSize: + type: string + svcName: + type: string + type: object + pg: + properties: + credsRef: + type: string + effectiveCacheSize: + type: string + enabled: + type: boolean + hugePages: + properties: + enabled: + type: boolean + memory: + type: string + size: + type: string + type: object + image: + type: string + limits: + properties: + cpu: + type: string + memory: + type: string + type: object + maxConnections: + type: integer + nodeSelector: + additionalProperties: + type: string + type: object + port: + type: integer + pvcName: + type: string + requests: + properties: + cpu: + type: string + memory: + type: string + type: object + serviceAccount: + type: string + sharedBuffers: + type: string + storageClass: + type: string + storageSize: + type: string + svcName: + type: string + type: object + prom: + properties: + credsRef: + type: string + enabled: + type: boolean + extraScrapeConfigs: + items: + properties: + labelSelector: + type: string + namespace: + type: string + role: + type: string + type: object + type: array + grafana: + properties: + credsRef: + type: string + enabled: + type: boolean + image: + type: string + nodePort: + type: integer + port: + type: integer + svcName: + type: string + type: object + image: + type: string + port: + type: integer + storageClass: + type: string + storageSize: + type: string + svcName: + type: string + type: object + redis: + properties: + credsRef: + type: string + enabled: + type: boolean + image: + type: string + limits: + properties: + cpu: + type: string + memory: + type: string + type: object + nodeSelector: + additionalProperties: + type: string + type: object + port: + type: integer + pvcName: + type: string + requests: + properties: + cpu: + type: string + memory: + type: string + type: object + serviceAccount: + type: string + storageClass: + type: string + storageSize: + type: string + svcName: + type: string + type: object + type: object + imageHub: + type: string + labels: + additionalProperties: + type: string + type: object + networking: + properties: + https: + properties: + cert: + type: string + certSecret: + type: string + enabled: + type: boolean + key: + type: string + type: object + ingress: + properties: + istioGwEnabled: + type: boolean + istioGwName: + type: string + istioIngressSelectorKey: + type: string + istioIngressSelectorValue: + type: string + ocpSecureRoutes: + type: boolean + perTryTimeout: + type: string + retriesAttempts: + type: integer + timeout: + type: string + type: + type: string + type: object + proxy: + properties: + configRef: + type: string + enabled: + type: boolean + httpProxy: + items: + type: string + type: array + httpsProxy: + items: + type: string + type: array + noProxy: + items: + type: string + type: array + type: object + type: object + priorityClass: + properties: + appClassRef: + type: string + jobClassRef: + type: string + type: object + registry: + properties: + name: + type: string + password: + type: string + url: + type: string + user: + type: string + type: object + sso: + properties: + central: + properties: + adminUser: + type: string + centralUiImage: + type: string + clientId: + type: string + clientSecret: + type: string + cnvrgProxyImage: + type: string + cookieDomain: + type: string + emailDomain: + items: + type: string + type: array + enabled: + type: boolean + groupsAuth: + type: boolean + insecureOidcAllowUnverifiedEmail: + type: boolean + jwksURL: + type: string + limits: + properties: + cpu: + type: string + memory: + type: string + type: object + nodeSelector: + additionalProperties: + type: string + type: object + oauthProxyImage: + type: string + oidcIssuerUrl: + type: string + provider: + type: string + publicUrl: + type: string + readiness: + type: boolean + replicas: + type: integer + requests: + properties: + cpu: + type: string + memory: + type: string + type: object + scope: + type: string + serviceUrl: + type: string + sslInsecureSkipVerify: + type: boolean + svcName: + type: string + whitelistDomain: + type: string + type: object + enabled: + type: boolean + jwks: + properties: + cacheImage: + type: string + enabled: + type: boolean + image: + type: string + nodeSelector: + additionalProperties: + type: string + type: object + replicas: + type: integer + svcName: + type: string + type: object + pki: + properties: + enabled: + type: boolean + privateKeySecret: + type: string + publicKeySecret: + type: string + rootCaSecret: + type: string + type: object + proxy: + properties: + address: + type: string + enabled: + type: boolean + image: + type: string + limits: + properties: + cpu: + type: string + memory: + type: string + type: object + nodeSelector: + additionalProperties: + type: string + type: object + readiness: + type: boolean + replicas: + type: integer + requests: + properties: + cpu: + type: string + memory: + type: string + type: object + svcName: + type: string + type: object + version: + type: string + type: object + tenancy: + properties: + enabled: + type: boolean + key: + type: string + value: + type: string + type: object + type: object + status: + properties: + message: + type: string + progress: + type: integer + stackReadiness: + additionalProperties: + type: boolean + type: object + status: + type: string + type: object + type: object + served: true + storage: true + subresources: + status: {} diff --git a/charts/cnvrg-non-privileged/templates/NOTES.txt b/charts/cnvrg-non-privileged/templates/NOTES.txt new file mode 100644 index 00000000..aa20e8a6 --- /dev/null +++ b/charts/cnvrg-non-privileged/templates/NOTES.txt @@ -0,0 +1,13 @@ +🚀 Thank you for installing cnvrg.io! + +Wait until all the pods in the {{ .Release.Namespace }} namespace are running and healthy. +Once all pods are running, get the app url by running: +kubectl get cap cnvrg-app -n{{ .Release.Namespace }} -ojson | grep clusterDomain | awk '{print "app."$2}' | tr -d '"|,' +If something goes wrong (how come? 🙀), check app init container logs: +kubectl logs -n{{ .Release.Namespace }} --tail 10 -lapp=app -c ingresscheck + +Join our community at https://community.cnvrg.io +Talk to our team via email at hi@cnvrg.io + + + diff --git a/charts/cnvrg-non-privileged/templates/cap.yml b/charts/cnvrg-non-privileged/templates/cap.yml new file mode 100644 index 00000000..8d39f7b2 --- /dev/null +++ b/charts/cnvrg-non-privileged/templates/cap.yml @@ -0,0 +1,377 @@ +apiVersion: mlops.cnvrg.io/v1 +kind: CnvrgApp +metadata: + name: cnvrg-app + namespace: {{ .Release.Namespace}} +spec: + clusterDomain: {{.Values.clusterDomain}} + clusterInternalDomain: {{.Values.clusterInternalDomain}} + imageHub: {{.Values.imageHub}} + controlPlane: + image: {{.Values.controlPlane.image}} + webapp: + replicas: {{.Values.controlPlane.webapp.replicas}} + enabled: {{.Values.controlPlane.webapp.enabled}} + port: {{.Values.controlPlane.webapp.port}} + requests: + cpu: "{{.Values.controlPlane.webapp.requests.cpu}}" + memory: {{.Values.controlPlane.webapp.requests.memory}} + limits: + cpu: "{{.Values.controlPlane.webapp.limits.cpu}}" + memory: {{.Values.controlPlane.webapp.limits.memory}} + svcName: {{.Values.controlPlane.webapp.svcName}} + nodePort: {{.Values.controlPlane.webapp.nodePort}} + passengerMaxPoolSize: {{.Values.controlPlane.webapp.passengerMaxPoolSize}} + initialDelaySeconds: {{.Values.controlPlane.webapp.initialDelaySeconds}} + readinessPeriodSeconds: {{.Values.controlPlane.webapp.readinessPeriodSeconds}} + readinessTimeoutSeconds: {{.Values.controlPlane.webapp.readinessTimeoutSeconds}} + failureThreshold: {{.Values.controlPlane.webapp.failureThreshold}} + hpa: + enabled: {{.Values.controlPlane.webapp.hpa.enabled}} + utilization: {{.Values.controlPlane.webapp.hpa.utilization}} + maxReplicas: {{.Values.controlPlane.webapp.hpa.maxReplicas}} + sidekiq: + enabled: {{.Values.controlPlane.sidekiq.enabled}} + split: {{.Values.controlPlane.sidekiq.split}} + requests: + cpu: "{{.Values.controlPlane.sidekiq.requests.cpu}}" + memory: {{.Values.controlPlane.sidekiq.requests.memory}} + limits: + cpu: "{{.Values.controlPlane.sidekiq.limits.cpu}}" + memory: {{.Values.controlPlane.sidekiq.limits.memory}} + replicas: {{.Values.controlPlane.sidekiq.replicas}} + hpa: + enabled: {{.Values.controlPlane.sidekiq.hpa.enabled}} + utilization: {{.Values.controlPlane.sidekiq.hpa.utilization}} + maxReplicas: {{.Values.controlPlane.sidekiq.hpa.maxReplicas}} + searchkiq: + enabled: {{.Values.controlPlane.searchkiq.enabled}} + requests: + cpu: "{{.Values.controlPlane.searchkiq.requests.cpu}}" + memory: {{.Values.controlPlane.searchkiq.requests.memory}} + limits: + cpu: "{{.Values.controlPlane.searchkiq.limits.cpu}}" + memory: "{{.Values.controlPlane.searchkiq.limits.memory}}" + replicas: {{.Values.controlPlane.searchkiq.replicas}} + hpa: + enabled: {{.Values.controlPlane.searchkiq.hpa.enabled}} + utilization: {{.Values.controlPlane.searchkiq.hpa.utilization}} + maxReplicas: {{.Values.controlPlane.searchkiq.hpa.maxReplicas}} + systemkiq: + enabled: {{.Values.controlPlane.systemkiq.enabled}} + requests: + cpu: "{{.Values.controlPlane.systemkiq.requests.cpu}}" + memory: {{.Values.controlPlane.systemkiq.requests.memory}} + limits: + cpu: "{{.Values.controlPlane.systemkiq.limits.cpu}}" + memory: {{.Values.controlPlane.systemkiq.limits.memory}} + replicas: {{.Values.controlPlane.systemkiq.replicas}} + hpa: + enabled: {{.Values.controlPlane.systemkiq.hpa.enabled}} + utilization: {{.Values.controlPlane.systemkiq.hpa.utilization}} + maxReplicas: {{.Values.controlPlane.systemkiq.hpa.maxReplicas}} + hyper: + enabled: {{.Values.controlPlane.hyper.enabled}} + image: {{.Values.controlPlane.hyper.image}} + port: {{.Values.controlPlane.hyper.port}} + replicas: {{.Values.controlPlane.hyper.replicas}} + nodePort: {{.Values.controlPlane.hyper.nodePort}} + svcName: {{.Values.controlPlane.hyper.svcName}} + token: {{.Values.controlPlane.hyper.token}} + requests: + cpu: {{.Values.controlPlane.hyper.requests.cpu}} + memory: {{.Values.controlPlane.hyper.requests.memory}} + limits: + cpu: "{{.Values.controlPlane.hyper.limits.cpu}}" + memory: {{.Values.controlPlane.hyper.limits.memory}} + cpuLimit: {{.Values.controlPlane.hyper.cpuLimit}} + memoryLimit: {{.Values.controlPlane.hyper.memoryLimit}} + readinessPeriodSeconds: {{.Values.controlPlane.hyper.readinessPeriodSeconds}} + readinessTimeoutSeconds: {{.Values.controlPlane.hyper.readinessTimeoutSeconds}} + cnvrgScheduler: + enabled: {{.Values.controlPlane.cnvrgScheduler.enabled}} + requests: + cpu: {{.Values.controlPlane.cnvrgScheduler.requests.cpu}} + memory: {{.Values.controlPlane.cnvrgScheduler.requests.memory}} + limits: + cpu: "{{.Values.controlPlane.cnvrgScheduler.limits.cpu}}" + memory: {{.Values.controlPlane.cnvrgScheduler.limits.memory}} + replicas: {{.Values.controlPlane.cnvrgScheduler.replicas}} + cnvrgRouter: + enabled: {{.Values.controlPlane.cnvrgRouter.enabled}} + image: {{.Values.controlPlane.cnvrgRouter.image}} + svcName: {{.Values.controlPlane.cnvrgRouter.svcName}} + nodePort: {{.Values.controlPlane.cnvrgRouter.nodePort}} + baseConfig: + jobsStorageClass: {{.Values.controlPlane.baseConfig.jobsStorageClass}} + featureFlags: + {{- range $fk, $fv := .Values.controlPlane.baseConfig.featureFlags }} + {{$fk}}: "{{$fv}}" + {{- end }} + sentryUrl: {{.Values.controlPlane.baseConfig.sentryUrl}} + runJobsOnSelfCluster: {{.Values.controlPlane.baseConfig.runJobsOnSelfCluster}} + agentCustomTag: {{.Values.controlPlane.baseConfig.agentCustomTag}} + intercom: "{{.Values.controlPlane.baseConfig.intercom}}" + cnvrgJobUid: "{{.Values.controlPlane.baseConfig.cnvrgJobUid}}" + cnvrgJobRbacStrict: {{.Values.controlPlane.baseConfig.cnvrgJobRbacStrict}} + cnvrgPrivilegedJob: {{.Values.controlPlane.baseConfig.cnvrgPrivilegedJob}} + metagpuEnabled: {{.Values.controlPlane.baseConfig.metagpuEnabled}} + ldap: + enabled: {{.Values.controlPlane.ldap.enabled}} + host: {{.Values.controlPlane.ldap.host}} + port: {{.Values.controlPlane.ldap.port}} + account: {{.Values.controlPlane.ldap.account}} + base: {{.Values.controlPlane.ldap.base}} + adminUser: {{.Values.controlPlane.ldap.adminUser}} + adminPassword: {{.Values.controlPlane.ldap.adminPassword}} + ssl: {{.Values.controlPlane.ldap.ssl}} + smtp: + server: {{.Values.controlPlane.smtp.server}} + port: {{.Values.controlPlane.smtp.port}} + username: {{.Values.controlPlane.smtp.username}} + password: {{.Values.controlPlane.smtp.password}} + domain: {{.Values.controlPlane.smtp.domain}} + opensslVerifyMode: {{.Values.controlPlane.smtp.opensslVerifyMode}} + sender: {{.Values.controlPlane.smtp.sender}} + objectStorage: + type: {{.Values.controlPlane.objectStorage.type}} + bucket: {{.Values.controlPlane.objectStorage.bucket}} + region: {{.Values.controlPlane.objectStorage.region}} + accessKey: {{.Values.controlPlane.objectStorage.accessKey}} + secretKey: {{.Values.controlPlane.objectStorage.secretKey}} + endpoint: {{.Values.controlPlane.objectStorage.endpoint}} + azureAccountName: {{.Values.controlPlane.objectStorage.azureAccountName}} + azureContainer: {{.Values.controlPlane.objectStorage.azureContainer}} + gcpProject: {{.Values.controlPlane.objectStorage.gcpProject}} + gcpSecretRef: {{.Values.controlPlane.objectStorage.gcpSecretRef}} + mpi: + enabled: {{.Values.controlPlane.mpi.enabled}} + image: {{.Values.controlPlane.mpi.image}} + kubectlDeliveryImage: {{.Values.controlPlane.mpi.kubectlDeliveryImage}} + extraArgs: null + registry: + name: {{.Values.controlPlane.mpi.registry.name}} + url: {{.Values.controlPlane.mpi.registry.url}} + user: {{.Values.controlPlane.mpi.registry.user}} + password: {{.Values.controlPlane.mpi.registry.password}} + requests: + cpu: {{.Values.controlPlane.mpi.requests.cpu}} + memory: {{.Values.controlPlane.mpi.requests.memory}} + limits: + cpu: {{.Values.controlPlane.mpi.limits.cpu}} + memory: {{.Values.controlPlane.mpi.limits.memory}} + nomex: + enabled: {{.Values.controlPlane.nomex.enabled}} + image: {{.Values.controlPlane.nomex.image}} + registry: + name: {{.Values.registry.name}} + url: {{.Values.registry.url}} + user: {{.Values.registry.user}} + password: {{.Values.registry.password}} + dbs: + pg: + enabled: {{.Values.dbs.pg.enabled}} + serviceAccount: {{.Values.dbs.pg.serviceAccount}} + image: {{.Values.dbs.pg.image}} + port: {{.Values.dbs.pg.port}} + storageSize: {{.Values.dbs.pg.storageSize}} + svcName: {{.Values.dbs.pg.svcName}} + storageClass: {{.Values.dbs.pg.storageClass}} + requests: + cpu: "{{.Values.dbs.pg.requests.cpu}}" + memory: {{.Values.dbs.pg.requests.memory}} + limits: + cpu: "{{.Values.dbs.pg.limits.cpu}}" + memory: {{.Values.dbs.pg.limits.memory}} + maxConnections: {{.Values.dbs.pg.maxConnections}} + sharedBuffers: {{.Values.dbs.pg.sharedBuffers}} + effectiveCacheSize: {{.Values.dbs.pg.effectiveCacheSize}} + hugePages: + enabled: {{.Values.dbs.pg.hugePages.enabled}} + size: {{.Values.dbs.pg.hugePages.size}} + memory: {{.Values.dbs.pg.hugePages.memory}} + nodeSelector: null + credsRef: {{.Values.dbs.pg.credsRef}} + pvcName: {{.Values.dbs.pg.pvcName}} + redis: + enabled: {{.Values.dbs.redis.enabled}} + serviceAccount: {{.Values.dbs.redis.serviceAccount}} + image: {{.Values.dbs.redis.image}} + svcName: {{.Values.dbs.redis.svcName}} + port: {{.Values.dbs.redis.port}} + storageSize: {{.Values.dbs.redis.storageSize}} + storageClass: {{.Values.dbs.redis.storageClass}} + requests: + cpu: "{{.Values.dbs.redis.requests.cpu}}" + memory: {{.Values.dbs.redis.requests.memory}} + limits: + cpu: "{{.Values.dbs.redis.limits.cpu}}" + memory: {{.Values.dbs.redis.limits.memory}} + nodeSelector: null + credsRef: {{.Values.dbs.redis.credsRef}} + pvcName: {{.Values.dbs.redis.pvcName}} + minio: + enabled: {{.Values.dbs.minio.enabled}} + serviceAccount: {{.Values.dbs.minio.serviceAccount}} + replicas: {{.Values.dbs.minio.replicas}} + image: {{.Values.dbs.minio.image}} + port: {{.Values.dbs.minio.port}} + storageSize: {{.Values.dbs.minio.storageSize}} + svcName: {{.Values.dbs.minio.svcName}} + nodePort: {{.Values.dbs.minio.nodePort}} + storageClass: {{.Values.dbs.minio.storageClass}} + requests: + cpu: "{{.Values.dbs.minio.requests.cpu}}" + memory: {{.Values.dbs.minio.requests.memory}} + limits: + cpu: "{{.Values.dbs.minio.limits.cpu}}" + memory: {{.Values.dbs.minio.limits.memory}} + nodeSelector: null + pvcName: {{.Values.dbs.minio.pvcName}} + es: + enabled: {{.Values.dbs.es.enabled}} + serviceAccount: {{.Values.dbs.es.serviceAccount}} + image: {{.Values.dbs.es.image}} + port: {{.Values.dbs.es.port}} + storageSize: {{.Values.dbs.es.storageSize}} + svcName: {{.Values.dbs.es.svcName}} + nodePort: {{.Values.dbs.es.nodePort}} + storageClass: {{.Values.dbs.es.storageClass}} + requests: + cpu: "{{.Values.dbs.es.requests.cpu}}" + memory: {{.Values.dbs.es.requests.memory}} + limits: + cpu: "{{.Values.dbs.es.limits.cpu}}" + memory: {{.Values.dbs.es.limits.memory}} + javaOpts: {{.Values.dbs.es.javaOpts}} + patchEsNodes: {{.Values.dbs.es.patchEsNodes}} + nodeSelector: null + credsRef: {{.Values.dbs.es.credsRef}} + pvcName: {{.Values.dbs.es.pvcName}} + cleanupPolicy: + all: {{.Values.dbs.es.cleanupPolicy.all}} + app: {{.Values.dbs.es.cleanupPolicy.app}} + jobs: {{.Values.dbs.es.cleanupPolicy.jobs}} + endpoints: {{.Values.dbs.es.cleanupPolicy.endpoints}} + kibana: + enabled: {{.Values.dbs.es.kibana.enabled}} + serviceAccount: {{.Values.dbs.es.kibana.serviceAccount}} + svcName: {{.Values.dbs.es.kibana.svcName}} + port: {{.Values.dbs.es.kibana.port}} + image: {{.Values.dbs.es.kibana.image}} + nodePort: {{.Values.dbs.es.kibana.nodePort}} + requests: + cpu: {{.Values.dbs.es.kibana.requests.cpu}} + memory: {{.Values.dbs.es.kibana.requests.memory}} + limits: + cpu: {{.Values.dbs.es.kibana.limits.cpu}} + memory: {{.Values.dbs.es.kibana.limits.memory}} + credsRef: {{.Values.dbs.es.kibana.credsRef}} + elastalert: + enabled: {{.Values.dbs.es.elastalert.enabled}} + image: {{.Values.dbs.es.elastalert.image}} + authProxyImage: {{.Values.dbs.es.elastalert.authProxyImage}} + credsRef: {{.Values.dbs.es.elastalert.credsRef}} + port: {{.Values.dbs.es.elastalert.port}} + nodePort: {{.Values.dbs.es.elastalert.nodePort}} + storageSize: {{.Values.dbs.es.elastalert.storageSize}} + svcName: {{.Values.dbs.es.elastalert.svcName}} + storageClass: {{.Values.dbs.es.elastalert.storageClass}} + requests: + cpu: {{.Values.dbs.es.elastalert.requests.cpu}} + memory: {{.Values.dbs.es.elastalert.requests.memory}} + limits: + cpu: {{.Values.dbs.es.elastalert.limits.cpu}} + memory: {{.Values.dbs.es.elastalert.limits.memory}} + nodeSelector: null + pvcName: {{.Values.dbs.es.elastalert.pvcName}} + prom: + enabled: {{.Values.dbs.prom.enabled}} + credsRef: {{.Values.dbs.prom.credsRef}} + extraScrapeConfigs: null + image: {{.Values.dbs.prom.image}} + storageClass: {{.Values.dbs.prom.storageClass}} + storageSize: {{.Values.dbs.prom.storageSize}} + grafana: + enabled: {{.Values.dbs.prom.grafana.enabled}} + image: {{.Values.dbs.prom.grafana.image}} + svcName: {{.Values.dbs.prom.grafana.svcName}} + port: {{.Values.dbs.prom.grafana.port}} + nodePort: {{.Values.dbs.prom.grafana.nodePort}} + credsRef: {{.Values.dbs.prom.grafana.credsRef}} + networking: + ingress: + type: {{.Values.networking.ingress.type}} + timeout: {{.Values.networking.ingress.timeout}} + retriesAttempts: {{.Values.networking.ingress.retriesAttempts}} + perTryTimeout: {{.Values.networking.ingress.perTryTimeout}} + istioGwEnabled: {{.Values.networking.ingress.istioGwEnabled}} + istioGwName: {{.Values.networking.ingress.istioGwName}} + istioIngressSelectorKey: {{.Values.networking.ingress.istioIngressSelectorKey}} + istioIngressSelectorValue: {{.Values.networking.ingress.istioIngressSelectorValue}} + ocpSecureRoutes: {{.Values.networking.ingress.ocpSecureRoutes}} + https: + enabled: {{.Values.networking.https.enabled}} + certSecret: {{.Values.networking.https.certSecret}} + cert: {{.Values.networking.https.cert}} + key: {{.Values.networking.https.key}} + proxy: + enabled: {{.Values.networking.proxy.enabled}} + configRef: {{.Values.networking.proxy.configRef}} + httpProxy: {{ toJson .Values.networking.proxy.httpProxy }} + httpsProxy: {{ toJson .Values.networking.proxy.httpsProxy}} + noProxy: {{ toJson .Values.networking.proxy.noProxy}} + sso: + enabled: {{.Values.sso.enabled}} + version: {{.Values.sso.version}} + pki: + enabled: {{.Values.sso.pki.enabled}} + rootCaSecret: {{.Values.sso.pki.rootCaSecret}} + privateKeySecret: {{.Values.sso.pki.privateKeySecret}} + publicKeySecret: {{.Values.sso.pki.publicKeySecret}} + jwks: + enabled: {{.Values.sso.jwks.enabled}} + image: {{.Values.sso.jwks.image}} + cacheImage: {{.Values.sso.jwks.cacheImage}} + central: + enabled: {{.Values.sso.central.enabled}} + publicUrl: {{.Values.sso.central.publicUrl}} + oauthProxyImage: {{.Values.sso.central.oauthProxyImage}} + centralUiImage: {{.Values.sso.central.centralUiImage}} + adminUser: {{.Values.sso.central.adminUser}} + provider: {{.Values.sso.central.provider}} + emailDomain: {{ toJson .Values.sso.central.emailDomain }} + clientId: {{.Values.sso.central.clientId}} + clientSecret: {{.Values.sso.central.clientSecret}} + oidcIssuerUrl: {{.Values.sso.central.oidcIssuerUrl}} + serviceUrl: {{.Values.sso.central.serviceUrl}} + scope: {{.Values.sso.central.scope}} + insecureOidcAllowUnverifiedEmail: {{.Values.sso.central.insecureOidcAllowUnverifiedEmail}} + whitelistDomain: {{.Values.sso.central.whitelistDomain}} + cookieDomain: {{.Values.sso.central.cookieDomain}} + groupsAuth: {{.Values.sso.central.groupsAuth}} + readiness: {{.Values.sso.central.readiness}} + requests: + cpu: "{{.Values.sso.central.requests.cpu}}" + memory: "{{.Values.sso.central.requests.memory}}" + limits: + cpu: "{{.Values.sso.central.limits.cpu}}" + memory: "{{.Values.sso.central.limits.memory}}" + proxy: + enabled: {{.Values.sso.proxy.enabled}} + image: {{.Values.sso.proxy.image}} + address: {{.Values.sso.proxy.address}} + readiness: {{.Values.sso.proxy.readiness}} + requests: + cpu: "{{.Values.sso.proxy.requests.cpu}}" + memory: "{{.Values.sso.proxy.requests.memory}}" + limits: + cpu: "{{.Values.sso.proxy.limits.cpu}}" + memory: "{{.Values.sso.proxy.limits.memory}}" + tenancy: + enabled: {{.Values.tenancy.enabled}} + key: {{.Values.tenancy.key}} + value: {{.Values.tenancy.value}} + priorityClass: + appClassRef: {{.Values.priorityClass.appClassRef}} + jobClassRef: {{.Values.priorityClass.jobClassRef}} diff --git a/charts/cnvrg-non-privileged/templates/operator.yml b/charts/cnvrg-non-privileged/templates/operator.yml new file mode 100644 index 00000000..74b0c2a7 --- /dev/null +++ b/charts/cnvrg-non-privileged/templates/operator.yml @@ -0,0 +1,77 @@ +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: cnvrg-operator + namespace: {{ .Release.Namespace }} +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: cnvrg-operator-role +rules: +- apiGroups: + - "*" + resources: + - "*" + verbs: + - "*" +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: cnvrg-operator-rolebinding +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: cnvrg-operator-role +subjects: + - kind: ServiceAccount + name: cnvrg-operator +--- +apiVersion: v1 +kind: Secret +type: kubernetes.io/dockerconfigjson +metadata: + name: operator-pull-secret + namespace: {{ .Release.Namespace }} +data: + .dockerconfigjson: {{ printf "{\"auths\":{\"%s\":{\"username\":\"%s\",\"password\":\"%s\",\"auth\":\"%s\"}}}" .Values.registry.url .Values.registry.user .Values.registry.password (printf "%s:%s" .Values.registry.user .Values.registry.password | b64enc) | b64enc }} +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + control-plane: cnvrg-operator + name: cnvrg-operator + namespace: {{ .Release.Namespace }} +spec: + replicas: 1 + selector: + matchLabels: + control-plane: cnvrg-operator + template: + metadata: + labels: + control-plane: cnvrg-operator + spec: + imagePullSecrets: + - name: operator-pull-secret + containers: + - command: + - /opt/app-root/cnvrg-operator + - start + - --max-concurrent-reconciles + - "3" + image: "docker.io/cnvrg/cnvrg-operator:DEV-22107-no-cluster-roles" + imagePullPolicy: Always + name: cnvrg-operator + resources: + limits: + cpu: 1000m + memory: 1000Mi + requests: + cpu: 500m + memory: 200Mi + serviceAccountName: cnvrg-operator + terminationGracePeriodSeconds: 10 \ No newline at end of file diff --git a/charts/cnvrg-non-privileged/values.yaml b/charts/cnvrg-non-privileged/values.yaml new file mode 100644 index 00000000..8e1f22d9 --- /dev/null +++ b/charts/cnvrg-non-privileged/values.yaml @@ -0,0 +1,374 @@ +clusterDomain: '' +clusterInternalDomain: cluster.local +imageHub: docker.io/cnvrg +controlPlane: + image: core:3.6.99 + webapp: + replicas: 1 + enabled: true + port: 8080 + requests: + cpu: 500m + memory: 4Gi + limits: + cpu: '4' + memory: 8Gi + svcName: app + nodePort: 30080 + passengerMaxPoolSize: 50 + initialDelaySeconds: 10 + readinessPeriodSeconds: 25 + readinessTimeoutSeconds: 20 + failureThreshold: 5 + hpa: + enabled: true + utilization: 85 + maxReplicas: 5 + sidekiq: + enabled: true + split: true + requests: + cpu: 200m + memory: 3750Mi + limits: + cpu: '2' + memory: 8Gi + replicas: 2 + hpa: + enabled: true + utilization: 85 + maxReplicas: 5 + searchkiq: + enabled: true + requests: + cpu: 200m + memory: 1Gi + limits: + cpu: '2' + memory: 8Gi + replicas: 1 + hpa: + enabled: true + utilization: 85 + maxReplicas: 5 + systemkiq: + enabled: true + requests: + cpu: 300m + memory: 2Gi + limits: + cpu: '2' + memory: 8Gi + replicas: 1 + hpa: + enabled: true + utilization: 85 + maxReplicas: 5 + hyper: + enabled: true + image: hyper-server:latest + port: 5050 + replicas: 1 + nodePort: 30050 + svcName: hyper + token: token + requests: + cpu: 100m + memory: 200Mi + limits: + cpu: '2' + memory: 4Gi + cpuLimit: '' + memoryLimit: '' + readinessPeriodSeconds: 100 + readinessTimeoutSeconds: 60 + cnvrgScheduler: + enabled: false + requests: + cpu: 200m + memory: 1000Mi + limits: + cpu: '2' + memory: 4Gi + replicas: 1 + cnvrgRouter: + enabled: false + image: nginx:1.21.0 + svcName: cnvrg-router + nodePort: 30081 + baseConfig: + jobsStorageClass: '' + featureFlags: + CNVRG_ENABLE_MOUNT_FOLDERS: false + CNVRG_MOUNT_HOST_FOLDERS: false + CNVRG_PROMETHEUS_METRICS: true + sentryUrl: '' + runJobsOnSelfCluster: '' + agentCustomTag: agnostic-logs + intercom: 'true' + cnvrgJobUid: '0' + cnvrgJobRbacStrict: false + cnvrgPrivilegedJob: true + metagpuEnabled: false + ldap: + enabled: false + host: '' + port: '' + account: userPrincipalName + base: '' + adminUser: '' + adminPassword: '' + ssl: '' + smtp: + server: '' + port: 587 + username: '' + password: '' + domain: '' + opensslVerifyMode: '' + sender: info@cnvrg.io + objectStorage: + type: minio + bucket: cnvrg-storage + region: eastus + accessKey: '' + secretKey: '' + endpoint: '' + azureAccountName: '' + azureContainer: '' + gcpProject: '' + gcpSecretRef: gcp-storage-secret + mpi: + enabled: false + image: mpioperator/mpi-operator:v0.2.3 + kubectlDeliveryImage: mpioperator/kubectl-delivery:v0.2.3 + extraArgs: + registry: + name: mpi-private-registry + url: docker.io + user: '' + password: '' + requests: + cpu: 100m + memory: 100Mi + limits: + cpu: 1000m + memory: 1Gi + nomex: + enabled: true + image: nomex:v1.0.0 +registry: + name: cnvrg-app-registry + url: docker.io + user: '' + password: '' +dbs: + pg: + enabled: true + serviceAccount: pg + image: postgresql-12-centos7:latest + port: 5432 + storageSize: 80Gi + svcName: postgres + storageClass: '' + requests: + cpu: '1' + memory: 4Gi + limits: + cpu: '12' + memory: 32Gi + maxConnections: 500 + sharedBuffers: 1024MB + effectiveCacheSize: 2048MB + hugePages: + enabled: false + size: 2Mi + memory: '' + nodeSelector: + credsRef: pg-creds + pvcName: pg-storage + redis: + enabled: true + serviceAccount: redis + image: cnvrg-redis:v3.0.5.c2 + svcName: redis + port: 6379 + storageSize: 10Gi + storageClass: '' + requests: + cpu: 100m + memory: 200Mi + limits: + cpu: 1000m + memory: 2Gi + nodeSelector: + credsRef: redis-creds + pvcName: redis-storage + minio: + enabled: true + serviceAccount: minio + replicas: 1 + image: minio:RELEASE.2021-05-22T02-34-39Z + port: 9000 + storageSize: 100Gi + svcName: minio + nodePort: 30090 + storageClass: '' + requests: + cpu: 200m + memory: 2Gi + limits: + cpu: '8' + memory: 20Gi + nodeSelector: + pvcName: minio-storage + es: + enabled: true + serviceAccount: es + image: cnvrg-es:7.17.5 + port: 9200 + storageSize: 80Gi + svcName: elasticsearch + nodePort: 32200 + storageClass: '' + requests: + cpu: 500m + memory: 4Gi + limits: + cpu: '4' + memory: 8Gi + javaOpts: '' + patchEsNodes: true + nodeSelector: + credsRef: es-creds + pvcName: es-storage + cleanupPolicy: + all: 3d + app: 30d + jobs: 14d + endpoints: 1825d + kibana: + enabled: true + serviceAccount: kibana + svcName: kibana + port: 8080 + image: kibana-oss:7.8.1 + nodePort: 30601 + requests: + cpu: 100m + memory: 200Mi + limits: + cpu: 1000m + memory: 2Gi + credsRef: kibana-creds + elastalert: + enabled: true + image: elastalert:3.0.0-beta.1 + authProxyImage: nginx:1.20 + credsRef: elastalert-creds + port: 8080 + nodePort: 32030 + storageSize: 30Gi + svcName: elastalert + storageClass: '' + requests: + cpu: 100m + memory: 200Mi + limits: + cpu: 400m + memory: 800Mi + nodeSelector: + pvcName: elastalert-storage + prom: + enabled: true + credsRef: prom-creds + extraScrapeConfigs: + image: prometheus:v2.37.1 + storageClass: "" + storageSize: 50Gi + grafana: + enabled: true + image: grafana-oss:9.1.7 + svcName: grafana + port: 8080 + nodePort: 30012 + credsRef: grafana-creds +networking: + ingress: + type: istio + timeout: 18000s + retriesAttempts: 5 + perTryTimeout: 3600s + istioGwEnabled: true + istioGwName: '' + istioIngressSelectorKey: 'istio' + istioIngressSelectorValue: 'ingressgateway' + ocpSecureRoutes: false + https: + enabled: false + certSecret: '' + cert: '' + key: '' + proxy: + enabled: false + configRef: cp-proxy + httpProxy: [] + httpsProxy: [] + noProxy: [] +sso: + enabled: false + version: v3 + pki: + enabled: false + rootCaSecret: sso-idp-root-ca + privateKeySecret: sso-idp-private-key + publicKeySecret: sso-idp-pki-public-key + jwks: + enabled: false + name: cnvrg-jwks + image: jwks:latest + cacheImage: redis:7.0.5 + central: + enabled: false + publicUrl: '' + oauthProxyImage: oauth2-proxy:v7.4.ssov3.p6 + centralUiImage: centralsso:latest + adminUser: '' + provider: '' + emailDomain: + - "*" + clientId: '' + clientSecret: '' + oidcIssuerUrl: '' + serviceUrl: '' + scope: openid email profile + insecureOidcAllowUnverifiedEmail: true + whitelistDomain: '' + cookieDomain: '' + groupsAuth: false + readiness: true + requests: + cpu: 500m + memory: 1Gi + limits: + cpu: 2 + memory: 4Gi + proxy: + enabled: false + image: cnvrg-proxy:v1.0.15 + address: "" + readiness: true + requests: + cpu: 500m + memory: 1Gi + limits: + cpu: 2 + memory: 4Gi + +tenancy: + enabled: false + key: purpose + value: cnvrg-control-plane +priorityClass: + appClassRef: "" + jobClassRef: "" \ No newline at end of file diff --git a/cmd/operator/main.go b/cmd/operator/main.go index c9f4cf94..1eeeaab5 100644 --- a/cmd/operator/main.go +++ b/cmd/operator/main.go @@ -12,6 +12,7 @@ import ( clientgoscheme "k8s.io/client-go/kubernetes/scheme" "os" ctrl "sigs.k8s.io/controller-runtime" + "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/healthz" metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" "strings" @@ -110,8 +111,21 @@ func setParams(params []param, command *cobra.Command) { func runOperator() { ctrl.SetLogger(zapr.NewLogger(initZapLog())) + namespaces := []string{"cnvrg"} // List of Namespaces + defaultNamespaces := make(map[string]cache.Config) + + for _, ns := range namespaces { + defaultNamespaces[ns] = cache.Config{} + } + mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{ - Scheme: scheme, + Scheme: scheme, + Cache: cache.Options{ + DefaultNamespaces: defaultNamespaces, + //DefaultNamespaces: map[string]cache.Config{ + // "namespace": {}, + //}, + }, Metrics: metricsserver.Options{BindAddress: viper.GetString("metrics-addr")}, HealthProbeBindAddress: viper.GetString("health-probe-addr"), LeaderElection: viper.GetBool("enable-leader-election"), diff --git a/controllers/app/controller.go b/controllers/app/controller.go index c16b9d68..c822fa18 100644 --- a/controllers/app/controller.go +++ b/controllers/app/controller.go @@ -45,9 +45,8 @@ type CnvrgAppReconciler struct { Scheme *runtime.Scheme } -// +kubebuilder:rbac:groups=mlops.cnvrg.io,resources=cnvrgapps,verbs=get;list;watch;create;update;patch;delete -// +kubebuilder:rbac:groups=mlops.cnvrg.io,resources=cnvrgapps/status,verbs=get;update;patch -// +kubebuilder:rbac:groups=*,resources=*,verbs=* +// +kubebuilder:rbac:groups=mlops.cnvrg.io,namespace=cnvrg,resources=cnvrgapps,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=mlops.cnvrg.io,namespace=cnvrg,resources=cnvrgapps/status,verbs=get;update;patch func (r *CnvrgAppReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { @@ -438,6 +437,7 @@ func (r *CnvrgAppReconciler) SetupWithManager(mgr ctrl.Manager) error { app.Dbs.Redis.SvcName, app.Dbs.Es.SvcName, } + if gvk == desired.Kinds[desired.DeploymentGVK] || gvk == desired.Kinds[desired.StatefulSetGVK] || gvk == desired.Kinds[desired.JobGVK] { if controllers.ContainsString(healthCheckWorkloads, e.ObjectNew.GetName()) { return true diff --git a/hack/sa-token-secret.yaml b/hack/sa-token-secret.yaml new file mode 100644 index 00000000..6bb0d63b --- /dev/null +++ b/hack/sa-token-secret.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: Secret +type: kubernetes.io/service-account-token +metadata: + name: cnvrg-operator-secret-debug + namespace: cnvrg + annotations: + kubernetes.io/service-account.name: "cnvrg-operator" \ No newline at end of file diff --git a/pkg/app/controlplane/tmpl/nomex/role.tpl b/pkg/app/controlplane/tmpl/nomex/role.tpl index cf8185fd..510285e2 100644 --- a/pkg/app/controlplane/tmpl/nomex/role.tpl +++ b/pkg/app/controlplane/tmpl/nomex/role.tpl @@ -1,16 +1,9 @@ apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole +kind: Role metadata: - name: "cnvrg-nomex-{{ .Namespace }}" + name: "cnvrg-nomex" namespace: {{ .Namespace }} annotations: mlops.cnvrg.io/default-loader: "true" mlops.cnvrg.io/own: "false" mlops.cnvrg.io/updatable: "false" -rules: -- apiGroups: - - "" - resources: - - nodes - verbs: - - list diff --git a/pkg/app/controlplane/tmpl/nomex/rolebinding.tpl b/pkg/app/controlplane/tmpl/nomex/rolebinding.tpl index 79794425..f7a300b2 100644 --- a/pkg/app/controlplane/tmpl/nomex/rolebinding.tpl +++ b/pkg/app/controlplane/tmpl/nomex/rolebinding.tpl @@ -1,7 +1,7 @@ apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding +kind: RoleBinding metadata: - name: "cnvrg-nomex-{{ .Namespace }}" + name: "cnvrg-nomex" namespace: {{ .Namespace }} annotations: mlops.cnvrg.io/default-loader: "true" @@ -9,9 +9,8 @@ metadata: mlops.cnvrg.io/updatable: "false" roleRef: apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: "cnvrg-nomex-{{ .Namespace }}" + kind: Role + name: "cnvrg-nomex" subjects: - kind: ServiceAccount - name: cnvrg-nomex - namespace: {{ .Namespace }} \ No newline at end of file + name: cnvrg-nomex \ No newline at end of file diff --git a/pkg/app/sso/tmpl/jwks/clusterrole.tpl b/pkg/app/sso/tmpl/jwks/role.tpl similarity index 96% rename from pkg/app/sso/tmpl/jwks/clusterrole.tpl rename to pkg/app/sso/tmpl/jwks/role.tpl index 547ddeb8..e6cc2ea7 100644 --- a/pkg/app/sso/tmpl/jwks/clusterrole.tpl +++ b/pkg/app/sso/tmpl/jwks/role.tpl @@ -1,5 +1,5 @@ apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole +kind: Role metadata: name: {{ .Spec.SSO.Jwks.SvcName }} annotations: diff --git a/pkg/app/sso/tmpl/jwks/clusterrolebinding.tpl b/pkg/app/sso/tmpl/jwks/rolebinding.tpl similarity index 87% rename from pkg/app/sso/tmpl/jwks/clusterrolebinding.tpl rename to pkg/app/sso/tmpl/jwks/rolebinding.tpl index 7d65dc4d..dc4f1202 100644 --- a/pkg/app/sso/tmpl/jwks/clusterrolebinding.tpl +++ b/pkg/app/sso/tmpl/jwks/rolebinding.tpl @@ -1,5 +1,5 @@ apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding +kind: RoleBinding metadata: name: {{ .Spec.SSO.Jwks.SvcName }} annotations: @@ -15,9 +15,8 @@ metadata: {{- end }} roleRef: apiGroup: rbac.authorization.k8s.io - kind: ClusterRole + kind: Role name: {{ .Spec.SSO.Jwks.SvcName }} subjects: - kind: ServiceAccount name: {{ .Spec.SSO.Jwks.SvcName }} - namespace: {{.Namespace }} diff --git a/pkg/app/sso/tmpl/proxy/clusterrole.tpl b/pkg/app/sso/tmpl/proxy/role.tpl similarity index 97% rename from pkg/app/sso/tmpl/proxy/clusterrole.tpl rename to pkg/app/sso/tmpl/proxy/role.tpl index 986ea123..2ca39a9c 100644 --- a/pkg/app/sso/tmpl/proxy/clusterrole.tpl +++ b/pkg/app/sso/tmpl/proxy/role.tpl @@ -1,5 +1,5 @@ apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole +kind: Role metadata: name: {{.Spec.SSO.Proxy.SvcName}} annotations: diff --git a/pkg/app/sso/tmpl/proxy/clusterrolebinding.tpl b/pkg/app/sso/tmpl/proxy/rolebinding.tpl similarity index 87% rename from pkg/app/sso/tmpl/proxy/clusterrolebinding.tpl rename to pkg/app/sso/tmpl/proxy/rolebinding.tpl index a246bc80..c5f31859 100644 --- a/pkg/app/sso/tmpl/proxy/clusterrolebinding.tpl +++ b/pkg/app/sso/tmpl/proxy/rolebinding.tpl @@ -1,5 +1,5 @@ apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding +kind: RoleBinding metadata: name: {{.Spec.SSO.Proxy.SvcName}} annotations: @@ -15,9 +15,8 @@ metadata: {{- end }} roleRef: apiGroup: rbac.authorization.k8s.io - kind: ClusterRole + kind: Role name: {{.Spec.SSO.Proxy.SvcName}} subjects: - kind: ServiceAccount name: {{.Spec.SSO.Proxy.SvcName}} - namespace: {{.Namespace }} diff --git a/pkg/desired/kinds.go b/pkg/desired/kinds.go index 6dc53520..3dea7e79 100644 --- a/pkg/desired/kinds.go +++ b/pkg/desired/kinds.go @@ -22,14 +22,13 @@ const ( RoleGVK GVKName = "RoleGVK" RoleBindingGVK GVKName = "RoleBindingGVK" OcpRouteGVK GVKName = "OcpRouteGVK" - OcpIngressCfgGVK GVKName = "OcpIngressCfgGVK" - OcpSccGVK GVKName = "OcpSccGVK" IngressGVK GVKName = "IngressGVK" IstioVsGVK GVKName = "IstioVsGVK" IstioGVK GVKName = "IstioGVK" IstioDestinationRuleGVK GVKName = "IstioDestinationRule" IstioGwGVK GVKName = "IstioGwGVK" StorageClassGVK GVKName = "StorageClassGVK" + PodDisruptionBudgetGVK GVKName = "PodDisruptionBudget" HpaGVK GVKName = "HpaGVK" PriorityClassGVK GVKName = "PriorityClassGVK" JobGVK GVKName = "JobGvk" @@ -131,18 +130,6 @@ var Kinds = map[GVKName]schema.GroupVersionKind{ Version: "v1", }, - OcpIngressCfgGVK: schema.GroupVersionKind{ - Kind: "Ingress", - Group: "config.openshift.io", - Version: "v1", - }, - - OcpSccGVK: schema.GroupVersionKind{ - Kind: "SecurityContextConstraints", - Group: "security.openshift.io", - Version: "v1", - }, - RoleBindingGVK: schema.GroupVersionKind{ Group: "rbac.authorization.k8s.io", Version: "v1", @@ -178,9 +165,14 @@ var Kinds = map[GVKName]schema.GroupVersionKind{ Version: "v1", Kind: "Ingress", }, + PodDisruptionBudgetGVK: schema.GroupVersionKind{ + Group: "policy", + Version: "v1", + Kind: "PodDisruptionBudget", + }, HpaGVK: schema.GroupVersionKind{ Group: "autoscaling", - Version: "v1", + Version: "v2", Kind: "HorizontalPodAutoscaler", }, PriorityClassGVK: schema.GroupVersionKind{ diff --git a/pkg/desired/types.go b/pkg/desired/types.go deleted file mode 100644 index cca33d15..00000000 --- a/pkg/desired/types.go +++ /dev/null @@ -1,26 +0,0 @@ -package desired - -import ( - "embed" - "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "k8s.io/apimachinery/pkg/runtime/schema" - "text/template" -) - -type TemplateData struct { - Namespace string - Data map[string]interface{} -} - -type State struct { - TemplatePath string - Template *template.Template - ParsedTemplate string - Obj *unstructured.Unstructured - GVK schema.GroupVersionKind - Own bool - Override bool - Updatable bool - TemplateData interface{} - Fs *embed.FS -} From 711a1278086c65b1f2a8c8b6997b550a331b9c15 Mon Sep 17 00:00:00 2001 From: Dmitry Kartsev Date: Wed, 7 Feb 2024 19:59:25 +0200 Subject: [PATCH 04/10] wip --- cmd/operator/main.go | 19 +- controllers/app/controller.go | 76 +++----- controllers/app/utils.go | 11 +- go.mod | 4 +- go.sum | 6 + .../controlplane/tmpl/sidekiqs/searchkiq.tpl | 1 + .../controlplane/tmpl/sidekiqs/sidekiq.tpl | 1 + .../controlplane/tmpl/sidekiqs/systemkiq.tpl | 1 + pkg/app/controlplane/tmpl/webapp/dep.tpl | 1 + pkg/app/dbs/tmpl/es/elastic/sts.tpl | 1 + pkg/app/dbs/tmpl/minio/dep.tpl | 1 + pkg/app/dbs/tmpl/pg/dep.tpl | 1 + pkg/app/dbs/tmpl/redis/dep.tpl | 1 + pkg/desired/kinds.go | 169 +----------------- 14 files changed, 61 insertions(+), 232 deletions(-) diff --git a/cmd/operator/main.go b/cmd/operator/main.go index 1eeeaab5..5ea3efb3 100644 --- a/cmd/operator/main.go +++ b/cmd/operator/main.go @@ -8,6 +8,7 @@ import ( "github.com/spf13/viper" "go.uber.org/zap" "go.uber.org/zap/zapcore" + "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" "os" @@ -110,26 +111,20 @@ func setParams(params []param, command *cobra.Command) { func runOperator() { ctrl.SetLogger(zapr.NewLogger(initZapLog())) - - namespaces := []string{"cnvrg"} // List of Namespaces - defaultNamespaces := make(map[string]cache.Config) - - for _, ns := range namespaces { - defaultNamespaces[ns] = cache.Config{} + selector, err := labels.Parse("name=cnvrg") + if err != nil { + zap.S().Error(err) + return } + cacheCfg := cache.Config{LabelSelector: selector} mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{ Scheme: scheme, Cache: cache.Options{ - DefaultNamespaces: defaultNamespaces, - //DefaultNamespaces: map[string]cache.Config{ - // "namespace": {}, - //}, + DefaultNamespaces: map[string]cache.Config{"cnvrg": cacheCfg}, }, Metrics: metricsserver.Options{BindAddress: viper.GetString("metrics-addr")}, HealthProbeBindAddress: viper.GetString("health-probe-addr"), - LeaderElection: viper.GetBool("enable-leader-election"), - LeaderElectionID: "99748453.cnvrg.io", }) if err != nil { setupLog.Error(err, "unable to start manager") diff --git a/controllers/app/controller.go b/controllers/app/controller.go index c822fa18..a4c67a2e 100644 --- a/controllers/app/controller.go +++ b/controllers/app/controller.go @@ -11,7 +11,6 @@ import ( "github.com/AccessibleAI/cnvrg-operator/pkg/app/networking" "github.com/AccessibleAI/cnvrg-operator/pkg/app/registry" sso2 "github.com/AccessibleAI/cnvrg-operator/pkg/app/sso" - "github.com/AccessibleAI/cnvrg-operator/pkg/desired" "github.com/go-logr/logr" "github.com/spf13/viper" "gopkg.in/d4l3k/messagediff.v1" @@ -20,7 +19,6 @@ import ( v1core "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/record" @@ -32,10 +30,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/predicate" - "strings" "time" ) +const systemStatusHealthCheckLabelName = "cnvrg-system-status-check" const CnvrgappFinalizer = "cnvrgapp.mlops.cnvrg.io/finalizer" type CnvrgAppReconciler struct { @@ -389,11 +387,6 @@ func (r *CnvrgAppReconciler) cleanupDbInitCm(desiredSpec *mlopsv1.CnvrgApp) erro } func (r *CnvrgAppReconciler) SetupWithManager(mgr ctrl.Manager) error { - if viper.GetBool("create-crds") { - if err := controlplane.NewControlPlaneCrdsStateManager(r.Client, r.Scheme, r.Log).Apply(); err != nil { - return err - } - } appPredicate := predicate.Funcs{ @@ -421,28 +414,34 @@ func (r *CnvrgAppReconciler) SetupWithManager(mgr ctrl.Manager) error { }, } - appOwnsPredicate := predicate.Funcs{ + appOwnsPredicate := r.appOwnsPredicateFuncs() + + r.recorder = mgr.GetEventRecorderFor("cnvrgapp") + a := &v1apps.Deployment{} + a.GroupVersionKind() + cnvrgAppController := ctrl. + NewControllerManagedBy(mgr). + Owns(&v1apps.Deployment{}, builder.WithPredicates(appOwnsPredicate)). + Owns(&v1apps.StatefulSet{}, builder.WithPredicates(appOwnsPredicate)). + For(&mlopsv1.CnvrgApp{}, builder.WithPredicates(appPredicate)) + + r.Log.Info(fmt.Sprintf("max concurrent reconciles: %d", viper.GetInt("max-concurrent-reconciles"))) + + return cnvrgAppController. + WithOptions(controller.Options{MaxConcurrentReconciles: viper.GetInt("max-concurrent-reconciles")}). + Complete(r) +} + +func (r *CnvrgAppReconciler) appOwnsPredicateFuncs() predicate.Funcs { + + return predicate.Funcs{ UpdateFunc: func(e event.UpdateEvent) bool { - gvk := e.ObjectNew.GetObjectKind().GroupVersionKind() - app := mlopsv1.DefaultCnvrgAppSpec() - healthCheckWorkloads := []string{ - "ingresscheck", - "sidekiq", - "searchkiq", - "systemkiq", - app.ControlPlane.WebApp.SvcName, - app.Dbs.Pg.SvcName, - app.Dbs.Minio.SvcName, - app.Dbs.Redis.SvcName, - app.Dbs.Es.SvcName, - } - if gvk == desired.Kinds[desired.DeploymentGVK] || gvk == desired.Kinds[desired.StatefulSetGVK] || gvk == desired.Kinds[desired.JobGVK] { - if controllers.ContainsString(healthCheckWorkloads, e.ObjectNew.GetName()) { - return true - } + if controllers.ContainsString(labelsMapToList(e.ObjectNew.GetLabels()), systemStatusHealthCheckLabelName) { + return true } + r.Log.V(1).Info("received update event", "objectName", e.ObjectNew.GetName()) return false }, @@ -452,31 +451,6 @@ func (r *CnvrgAppReconciler) SetupWithManager(mgr ctrl.Manager) error { return true }, } - r.recorder = mgr.GetEventRecorderFor("cnvrgapp") - cnvrgAppController := ctrl. - NewControllerManagedBy(mgr). - For(&mlopsv1.CnvrgApp{}, builder.WithPredicates(appPredicate)) - - for _, v := range desired.Kinds { - - if strings.Contains(v.Group, "istio.io") { - continue - } - if strings.Contains(v.Group, "openshift.io") { - continue - } - if strings.Contains(v.Group, "coreos.com") { - continue - } - u := &unstructured.Unstructured{} - u.SetGroupVersionKind(v) - cnvrgAppController.Owns(u, builder.WithPredicates(appOwnsPredicate)) - } - - r.Log.Info(fmt.Sprintf("max concurrent reconciles: %d", viper.GetInt("max-concurrent-reconciles"))) - return cnvrgAppController. - WithOptions(controller.Options{MaxConcurrentReconciles: viper.GetInt("max-concurrent-reconciles")}). - Complete(r) } func (r *CnvrgAppReconciler) CheckJobReadiness(name types.NamespacedName) (bool, error) { diff --git a/controllers/app/utils.go b/controllers/app/utils.go index 925f0880..4e8def97 100644 --- a/controllers/app/utils.go +++ b/controllers/app/utils.go @@ -21,10 +21,6 @@ import ( var log logr.Logger -func discoverAICloudHost(clientset client.Client) { - -} - func discoverOcpDefaultRouteHost(clientset client.Client) (ocpDefaultRouteHost string, err error) { routeCfg := &unstructured.Unstructured{} routeCfg.SetGroupVersionKind(desired.Kinds["OcpIngressCfgGVK"]) @@ -168,3 +164,10 @@ func CalculateAndApplyAppDefaults(app *mlopsv1.CnvrgApp, defaultSpec *mlopsv1.Cn return nil } + +func labelsMapToList(labels map[string]string) (labelList []string) { + for labelName, _ := range labels { + labelList = append(labelList, labelName) + } + return labelList +} diff --git a/go.mod b/go.mod index 8cb7eaf0..71521c1f 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( k8s.io/api v0.29.0 k8s.io/apimachinery v0.29.0 k8s.io/client-go v0.29.0 - sigs.k8s.io/controller-runtime v0.16.3 + sigs.k8s.io/controller-runtime v0.17.0 ) require ( @@ -77,7 +77,7 @@ require ( github.com/docker/go-units v0.5.0 // indirect github.com/emicklei/go-restful/v3 v3.11.1 // indirect github.com/evanphx/json-patch v5.7.0+incompatible // indirect - github.com/evanphx/json-patch/v5 v5.7.0 // indirect + github.com/evanphx/json-patch/v5 v5.8.0 // indirect github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect github.com/fatih/color v1.16.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect diff --git a/go.sum b/go.sum index 632c1889..7f3d11ca 100644 --- a/go.sum +++ b/go.sum @@ -165,6 +165,8 @@ github.com/evanphx/json-patch v5.7.0+incompatible h1:vgGkfT/9f8zE6tvSCe74nfpAVDQ github.com/evanphx/json-patch v5.7.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch/v5 v5.7.0 h1:nJqP7uwL84RJInrohHfW0Fx3awjbm8qZeFv0nW9SYGc= github.com/evanphx/json-patch/v5 v5.7.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= +github.com/evanphx/json-patch/v5 v5.8.0 h1:lRj6N9Nci7MvzrXuX6HFzU8XjmhPiXPlsKEy1u0KQro= +github.com/evanphx/json-patch/v5 v5.8.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f h1:Wl78ApPPB2Wvf/TIe2xdyJxTlb6obmF18d8QdkxNDu4= github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f/go.mod h1:OSYXu++VVOHnXeitef/D8n/6y4QV8uLHSFXX4NeXMGc= github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= @@ -403,8 +405,10 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= +github.com/onsi/ginkgo/v2 v2.14.0 h1:vSmGj2Z5YPb9JwCWT6z6ihcUvDhuXLc3sJiqd3jMKAY= github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg= github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= +github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI= @@ -735,6 +739,8 @@ oras.land/oras-go v1.2.4 h1:djpBY2/2Cs1PV87GSJlxv4voajVOMZxqqtq9AB8YNvY= oras.land/oras-go v1.2.4/go.mod h1:DYcGfb3YF1nKjcezfX2SNlDAeQFKSXmf+qrFmrh4324= sigs.k8s.io/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4= sigs.k8s.io/controller-runtime v0.16.3/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0= +sigs.k8s.io/controller-runtime v0.17.0 h1:fjJQf8Ukya+VjogLO6/bNX9HE6Y2xpsO5+fyS26ur/s= +sigs.k8s.io/controller-runtime v0.17.0/go.mod h1:+MngTvIQQQhfXtwfdGw/UOQ/aIaqsYywfCINOtwMO/s= sigs.k8s.io/gateway-api v0.6.0 h1:v2FqrN2ROWZLrSnI2o91taHR8Sj3s+Eh3QU7gLNWIqA= sigs.k8s.io/gateway-api v0.6.0/go.mod h1:EYJT+jlPWTeNskjV0JTki/03WX1cyAnBhwBJfYHpV/0= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= diff --git a/pkg/app/controlplane/tmpl/sidekiqs/searchkiq.tpl b/pkg/app/controlplane/tmpl/sidekiqs/searchkiq.tpl index 53c8d4a6..a1af02f4 100644 --- a/pkg/app/controlplane/tmpl/sidekiqs/searchkiq.tpl +++ b/pkg/app/controlplane/tmpl/sidekiqs/searchkiq.tpl @@ -14,6 +14,7 @@ metadata: app: searchkiq owner: cnvrg-control-plane cnvrg-component: searchkiq + cnvrg-system-status-check: "true" {{- range $k, $v := .Spec.Labels }} {{$k}}: "{{$v}}" {{- end }} diff --git a/pkg/app/controlplane/tmpl/sidekiqs/sidekiq.tpl b/pkg/app/controlplane/tmpl/sidekiqs/sidekiq.tpl index 4e763ffb..9626c5a9 100644 --- a/pkg/app/controlplane/tmpl/sidekiqs/sidekiq.tpl +++ b/pkg/app/controlplane/tmpl/sidekiqs/sidekiq.tpl @@ -14,6 +14,7 @@ metadata: app: sidekiq owner: cnvrg-control-plane cnvrg-component: sidekiq + cnvrg-system-status-check: "true" {{- range $k, $v := .Spec.Labels }} {{$k}}: "{{$v}}" {{- end }} diff --git a/pkg/app/controlplane/tmpl/sidekiqs/systemkiq.tpl b/pkg/app/controlplane/tmpl/sidekiqs/systemkiq.tpl index ee03fa7d..f60956eb 100644 --- a/pkg/app/controlplane/tmpl/sidekiqs/systemkiq.tpl +++ b/pkg/app/controlplane/tmpl/sidekiqs/systemkiq.tpl @@ -14,6 +14,7 @@ metadata: app: systemkiq owner: cnvrg-control-plane cnvrg-component: systemkiq + cnvrg-system-status-check: "true" {{- range $k, $v := .Spec.Labels }} {{$k}}: "{{$v}}" {{- end }} diff --git a/pkg/app/controlplane/tmpl/webapp/dep.tpl b/pkg/app/controlplane/tmpl/webapp/dep.tpl index 53cf2e92..180652fe 100644 --- a/pkg/app/controlplane/tmpl/webapp/dep.tpl +++ b/pkg/app/controlplane/tmpl/webapp/dep.tpl @@ -14,6 +14,7 @@ metadata: app: {{ .Spec.ControlPlane.WebApp.SvcName }} owner: cnvrg-control-plane cnvrg-component: webapp + cnvrg-system-status-check: "true" {{- range $k, $v := .Spec.Labels }} {{$k}}: "{{$v}}" {{- end }} diff --git a/pkg/app/dbs/tmpl/es/elastic/sts.tpl b/pkg/app/dbs/tmpl/es/elastic/sts.tpl index d9371b2b..7bb5acb1 100644 --- a/pkg/app/dbs/tmpl/es/elastic/sts.tpl +++ b/pkg/app/dbs/tmpl/es/elastic/sts.tpl @@ -18,6 +18,7 @@ metadata: {{- end }} labels: app: {{ .Spec.Dbs.Es.SvcName }} + cnvrg-system-status-check: "true" {{- range $k, $v := .Spec.Labels }} {{$k}}: "{{$v}}" {{- end }} diff --git a/pkg/app/dbs/tmpl/minio/dep.tpl b/pkg/app/dbs/tmpl/minio/dep.tpl index 1bbd0979..50f7c574 100644 --- a/pkg/app/dbs/tmpl/minio/dep.tpl +++ b/pkg/app/dbs/tmpl/minio/dep.tpl @@ -13,6 +13,7 @@ metadata: labels: app: {{ .Spec.Dbs.Minio.SvcName }} cnvrg-component: minio + cnvrg-system-status-check: "true" {{- range $k, $v := .Spec.Labels }} {{$k}}: "{{$v}}" {{- end }} diff --git a/pkg/app/dbs/tmpl/pg/dep.tpl b/pkg/app/dbs/tmpl/pg/dep.tpl index d7291a1d..9dff8ee0 100644 --- a/pkg/app/dbs/tmpl/pg/dep.tpl +++ b/pkg/app/dbs/tmpl/pg/dep.tpl @@ -13,6 +13,7 @@ metadata: labels: app: {{.Spec.Dbs.Pg.SvcName }} cnvrg-component: pg + cnvrg-system-status-check: "true" {{- range $k, $v := .Spec.Labels }} {{$k}}: "{{$v}}" {{- end }} diff --git a/pkg/app/dbs/tmpl/redis/dep.tpl b/pkg/app/dbs/tmpl/redis/dep.tpl index 56c2db49..352dffb1 100644 --- a/pkg/app/dbs/tmpl/redis/dep.tpl +++ b/pkg/app/dbs/tmpl/redis/dep.tpl @@ -13,6 +13,7 @@ metadata: labels: app: {{.Spec.Dbs.Redis.SvcName }} cnvrg-component: redis + cnvrg-system-status-check: "true" {{- range $k, $v := .Spec.Labels }} {{$k}}: "{{$v}}" {{- end }} diff --git a/pkg/desired/kinds.go b/pkg/desired/kinds.go index 3dea7e79..744d5333 100644 --- a/pkg/desired/kinds.go +++ b/pkg/desired/kinds.go @@ -5,182 +5,25 @@ import "k8s.io/apimachinery/pkg/runtime/schema" type GVKName string const ( - DeploymentGVK GVKName = "DeploymentGVK" - StatefulSetGVK GVKName = "StatefulSetGVK" - DaemonSetGVK GVKName = "DaemonSetGVK" - ConfigMapGVK GVKName = "ConfigMapGVK" - PvcGVK GVKName = "PvcGVK" - SecretGVK GVKName = "SecretGVK" - SvcGVK GVKName = "SvcGVK" - SaGVK GVKName = "SaGVK" - CrdGVK GVKName = "CrdGVK" - PrometheusGVK GVKName = "PrometheusGVK" - ServiceMonitorGVK GVKName = "ServiceMonitorGVK" - PrometheusRuleGVK GVKName = "PrometheusRuleGVK" - ClusterRoleGVK GVKName = "ClusterRoleGVK" - ClusterRoleBindingGVK GVKName = "ClusterRoleBindingGVK" - RoleGVK GVKName = "RoleGVK" - RoleBindingGVK GVKName = "RoleBindingGVK" - OcpRouteGVK GVKName = "OcpRouteGVK" - IngressGVK GVKName = "IngressGVK" - IstioVsGVK GVKName = "IstioVsGVK" - IstioGVK GVKName = "IstioGVK" - IstioDestinationRuleGVK GVKName = "IstioDestinationRule" - IstioGwGVK GVKName = "IstioGwGVK" - StorageClassGVK GVKName = "StorageClassGVK" - PodDisruptionBudgetGVK GVKName = "PodDisruptionBudget" - HpaGVK GVKName = "HpaGVK" - PriorityClassGVK GVKName = "PriorityClassGVK" - JobGVK GVKName = "JobGvk" + DeploymentGVK GVKName = "DeploymentGVK" + StatefulSetGVK GVKName = "StatefulSetGVK" + JobGVK GVKName = "JobGvk" ) var Kinds = map[GVKName]schema.GroupVersionKind{ - DeploymentGVK: schema.GroupVersionKind{ + DeploymentGVK: { Kind: "Deployment", Group: "apps", Version: "v1", }, - StatefulSetGVK: schema.GroupVersionKind{ + StatefulSetGVK: { Kind: "StatefulSet", Group: "apps", Version: "v1", }, - DaemonSetGVK: schema.GroupVersionKind{ - Kind: "DaemonSet", - Group: "apps", - Version: "v1", - }, - - PvcGVK: schema.GroupVersionKind{ - Kind: "PersistentVolumeClaim", - Group: "", - Version: "v1", - }, - - SecretGVK: schema.GroupVersionKind{ - Kind: "Secret", - Group: "", - Version: "v1", - }, - - SvcGVK: schema.GroupVersionKind{ - Kind: "Service", - Group: "", - Version: "v1", - }, - - SaGVK: schema.GroupVersionKind{ - Kind: "ServiceAccount", - Group: "", - Version: "v1", - }, - - CrdGVK: schema.GroupVersionKind{ - Kind: "CustomResourceDefinition", - Group: "apiextensions.k8s.io", - Version: "v1", - }, - - IstioGVK: schema.GroupVersionKind{ - Kind: "IstioOperator", - Group: "install.istio.io", - Version: "v1alpha1", - }, - IstioVsGVK: schema.GroupVersionKind{ - Kind: "VirtualService", - Group: "networking.istio.io", - Version: "v1alpha3", - }, - - IstioDestinationRuleGVK: schema.GroupVersionKind{ - Kind: "DestinationRule", - Group: "networking.istio.io", - Version: "v1alpha3", - }, - - IstioGwGVK: schema.GroupVersionKind{ - Kind: "Gateway", - Group: "networking.istio.io", - Version: "v1alpha3", - }, - - ClusterRoleGVK: schema.GroupVersionKind{ - Kind: "ClusterRole", - Group: "rbac.authorization.k8s.io", - Version: "v1", - }, - - ClusterRoleBindingGVK: schema.GroupVersionKind{ - Kind: "ClusterRoleBinding", - Group: "rbac.authorization.k8s.io", - Version: "v1", - }, - - RoleGVK: schema.GroupVersionKind{ - Kind: "Role", - Group: "rbac.authorization.k8s.io", - Version: "v1", - }, - - OcpRouteGVK: schema.GroupVersionKind{ - Kind: "Route", - Group: "route.openshift.io", - Version: "v1", - }, - - RoleBindingGVK: schema.GroupVersionKind{ - Group: "rbac.authorization.k8s.io", - Version: "v1", - Kind: "RoleBinding", - }, - ConfigMapGVK: schema.GroupVersionKind{ - Group: "", - Version: "v1", - Kind: "ConfigMap", - }, - StorageClassGVK: schema.GroupVersionKind{ - Group: "storage.k8s.io", - Version: "v1", - Kind: "StorageClass", - }, - PrometheusGVK: schema.GroupVersionKind{ - Group: "monitoring.coreos.com", - Version: "v1", - Kind: "Prometheus", - }, - ServiceMonitorGVK: schema.GroupVersionKind{ - Group: "monitoring.coreos.com", - Version: "v1", - Kind: "ServiceMonitor", - }, - PrometheusRuleGVK: schema.GroupVersionKind{ - Group: "monitoring.coreos.com", - Version: "v1", - Kind: "PrometheusRule", - }, - IngressGVK: schema.GroupVersionKind{ - Group: "networking.k8s.io", - Version: "v1", - Kind: "Ingress", - }, - PodDisruptionBudgetGVK: schema.GroupVersionKind{ - Group: "policy", - Version: "v1", - Kind: "PodDisruptionBudget", - }, - HpaGVK: schema.GroupVersionKind{ - Group: "autoscaling", - Version: "v2", - Kind: "HorizontalPodAutoscaler", - }, - PriorityClassGVK: schema.GroupVersionKind{ - Group: "scheduling.k8s.io", - Version: "v1", - Kind: "PriorityClass", - }, - JobGVK: schema.GroupVersionKind{ + JobGVK: { Kind: "Job", Group: "batch", Version: "v1", From 6d97eca92af2ae8244ebfa527182ea9046926279 Mon Sep 17 00:00:00 2001 From: Dmitry Kartsev Date: Thu, 8 Feb 2024 12:04:33 +0200 Subject: [PATCH 05/10] fix scc --- .../templates/ocp-scc-jobs.yml | 23 ++++++++++++++ .../templates/ocp-scc-pg.yml | 31 +++++++++++++++++++ .../templates/ocp-scc-prom.yml | 31 +++++++++++++++++++ charts/cnvrg-non-privileged/values.yaml | 5 +-- cmd/operator/main.go | 15 ++++----- hack/run-as-kubeconfig.sh | 6 ++++ pkg/app/controlplane/controlplane.go | 22 +++++-------- .../tmpl/conf/rbac/ocp-scc-adopted.tpl | 31 +++++++++++++++++++ .../tmpl/conf/rbac/ocp-scc-jobs.tpl | 23 ++++++++++++++ .../controlplane/tmpl/conf/rbac/ocp-scc.tpl | 2 +- 10 files changed, 163 insertions(+), 26 deletions(-) create mode 100644 charts/cnvrg-non-privileged/templates/ocp-scc-jobs.yml create mode 100644 charts/cnvrg-non-privileged/templates/ocp-scc-pg.yml create mode 100644 charts/cnvrg-non-privileged/templates/ocp-scc-prom.yml create mode 100644 hack/run-as-kubeconfig.sh create mode 100644 pkg/app/controlplane/tmpl/conf/rbac/ocp-scc-adopted.tpl create mode 100644 pkg/app/controlplane/tmpl/conf/rbac/ocp-scc-jobs.tpl diff --git a/charts/cnvrg-non-privileged/templates/ocp-scc-jobs.yml b/charts/cnvrg-non-privileged/templates/ocp-scc-jobs.yml new file mode 100644 index 00000000..d9ef4525 --- /dev/null +++ b/charts/cnvrg-non-privileged/templates/ocp-scc-jobs.yml @@ -0,0 +1,23 @@ +kind: SecurityContextConstraints +apiVersion: security.openshift.io/v1 +metadata: + name: "cnvrg-jobs" +allowHostDirVolumePlugin: false +allowHostIPC: false +allowHostNetwork: false +allowHostPID: false +allowHostPorts: false +allowPrivilegeEscalation: true +allowPrivilegedContainer: false +allowedCapabilities: null +readOnlyRootFilesystem: false +runAsUser: + type: RunAsAny +seLinuxContext: + type: RunAsAny +fsGroup: + type: RunAsAny +supplementalGroups: + type: RunAsAny +users: +- "system:serviceaccount:cnvrg:cnvrg-job" diff --git a/charts/cnvrg-non-privileged/templates/ocp-scc-pg.yml b/charts/cnvrg-non-privileged/templates/ocp-scc-pg.yml new file mode 100644 index 00000000..550da3d9 --- /dev/null +++ b/charts/cnvrg-non-privileged/templates/ocp-scc-pg.yml @@ -0,0 +1,31 @@ +kind: SecurityContextConstraints +apiVersion: security.openshift.io/v1 +metadata: + name: "cnvrg-scc-control-plane" +allowHostDirVolumePlugin: false +allowHostIPC: false +allowHostNetwork: false +allowHostPID: false +allowHostPorts: false +allowPrivilegeEscalation: true +allowPrivilegedContainer: false +allowedCapabilities: null +readOnlyRootFilesystem: false +runAsUser: + type: MustRunAsRange + uidRangeMin: 26 + uidRangeMax: 1000 +seLinuxContext: + type: RunAsAny +fsGroup: + type: MustRunAs + ranges: + - min: 26 + max: 1000 +supplementalGroups: + type: MustRunAs + ranges: + - min: 26 + max: 1000 +groups: +- "system:serviceaccounts:cnvrg" diff --git a/charts/cnvrg-non-privileged/templates/ocp-scc-prom.yml b/charts/cnvrg-non-privileged/templates/ocp-scc-prom.yml new file mode 100644 index 00000000..550da3d9 --- /dev/null +++ b/charts/cnvrg-non-privileged/templates/ocp-scc-prom.yml @@ -0,0 +1,31 @@ +kind: SecurityContextConstraints +apiVersion: security.openshift.io/v1 +metadata: + name: "cnvrg-scc-control-plane" +allowHostDirVolumePlugin: false +allowHostIPC: false +allowHostNetwork: false +allowHostPID: false +allowHostPorts: false +allowPrivilegeEscalation: true +allowPrivilegedContainer: false +allowedCapabilities: null +readOnlyRootFilesystem: false +runAsUser: + type: MustRunAsRange + uidRangeMin: 26 + uidRangeMax: 1000 +seLinuxContext: + type: RunAsAny +fsGroup: + type: MustRunAs + ranges: + - min: 26 + max: 1000 +supplementalGroups: + type: MustRunAs + ranges: + - min: 26 + max: 1000 +groups: +- "system:serviceaccounts:cnvrg" diff --git a/charts/cnvrg-non-privileged/values.yaml b/charts/cnvrg-non-privileged/values.yaml index 8e1f22d9..acdbd3c0 100644 --- a/charts/cnvrg-non-privileged/values.yaml +++ b/charts/cnvrg-non-privileged/values.yaml @@ -102,6 +102,7 @@ controlPlane: CNVRG_ENABLE_MOUNT_FOLDERS: false CNVRG_MOUNT_HOST_FOLDERS: false CNVRG_PROMETHEUS_METRICS: true + OCP_ENABLED: true sentryUrl: '' runJobsOnSelfCluster: '' agentCustomTag: agnostic-logs @@ -155,7 +156,7 @@ controlPlane: cpu: 1000m memory: 1Gi nomex: - enabled: true + enabled: false image: nomex:v1.0.0 registry: name: cnvrg-app-registry @@ -238,7 +239,7 @@ dbs: cpu: '4' memory: 8Gi javaOpts: '' - patchEsNodes: true + patchEsNodes: false nodeSelector: credsRef: es-creds pvcName: es-storage diff --git a/cmd/operator/main.go b/cmd/operator/main.go index 5ea3efb3..ed0d980b 100644 --- a/cmd/operator/main.go +++ b/cmd/operator/main.go @@ -8,7 +8,6 @@ import ( "github.com/spf13/viper" "go.uber.org/zap" "go.uber.org/zap/zapcore" - "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" "os" @@ -111,19 +110,17 @@ func setParams(params []param, command *cobra.Command) { func runOperator() { ctrl.SetLogger(zapr.NewLogger(initZapLog())) - selector, err := labels.Parse("name=cnvrg") - if err != nil { - zap.S().Error(err) - return - } - cacheCfg := cache.Config{LabelSelector: selector} mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{ Scheme: scheme, Cache: cache.Options{ - DefaultNamespaces: map[string]cache.Config{"cnvrg": cacheCfg}, + DefaultNamespaces: map[string]cache.Config{ + "cnvrg": {}, + }, + }, + Metrics: metricsserver.Options{ + BindAddress: viper.GetString("metrics-addr"), }, - Metrics: metricsserver.Options{BindAddress: viper.GetString("metrics-addr")}, HealthProbeBindAddress: viper.GetString("health-probe-addr"), }) if err != nil { diff --git a/hack/run-as-kubeconfig.sh b/hack/run-as-kubeconfig.sh new file mode 100644 index 00000000..595aa874 --- /dev/null +++ b/hack/run-as-kubeconfig.sh @@ -0,0 +1,6 @@ +export SECRET_NAME_SA=cnvrg-operator +export TOKEN_SA=`kubectl get secret cnvrg-operator-secret-debug -n cnvrg -ojsonpath='{.data.token}' | base64 -d` +kubectl config view --raw --minify > kubeconfig.txt +kubectl config unset users --kubeconfig=kubeconfig.txt +kubectl config set-credentials ${SECRET_NAME_SA} --kubeconfig=kubeconfig.txt --token=${TOKEN_SA} +kubectl config set-context --current --kubeconfig=kubeconfig.txt --user=${SECRET_NAME_SA} \ No newline at end of file diff --git a/pkg/app/controlplane/controlplane.go b/pkg/app/controlplane/controlplane.go index 579b8d8a..defb3ada 100644 --- a/pkg/app/controlplane/controlplane.go +++ b/pkg/app/controlplane/controlplane.go @@ -24,12 +24,6 @@ type CpStateManager struct { app *mlopsv1.CnvrgApp } -func NewControlPlaneCrdsStateManager(c client.Client, s *runtime.Scheme, log logr.Logger) desired.StateManager { - l := log.WithValues("stateManager", "controlPlaneCrds") - asm := desired.NewAssetsStateManager(nil, c, s, l, fs, fsRoot+"/crds", nil) - return &CpCrdsStateManager{AssetsStateManager: asm} -} - func NewControlPlaneStateManager(app *mlopsv1.CnvrgApp, c client.Client, s *runtime.Scheme, log logr.Logger) desired.StateManager { l := log.WithValues("stateManager", "controlPlane") asm := desired.NewAssetsStateManager(app, c, s, l, fs, fsRoot, nil) @@ -72,14 +66,14 @@ func (m *CpStateManager) Load() error { } m.AddToAssets(rbac) - if m.app.Spec.Networking.Ingress.Type == mlopsv1.OpenShiftIngress { - assetName := []string{"ocp-scc.tpl"} - ocpScc := desired.NewAssetsGroup(fs, fsRoot+"/conf/rbac", m.Log(), &desired.LoadFilter{AssetName: assetName}) - if err := ocpScc.LoadAssets(); err != nil { - return err - } - m.AddToAssets(ocpScc) - } + //if m.app.Spec.Networking.Ingress.Type == mlopsv1.OpenShiftIngress { + // assetName := []string{"ocp-scc.tpl"} + // ocpScc := desired.NewAssetsGroup(fs, fsRoot+"/conf/rbac", m.Log(), &desired.LoadFilter{AssetName: assetName}) + // if err := ocpScc.LoadAssets(); err != nil { + // return err + // } + // m.AddToAssets(ocpScc) + //} if m.app.Spec.ControlPlane.CnvrgClusterProvisionerOperator.Enabled { ccp := desired.NewAssetsGroup(fs, fsRoot+"/ccp", m.Log(), f) diff --git a/pkg/app/controlplane/tmpl/conf/rbac/ocp-scc-adopted.tpl b/pkg/app/controlplane/tmpl/conf/rbac/ocp-scc-adopted.tpl new file mode 100644 index 00000000..550da3d9 --- /dev/null +++ b/pkg/app/controlplane/tmpl/conf/rbac/ocp-scc-adopted.tpl @@ -0,0 +1,31 @@ +kind: SecurityContextConstraints +apiVersion: security.openshift.io/v1 +metadata: + name: "cnvrg-scc-control-plane" +allowHostDirVolumePlugin: false +allowHostIPC: false +allowHostNetwork: false +allowHostPID: false +allowHostPorts: false +allowPrivilegeEscalation: true +allowPrivilegedContainer: false +allowedCapabilities: null +readOnlyRootFilesystem: false +runAsUser: + type: MustRunAsRange + uidRangeMin: 26 + uidRangeMax: 1000 +seLinuxContext: + type: RunAsAny +fsGroup: + type: MustRunAs + ranges: + - min: 26 + max: 1000 +supplementalGroups: + type: MustRunAs + ranges: + - min: 26 + max: 1000 +groups: +- "system:serviceaccounts:cnvrg" diff --git a/pkg/app/controlplane/tmpl/conf/rbac/ocp-scc-jobs.tpl b/pkg/app/controlplane/tmpl/conf/rbac/ocp-scc-jobs.tpl new file mode 100644 index 00000000..d9ef4525 --- /dev/null +++ b/pkg/app/controlplane/tmpl/conf/rbac/ocp-scc-jobs.tpl @@ -0,0 +1,23 @@ +kind: SecurityContextConstraints +apiVersion: security.openshift.io/v1 +metadata: + name: "cnvrg-jobs" +allowHostDirVolumePlugin: false +allowHostIPC: false +allowHostNetwork: false +allowHostPID: false +allowHostPorts: false +allowPrivilegeEscalation: true +allowPrivilegedContainer: false +allowedCapabilities: null +readOnlyRootFilesystem: false +runAsUser: + type: RunAsAny +seLinuxContext: + type: RunAsAny +fsGroup: + type: RunAsAny +supplementalGroups: + type: RunAsAny +users: +- "system:serviceaccount:cnvrg:cnvrg-job" diff --git a/pkg/app/controlplane/tmpl/conf/rbac/ocp-scc.tpl b/pkg/app/controlplane/tmpl/conf/rbac/ocp-scc.tpl index 64660244..0dbda9f5 100644 --- a/pkg/app/controlplane/tmpl/conf/rbac/ocp-scc.tpl +++ b/pkg/app/controlplane/tmpl/conf/rbac/ocp-scc.tpl @@ -12,7 +12,7 @@ allowHostNetwork: false allowHostPID: false allowHostPorts: false allowPrivilegeEscalation: true -allowPrivilegedContainer: true +allowPrivilegedContainer: false allowedCapabilities: null readOnlyRootFilesystem: false runAsUser: From 56cf541c4264ec738ec4084d7882cc43aae31bfa Mon Sep 17 00:00:00 2001 From: Dmitry Kartsev Date: Thu, 8 Feb 2024 15:17:36 +0200 Subject: [PATCH 06/10] update chart --- .../Chart.yaml | 2 +- .../crds/mlops.cnvrg.io_cnvrgapps.yaml | 0 .../templates/NOTES.txt | 0 .../templates/cap.yml | 2 +- charts/cnvrg-mlops/templates/hooks.yml | 32 +++++++ charts/cnvrg-mlops/templates/ocp-scc.yml | 89 +++++++++++++++++++ .../templates/operator.yml | 10 ++- .../values.yaml | 0 .../templates/ocp-scc-jobs.yml | 23 ----- .../templates/ocp-scc-pg.yml | 31 ------- .../templates/ocp-scc-prom.yml | 31 ------- pkg/app/controlplane/controlplane.go | 9 -- .../tmpl/conf/rbac/ocp-scc-adopted.tpl | 31 ------- .../tmpl/conf/rbac/ocp-scc-jobs.tpl | 23 ----- .../controlplane/tmpl/conf/rbac/ocp-scc.tpl | 27 ------ 15 files changed, 132 insertions(+), 178 deletions(-) rename charts/{cnvrg-non-privileged => cnvrg-mlops}/Chart.yaml (63%) rename charts/{cnvrg-non-privileged => cnvrg-mlops}/crds/mlops.cnvrg.io_cnvrgapps.yaml (100%) rename charts/{cnvrg-non-privileged => cnvrg-mlops}/templates/NOTES.txt (100%) rename charts/{cnvrg-non-privileged => cnvrg-mlops}/templates/cap.yml (99%) create mode 100644 charts/cnvrg-mlops/templates/hooks.yml create mode 100644 charts/cnvrg-mlops/templates/ocp-scc.yml rename charts/{cnvrg-non-privileged => cnvrg-mlops}/templates/operator.yml (85%) rename charts/{cnvrg-non-privileged => cnvrg-mlops}/values.yaml (100%) delete mode 100644 charts/cnvrg-non-privileged/templates/ocp-scc-jobs.yml delete mode 100644 charts/cnvrg-non-privileged/templates/ocp-scc-pg.yml delete mode 100644 charts/cnvrg-non-privileged/templates/ocp-scc-prom.yml delete mode 100644 pkg/app/controlplane/tmpl/conf/rbac/ocp-scc-adopted.tpl delete mode 100644 pkg/app/controlplane/tmpl/conf/rbac/ocp-scc-jobs.tpl delete mode 100644 pkg/app/controlplane/tmpl/conf/rbac/ocp-scc.tpl diff --git a/charts/cnvrg-non-privileged/Chart.yaml b/charts/cnvrg-mlops/Chart.yaml similarity index 63% rename from charts/cnvrg-non-privileged/Chart.yaml rename to charts/cnvrg-mlops/Chart.yaml index eba31390..b1a018dc 100644 --- a/charts/cnvrg-non-privileged/Chart.yaml +++ b/charts/cnvrg-mlops/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: cnvrg-operator -description: A cnvrg.io operator v3 chart for K8s +description: A cnvrg.io operator chart for K8s type: application version: 5.0.0 appVersion: 1.2.3 diff --git a/charts/cnvrg-non-privileged/crds/mlops.cnvrg.io_cnvrgapps.yaml b/charts/cnvrg-mlops/crds/mlops.cnvrg.io_cnvrgapps.yaml similarity index 100% rename from charts/cnvrg-non-privileged/crds/mlops.cnvrg.io_cnvrgapps.yaml rename to charts/cnvrg-mlops/crds/mlops.cnvrg.io_cnvrgapps.yaml diff --git a/charts/cnvrg-non-privileged/templates/NOTES.txt b/charts/cnvrg-mlops/templates/NOTES.txt similarity index 100% rename from charts/cnvrg-non-privileged/templates/NOTES.txt rename to charts/cnvrg-mlops/templates/NOTES.txt diff --git a/charts/cnvrg-non-privileged/templates/cap.yml b/charts/cnvrg-mlops/templates/cap.yml similarity index 99% rename from charts/cnvrg-non-privileged/templates/cap.yml rename to charts/cnvrg-mlops/templates/cap.yml index 8d39f7b2..97773bd6 100644 --- a/charts/cnvrg-non-privileged/templates/cap.yml +++ b/charts/cnvrg-mlops/templates/cap.yml @@ -1,7 +1,7 @@ apiVersion: mlops.cnvrg.io/v1 kind: CnvrgApp metadata: - name: cnvrg-app + name: {{ .Release.Name }} namespace: {{ .Release.Namespace}} spec: clusterDomain: {{.Values.clusterDomain}} diff --git a/charts/cnvrg-mlops/templates/hooks.yml b/charts/cnvrg-mlops/templates/hooks.yml new file mode 100644 index 00000000..4cc287be --- /dev/null +++ b/charts/cnvrg-mlops/templates/hooks.yml @@ -0,0 +1,32 @@ +####################################### Uninstall hooks ####################################### +apiVersion: batch/v1 +kind: Job +metadata: + name: pre-cnvrg-cleanup + namespace: {{ .Release.Namespace}} + annotations: + "helm.sh/hook": pre-delete + "helm.sh/hook-weight": "2" + "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded +spec: + template: + spec: + serviceAccountName: cnvrg-operator + imagePullSecrets: + - name: operator-pull-secret + containers: + - name: delete-cnvrgapp + image: "{{ .Values.imageHub }}/cnvrg-tools:v0.3" + args: + - /bin/bash + - -c + - | + set -x + echo "running cleanup" + kubectl delete cnvrgapp {{ .Release.Name }} -n {{ .Release.Namespace }} --ignore-not-found + while (( $(kubectl get cnvrgapp {{ .Release.Name }} -n {{ .Release.Namespace }} --ignore-not-found | grep {{ .Release.Name }} | wc -l ) != 0 )); do + echo "waiting for cnvrgapp will be deleted. . . "; + sleep 1 + done + restartPolicy: Never + backoffLimit: 4 diff --git a/charts/cnvrg-mlops/templates/ocp-scc.yml b/charts/cnvrg-mlops/templates/ocp-scc.yml new file mode 100644 index 00000000..65cea914 --- /dev/null +++ b/charts/cnvrg-mlops/templates/ocp-scc.yml @@ -0,0 +1,89 @@ +kind: SecurityContextConstraints +apiVersion: security.openshift.io/v1 +metadata: + name: "cnvrg-pg-scc" +allowHostDirVolumePlugin: false +allowHostIPC: false +allowHostNetwork: false +allowHostPID: false +allowHostPorts: false +allowPrivilegeEscalation: false +allowPrivilegedContainer: false +allowedCapabilities: null +readOnlyRootFilesystem: false +runAsUser: + type: MustRunAs + uid: 26 +seLinuxContext: + type: MustRunAs +fsGroup: + type: MustRunAs + ranges: + - min: 26 + max: 26 +supplementalGroups: + type: MustRunAs + ranges: + - min: 26 + max: 26 +users: +- "system:serviceaccount:{{.Release.Namespace}}:{{.Values.dbs.pg.serviceAccount}}" +--- +kind: SecurityContextConstraints +apiVersion: security.openshift.io/v1 +metadata: + name: "cnvrg-minio-redis-es-scc" +allowHostDirVolumePlugin: false +allowHostIPC: false +allowHostNetwork: false +allowHostPID: false +allowHostPorts: false +allowPrivilegeEscalation: false +allowPrivilegedContainer: false +allowedCapabilities: null +readOnlyRootFilesystem: false +runAsUser: + type: MustRunAs + uid: 1000 +seLinuxContext: + type: MustRunAs +fsGroup: + type: MustRunAs + ranges: + - min: 1000 + max: 1000 +supplementalGroups: + type: MustRunAs + ranges: + - min: 1000 + max: 1000 +users: + - "system:serviceaccount:{{.Release.Namespace}}:{{.Values.dbs.minio.serviceAccount}}" + - "system:serviceaccount:{{.Release.Namespace}}:{{.Values.dbs.redis.serviceAccount}}" + - "system:serviceaccount:{{.Release.Namespace}}:{{.Values.dbs.es.serviceAccount}}" + - "system:serviceaccount:{{.Release.Namespace}}:cnvrg-prom" +--- +kind: SecurityContextConstraints +apiVersion: security.openshift.io/v1 +metadata: + name: "cnvrg-jobs" +allowHostDirVolumePlugin: false +allowHostIPC: false +allowHostNetwork: false +allowHostPID: false +allowHostPorts: false +allowPrivilegeEscalation: true +allowPrivilegedContainer: false +allowedCapabilities: null +readOnlyRootFilesystem: false +runAsUser: + type: RunAsAny +seLinuxContext: + type: RunAsAny +fsGroup: + type: RunAsAny +supplementalGroups: + type: RunAsAny +users: + - "system:serviceaccount:cnvrg:cnvrg-job" + diff --git a/charts/cnvrg-non-privileged/templates/operator.yml b/charts/cnvrg-mlops/templates/operator.yml similarity index 85% rename from charts/cnvrg-non-privileged/templates/operator.yml rename to charts/cnvrg-mlops/templates/operator.yml index 74b0c2a7..2cfbf6f3 100644 --- a/charts/cnvrg-non-privileged/templates/operator.yml +++ b/charts/cnvrg-mlops/templates/operator.yml @@ -63,7 +63,7 @@ spec: - start - --max-concurrent-reconciles - "3" - image: "docker.io/cnvrg/cnvrg-operator:DEV-22107-no-cluster-roles" + image: "docker.io/cnvrg/cnvrg-operator:slim.non.priv" imagePullPolicy: Always name: cnvrg-operator resources: @@ -73,5 +73,13 @@ spec: requests: cpu: 500m memory: 200Mi + securityContext: + allowPrivilegeEscalation: false + runAsNonRoot: true + seccompProfile: + type: "RuntimeDefault" + capabilities: + drop: + - "ALL" serviceAccountName: cnvrg-operator terminationGracePeriodSeconds: 10 \ No newline at end of file diff --git a/charts/cnvrg-non-privileged/values.yaml b/charts/cnvrg-mlops/values.yaml similarity index 100% rename from charts/cnvrg-non-privileged/values.yaml rename to charts/cnvrg-mlops/values.yaml diff --git a/charts/cnvrg-non-privileged/templates/ocp-scc-jobs.yml b/charts/cnvrg-non-privileged/templates/ocp-scc-jobs.yml deleted file mode 100644 index d9ef4525..00000000 --- a/charts/cnvrg-non-privileged/templates/ocp-scc-jobs.yml +++ /dev/null @@ -1,23 +0,0 @@ -kind: SecurityContextConstraints -apiVersion: security.openshift.io/v1 -metadata: - name: "cnvrg-jobs" -allowHostDirVolumePlugin: false -allowHostIPC: false -allowHostNetwork: false -allowHostPID: false -allowHostPorts: false -allowPrivilegeEscalation: true -allowPrivilegedContainer: false -allowedCapabilities: null -readOnlyRootFilesystem: false -runAsUser: - type: RunAsAny -seLinuxContext: - type: RunAsAny -fsGroup: - type: RunAsAny -supplementalGroups: - type: RunAsAny -users: -- "system:serviceaccount:cnvrg:cnvrg-job" diff --git a/charts/cnvrg-non-privileged/templates/ocp-scc-pg.yml b/charts/cnvrg-non-privileged/templates/ocp-scc-pg.yml deleted file mode 100644 index 550da3d9..00000000 --- a/charts/cnvrg-non-privileged/templates/ocp-scc-pg.yml +++ /dev/null @@ -1,31 +0,0 @@ -kind: SecurityContextConstraints -apiVersion: security.openshift.io/v1 -metadata: - name: "cnvrg-scc-control-plane" -allowHostDirVolumePlugin: false -allowHostIPC: false -allowHostNetwork: false -allowHostPID: false -allowHostPorts: false -allowPrivilegeEscalation: true -allowPrivilegedContainer: false -allowedCapabilities: null -readOnlyRootFilesystem: false -runAsUser: - type: MustRunAsRange - uidRangeMin: 26 - uidRangeMax: 1000 -seLinuxContext: - type: RunAsAny -fsGroup: - type: MustRunAs - ranges: - - min: 26 - max: 1000 -supplementalGroups: - type: MustRunAs - ranges: - - min: 26 - max: 1000 -groups: -- "system:serviceaccounts:cnvrg" diff --git a/charts/cnvrg-non-privileged/templates/ocp-scc-prom.yml b/charts/cnvrg-non-privileged/templates/ocp-scc-prom.yml deleted file mode 100644 index 550da3d9..00000000 --- a/charts/cnvrg-non-privileged/templates/ocp-scc-prom.yml +++ /dev/null @@ -1,31 +0,0 @@ -kind: SecurityContextConstraints -apiVersion: security.openshift.io/v1 -metadata: - name: "cnvrg-scc-control-plane" -allowHostDirVolumePlugin: false -allowHostIPC: false -allowHostNetwork: false -allowHostPID: false -allowHostPorts: false -allowPrivilegeEscalation: true -allowPrivilegedContainer: false -allowedCapabilities: null -readOnlyRootFilesystem: false -runAsUser: - type: MustRunAsRange - uidRangeMin: 26 - uidRangeMax: 1000 -seLinuxContext: - type: RunAsAny -fsGroup: - type: MustRunAs - ranges: - - min: 26 - max: 1000 -supplementalGroups: - type: MustRunAs - ranges: - - min: 26 - max: 1000 -groups: -- "system:serviceaccounts:cnvrg" diff --git a/pkg/app/controlplane/controlplane.go b/pkg/app/controlplane/controlplane.go index defb3ada..3345d410 100644 --- a/pkg/app/controlplane/controlplane.go +++ b/pkg/app/controlplane/controlplane.go @@ -66,15 +66,6 @@ func (m *CpStateManager) Load() error { } m.AddToAssets(rbac) - //if m.app.Spec.Networking.Ingress.Type == mlopsv1.OpenShiftIngress { - // assetName := []string{"ocp-scc.tpl"} - // ocpScc := desired.NewAssetsGroup(fs, fsRoot+"/conf/rbac", m.Log(), &desired.LoadFilter{AssetName: assetName}) - // if err := ocpScc.LoadAssets(); err != nil { - // return err - // } - // m.AddToAssets(ocpScc) - //} - if m.app.Spec.ControlPlane.CnvrgClusterProvisionerOperator.Enabled { ccp := desired.NewAssetsGroup(fs, fsRoot+"/ccp", m.Log(), f) if err := ccp.LoadAssets(); err != nil { diff --git a/pkg/app/controlplane/tmpl/conf/rbac/ocp-scc-adopted.tpl b/pkg/app/controlplane/tmpl/conf/rbac/ocp-scc-adopted.tpl deleted file mode 100644 index 550da3d9..00000000 --- a/pkg/app/controlplane/tmpl/conf/rbac/ocp-scc-adopted.tpl +++ /dev/null @@ -1,31 +0,0 @@ -kind: SecurityContextConstraints -apiVersion: security.openshift.io/v1 -metadata: - name: "cnvrg-scc-control-plane" -allowHostDirVolumePlugin: false -allowHostIPC: false -allowHostNetwork: false -allowHostPID: false -allowHostPorts: false -allowPrivilegeEscalation: true -allowPrivilegedContainer: false -allowedCapabilities: null -readOnlyRootFilesystem: false -runAsUser: - type: MustRunAsRange - uidRangeMin: 26 - uidRangeMax: 1000 -seLinuxContext: - type: RunAsAny -fsGroup: - type: MustRunAs - ranges: - - min: 26 - max: 1000 -supplementalGroups: - type: MustRunAs - ranges: - - min: 26 - max: 1000 -groups: -- "system:serviceaccounts:cnvrg" diff --git a/pkg/app/controlplane/tmpl/conf/rbac/ocp-scc-jobs.tpl b/pkg/app/controlplane/tmpl/conf/rbac/ocp-scc-jobs.tpl deleted file mode 100644 index d9ef4525..00000000 --- a/pkg/app/controlplane/tmpl/conf/rbac/ocp-scc-jobs.tpl +++ /dev/null @@ -1,23 +0,0 @@ -kind: SecurityContextConstraints -apiVersion: security.openshift.io/v1 -metadata: - name: "cnvrg-jobs" -allowHostDirVolumePlugin: false -allowHostIPC: false -allowHostNetwork: false -allowHostPID: false -allowHostPorts: false -allowPrivilegeEscalation: true -allowPrivilegedContainer: false -allowedCapabilities: null -readOnlyRootFilesystem: false -runAsUser: - type: RunAsAny -seLinuxContext: - type: RunAsAny -fsGroup: - type: RunAsAny -supplementalGroups: - type: RunAsAny -users: -- "system:serviceaccount:cnvrg:cnvrg-job" diff --git a/pkg/app/controlplane/tmpl/conf/rbac/ocp-scc.tpl b/pkg/app/controlplane/tmpl/conf/rbac/ocp-scc.tpl deleted file mode 100644 index 0dbda9f5..00000000 --- a/pkg/app/controlplane/tmpl/conf/rbac/ocp-scc.tpl +++ /dev/null @@ -1,27 +0,0 @@ -kind: SecurityContextConstraints -apiVersion: security.openshift.io/v1 -metadata: - name: "cnvrg-scc-control-plane-{{ .Namespace }}" - annotations: - mlops.cnvrg.io/default-loader: "false" - mlops.cnvrg.io/own: "false" - mlops.cnvrg.io/updatable: "false" -allowHostDirVolumePlugin: false -allowHostIPC: false -allowHostNetwork: false -allowHostPID: false -allowHostPorts: false -allowPrivilegeEscalation: true -allowPrivilegedContainer: false -allowedCapabilities: null -readOnlyRootFilesystem: false -runAsUser: - type: RunAsAny -seLinuxContext: - type: RunAsAny -fsGroup: - type: RunAsAny -supplementalGroups: - type: RunAsAny -groups: -- "system:serviceaccounts:{{ .Namespace }}" From 90d1ec59d00019ead46149c62a1af2c8232ca342 Mon Sep 17 00:00:00 2001 From: Dmitry Kartsev Date: Thu, 8 Feb 2024 16:30:34 +0200 Subject: [PATCH 07/10] add namespase param to startup command --- charts/cnvrg-mlops/Chart.yaml | 2 +- charts/cnvrg-mlops/templates/operator.yml | 2 + cmd/operator/main.go | 75 +++--- controllers/app/controller.go | 32 --- pkg/dumper/cp.go | 275 ---------------------- pkg/dumper/dumper.go | 6 - pkg/dumper/networking.go | 56 ----- 7 files changed, 30 insertions(+), 418 deletions(-) delete mode 100644 pkg/dumper/cp.go delete mode 100644 pkg/dumper/dumper.go delete mode 100644 pkg/dumper/networking.go diff --git a/charts/cnvrg-mlops/Chart.yaml b/charts/cnvrg-mlops/Chart.yaml index b1a018dc..d6f0f9cc 100644 --- a/charts/cnvrg-mlops/Chart.yaml +++ b/charts/cnvrg-mlops/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: cnvrg-operator +name: cnvrg-mlops-platform description: A cnvrg.io operator chart for K8s type: application version: 5.0.0 diff --git a/charts/cnvrg-mlops/templates/operator.yml b/charts/cnvrg-mlops/templates/operator.yml index 2cfbf6f3..af8c61b9 100644 --- a/charts/cnvrg-mlops/templates/operator.yml +++ b/charts/cnvrg-mlops/templates/operator.yml @@ -63,6 +63,8 @@ spec: - start - --max-concurrent-reconciles - "3" + - --namespace + - {{.Release.Namespace}} image: "docker.io/cnvrg/cnvrg-operator:slim.non.priv" imagePullPolicy: Always name: cnvrg-operator diff --git a/cmd/operator/main.go b/cmd/operator/main.go index ed0d980b..6a4713a3 100644 --- a/cmd/operator/main.go +++ b/cmd/operator/main.go @@ -20,39 +20,37 @@ import ( mlopsv1 "github.com/AccessibleAI/cnvrg-operator/api/v1" ) -type param struct { - name string - shorthand string - value interface{} - usage string - required bool -} - var ( BuildVersion string -) - -var ( - scheme = runtime.NewScheme() - setupLog = ctrl.Log.WithName("setup") - rootParams = []param{} - runOperatorParams = []param{ - {name: "metrics-addr", shorthand: "", value: ":8080", usage: "The address the metric endpoint binds to."}, - {name: "health-probe-addr", shorthand: "", value: ":8081", usage: "The address the health probes endpoints (/healthz, /readyz) binds to."}, - {name: "enable-leader-election", shorthand: "", value: false, usage: "Enable leader election for controller manager. Enabling this will ensure there is only one active controller manager."}, - {name: "dry-run", shorthand: "", value: false, usage: "Only parse templates, without applying"}, - {name: "templates-dump-dir", shorthand: "", value: "", usage: "destination dir for rendering templates for debugging"}, - {name: "verbose", shorthand: "v", value: false, usage: "Verbose output"}, - {name: "max-concurrent-reconciles", shorthand: "", value: 1, usage: "Max concurrent reconciles"}, - {name: "cleanup-pvc", shorthand: "", value: false, usage: "set to true to delete PVCs on CR delete"}, - {name: "create-crds", shorthand: "", value: false, usage: "automatically apply Operator CRDs on each start"}, - } + scheme = runtime.NewScheme() + setupLog = ctrl.Log.WithName("setup") ) func init() { _ = clientgoscheme.AddToScheme(scheme) _ = mlopsv1.AddToScheme(scheme) - // +kubebuilder:scaffold:scheme + + startOperatorCmd.PersistentFlags().StringP( + "metrics-addr", "", ":8080", "The address the metric endpoint binds to.") + startOperatorCmd.PersistentFlags().StringP( + "health-probe-addr", "", ":8081", + "The address the health probes endpoints (/healthz, /readyz) binds to.") + startOperatorCmd.PersistentFlags().BoolP( + "enable-leader-election", "", false, + "Enable leader election for controller manager. "+ + "Enabling this will ensure there is only one active controller manager.") + startOperatorCmd.PersistentFlags().BoolP("verbose", "v", false, "Verbose output") + startOperatorCmd.PersistentFlags().IntP( + "max-concurrent-reconciles", "", 1, "Max concurrent reconciles") + startOperatorCmd.PersistentFlags().StringP( + "namespace", "", "cnvrg", "the ns into which the operator has been deployed") + + viper.BindPFlag("metrics-addr", startOperatorCmd.PersistentFlags().Lookup("metrics-addr")) + viper.BindPFlag("health-probe-addr", startOperatorCmd.PersistentFlags().Lookup("health-probe-addr")) + viper.BindPFlag("enable-leader-election", startOperatorCmd.PersistentFlags().Lookup("enable-leader-election")) + viper.BindPFlag("verbose", startOperatorCmd.PersistentFlags().Lookup("verbose")) + viper.BindPFlag("max-concurrent-reconciles", startOperatorCmd.PersistentFlags().Lookup("max-concurrent-reconciles")) + viper.BindPFlag("namespace", startOperatorCmd.PersistentFlags().Lookup("namespace")) } // Root cmd and params @@ -61,7 +59,7 @@ var rootCmd = &cobra.Command{ Short: "cnvrg-operator - K8s operator for deploying cnvrg stack", } -var runOperatorCmd = &cobra.Command{ +var startOperatorCmd = &cobra.Command{ Use: "start", Short: "Start cnvrg operator", Run: func(cmd *cobra.Command, args []string) { @@ -92,22 +90,6 @@ func initZapLog() *zap.Logger { return logger } -func setParams(params []param, command *cobra.Command) { - for _, param := range params { - switch v := param.value.(type) { - case int: - command.PersistentFlags().IntP(param.name, param.shorthand, v, param.usage) - case string: - command.PersistentFlags().StringP(param.name, param.shorthand, v, param.usage) - case bool: - command.PersistentFlags().BoolP(param.name, param.shorthand, v, param.usage) - } - if err := viper.BindPFlag(param.name, command.PersistentFlags().Lookup(param.name)); err != nil { - panic(err) - } - } -} - func runOperator() { ctrl.SetLogger(zapr.NewLogger(initZapLog())) @@ -115,7 +97,7 @@ func runOperator() { Scheme: scheme, Cache: cache.Options{ DefaultNamespaces: map[string]cache.Config{ - "cnvrg": {}, + viper.GetString("namespace"): {}, }, }, Metrics: metricsserver.Options{ @@ -159,11 +141,8 @@ func setupCommands() { viper.AutomaticEnv() viper.SetEnvPrefix("CNVRG_OPERATOR") viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_")) - // Setup commands - setParams(runOperatorParams, runOperatorCmd) - setParams(rootParams, rootCmd) rootCmd.AddCommand(operatorVersion) - rootCmd.AddCommand(runOperatorCmd) + rootCmd.AddCommand(startOperatorCmd) } func main() { diff --git a/controllers/app/controller.go b/controllers/app/controller.go index a4c67a2e..e02e8b8e 100644 --- a/controllers/app/controller.go +++ b/controllers/app/controller.go @@ -337,38 +337,6 @@ func (r *CnvrgAppReconciler) cleanup(cnvrgApp *mlopsv1.CnvrgApp) error { return err } - // cleanup pvc - if err := r.cleanupPVCs(); err != nil { - return err - } - - return nil -} - -func (r *CnvrgAppReconciler) cleanupPVCs() error { - if !viper.GetBool("cleanup-pvc") { - r.Log.Info("cleanup-pvc is false, skipping pvc deletion!") - return nil - } - r.Log.Info("running pvc cleanup") - ctx := context.Background() - pvcList := v1core.PersistentVolumeClaimList{} - if err := r.List(ctx, &pvcList); err != nil { - r.Log.Error(err, "failed cleanup pvcs") - return err - } - for _, pvc := range pvcList.Items { - if _, ok := pvc.ObjectMeta.Labels["app"]; ok { - if pvc.ObjectMeta.Labels["app"] == "prometheus" || pvc.ObjectMeta.Labels["app"] == "elasticsearch" { - if err := r.Delete(ctx, &pvc); err != nil && errors.IsNotFound(err) { - r.Log.Info("pvc already deleted") - } else if err != nil { - r.Log.Error(err, "error deleting prometheus pvc") - return err - } - } - } - } return nil } diff --git a/pkg/dumper/cp.go b/pkg/dumper/cp.go deleted file mode 100644 index 0a4caaa3..00000000 --- a/pkg/dumper/cp.go +++ /dev/null @@ -1,275 +0,0 @@ -package dumper - -// -//import ( -// "fmt" -// mlopsv1 "github.com/AccessibleAI/cnvrg-operator/api/v1" -// "github.com/AccessibleAI/cnvrg-operator/controllers" -// "github.com/AccessibleAI/cnvrg-operator/pkg/controlplane" -// "github.com/AccessibleAI/cnvrg-operator/pkg/dbs" -// "github.com/AccessibleAI/cnvrg-operator/pkg/desired" -// "github.com/AccessibleAI/cnvrg-operator/pkg/monitoring" -// "github.com/AccessibleAI/cnvrg-operator/pkg/networking" -// "github.com/AccessibleAI/cnvrg-operator/pkg/priorityclass" -// "github.com/AccessibleAI/cnvrg-operator/pkg/registry" -// "github.com/Dimss/crypt/apr1_crypt" -// log "github.com/sirupsen/logrus" -// "github.com/spf13/viper" -// v1 "k8s.io/apimachinery/pkg/apis/meta/v1" -// "os" -//) -// -//type ControlPlane struct { -// image string -// wildcardDomain string -// cri string -// registryUser string -// registryPass string -// ingress string -// app *mlopsv1.CnvrgApp -// state []*desired.State -// https bool -// proxy bool -//} -// -//func NewControlPlane(image, domain, cri, regUser, regPass, ingress, ns string, https, proxy bool) *ControlPlane { -// -// app := &mlopsv1.CnvrgApp{ -// ObjectMeta: v1.ObjectMeta{ -// Name: "cnvrg-app", -// Namespace: ns, -// }, -// Spec: mlopsv1.DefaultCnvrgAppSpec(), -// } -// infra := &mlopsv1.CnvrgInfra{ -// ObjectMeta: v1.ObjectMeta{ -// Name: "cnvrg-infra", -// Namespace: ns, -// }, -// Spec: mlopsv1.DefaultCnvrgInfraSpec(), -// } -// if err := controllers.CalculateAndApplyAppDefaults(app, &app.Spec, infra, nil); err != nil { -// log.Fatal(err) -// } -// -// return &ControlPlane{ -// image: image, -// wildcardDomain: domain, -// cri: cri, -// registryUser: regUser, -// registryPass: regPass, -// ingress: ingress, -// https: https, -// app: app, -// proxy: proxy, -// } -//} -// -//func (p *ControlPlane) BuildState() error { -// var err error -// err = p.setControlPlaneState() -// err = p.setDbsState() -// p.setPriorityClassState() -// p.setProxy() -// -// p.state = controlplane.State(p.app) -// p.state = append(p.state, dbs.RedisCreds(p.getRedisSecretData())...) -// p.state = append(p.state, dbs.PgCreds(p.getPgSecretData())...) -// p.state = append(p.state, dbs.EsCreds(p.getEsSecretData())...) -// p.state = append(p.state, dbs.AppDbsState(p.app)...) -// p.state = append(p.state, networking.CnvrgAppNetworkingState(p.app)...) -// p.state = append(p.state, monitoring.PromCreds(p.getPromSecretData())...) -// p.state = append(p.state, registry.State(p.getRegistryData())...) -// p.state = append(p.state, priorityclass.State()...) -// -// if err != nil { -// return err -// } -// return nil -//} -// -//func (p *ControlPlane) Dump(preserveTmplDirs bool) error { -// -// if err := os.RemoveAll(viper.GetString("templates-dump-dir")); err != nil { -// log.Fatal(err) -// } -// for _, o := range p.state { -// -// if o.TemplateData == nil { -// o.TemplateData = p.app -// } -// if err := o.GenerateDeployable(); err != nil { -// log.Fatal(err) -// } -// if err := o.DumpTemplateToFile(preserveTmplDirs); err != nil { -// log.Fatal(err) -// } -// } -// -// return nil -//} -// -//func (p *ControlPlane) setControlPlaneState() error { -// -// p.app.Spec.Annotations = make(map[string]string) -// p.app.Spec.Annotations["purpose"] = "cnvrg" -// p.app.Spec.ControlPlane.WebApp.Enabled = true -// -// p.app.Spec.ControlPlane.BaseConfig.FeatureFlags = make(map[string]string) -// p.app.Spec.ControlPlane.BaseConfig.FeatureFlags["CNVRG_MOUNT_HOST_FOLDERS"] = "false" -// -// p.app.Spec.ControlPlane.Image = viper.GetString("control-plane-image") -// p.app.Spec.ControlPlane.Image = p.image -// p.app.Spec.Cri = mlopsv1.CriType(p.cri) -// -// p.app.Spec.Networking.Ingress.Type = mlopsv1.IngressType(p.ingress) -// p.app.Spec.Networking.HTTPS.Enabled = p.https -// if p.app.Spec.Networking.Ingress.Type == mlopsv1.IstioIngress { -// p.app.Spec.Networking.Ingress.IstioGwEnabled = true -// } -// p.app.Spec.ClusterDomain = p.wildcardDomain -// -// p.app.Spec.ControlPlane.Sidekiq.Enabled = true -// p.app.Spec.ControlPlane.Sidekiq.Split = true -// p.app.Spec.ControlPlane.Hyper.Enabled = true -// p.app.Spec.ControlPlane.CnvrgScheduler.Enabled = false -// p.app.Spec.ControlPlane.Searchkiq.Enabled = true -// p.app.Spec.ControlPlane.Systemkiq.Enabled = true -// -// p.app.Spec.ControlPlane.ObjectStorage.Type = "minio" -// p.app.Spec.ControlPlane.ObjectStorage.AzureContainer = "azure" -// p.app.Spec.ControlPlane.ObjectStorage.AzureAccountName = "azure" -// p.app.Spec.ControlPlane.ObjectStorage.AzureContainer = "azure" -// p.app.Spec.ControlPlane.ObjectStorage.AccessKey = "AKIAIOSFODNN7EXAMPLE" -// p.app.Spec.ControlPlane.ObjectStorage.SecretKey = "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY" -// -// p.app.Spec.ControlPlane.ObjectStorage.GcpProject = "gcp-project" -// -// p.app.Spec.ControlPlane.SMTP.Port = 25 -// p.app.Spec.ControlPlane.SMTP.Server = "smtp" -// p.app.Spec.ControlPlane.SMTP.Username = "username" -// p.app.Spec.ControlPlane.SMTP.Password = "password" -// p.app.Spec.ControlPlane.SMTP.Domain = "domain" -// p.app.Spec.ControlPlane.SMTP.OpensslVerifyMode = "false" -// -// p.app.Spec.ControlPlane.Ldap.Host = "host" -// p.app.Spec.ControlPlane.Ldap.Port = "port" -// p.app.Spec.ControlPlane.Ldap.Ssl = "false" -// p.app.Spec.ControlPlane.Ldap.Base = "base" -// p.app.Spec.ControlPlane.Ldap.AdminUser = "admin" -// p.app.Spec.ControlPlane.Ldap.AdminPassword = "pass" -// -// p.app.Spec.ControlPlane.BaseConfig.SentryURL = "sentry-url" -// -// p.app.Spec.Dbs.Es.Enabled = true -// p.app.Spec.Dbs.Pg.Enabled = true -// p.app.Spec.Dbs.Minio.Enabled = true -// p.app.Spec.Dbs.Redis.Enabled = true -// p.app.Spec.CnvrgAppPriorityClass = mlopsv1.PriorityClass{Name: "cnvrg-apps", Value: 2000000, Description: "cnvrg control plane apps priority class"} -// p.app.Spec.CnvrgJobPriorityClass = mlopsv1.PriorityClass{Name: "cnvrg-jobs", Value: 1000000, Description: "cnvrg jobs priority class"} -// -// return nil -//} -// -//func (p *ControlPlane) setDbsState() error { -// p.app.Spec.Dbs.Es.Enabled = true -// p.app.Spec.Dbs.Pg.Enabled = true -// p.app.Spec.Dbs.Minio.Enabled = true -// p.app.Spec.Dbs.Redis.Enabled = true -// return nil -//} -// -//func (p *ControlPlane) setPriorityClassState() { -// p.app.Spec.CnvrgAppPriorityClass = mlopsv1.PriorityClass{Name: "cnvrg-apps", Value: 2000000, Description: "cnvrg control plane apps priority class"} -// p.app.Spec.CnvrgJobPriorityClass = mlopsv1.PriorityClass{Name: "cnvrg-jobs", Value: 1000000, Description: "cnvrg jobs priority class"} -//} -// -//func (p *ControlPlane) getRedisSecretData() desired.TemplateData { -// return desired.TemplateData{ -// Data: map[string]interface{}{ -// "Namespace": p.app.Namespace, -// "Annotations": p.app.Spec.Annotations, -// "Labels": p.app.Spec.Labels, -// "CredsRef": p.app.Spec.Dbs.Redis.CredsRef, -// "SvcName": p.app.Spec.Dbs.Redis.SvcName, -// }, -// } -//} -// -//func (p *ControlPlane) getPgSecretData() desired.TemplateData { -// return desired.TemplateData{ -// Data: map[string]interface{}{ -// "Namespace": p.app.Namespace, -// "CredsRef": p.app.Spec.Dbs.Pg.CredsRef, -// "Annotations": p.app.Spec.Annotations, -// "Labels": p.app.Spec.Labels, -// "MaxConnections": p.app.Spec.Dbs.Pg.MaxConnections, -// "SharedBuffers": p.app.Spec.Dbs.Pg.SharedBuffers, -// "EffectiveCacheSize": p.app.Spec.Dbs.Pg.EffectiveCacheSize, -// "SvcName": p.app.Spec.Dbs.Pg.SvcName, -// }, -// } -//} -// -//func (p *ControlPlane) getPromSecretData() desired.TemplateData { -// user := "cnvrg" -// pass := desired.RandomString() -// passHash, err := apr1_crypt.New().Generate([]byte(pass), nil) -// if err != nil { -// log.Fatal(err) -// } -// -// return desired.TemplateData{ -// Data: map[string]interface{}{ -// "Namespace": p.app.Namespace, -// "Annotations": p.app.Spec.Annotations, -// "Labels": p.app.Spec.Labels, -// "CredsRef": p.app.Spec.Monitoring.Prometheus.CredsRef, -// "User": user, -// "Pass": pass, -// "PassHash": fmt.Sprintf("%s:%s", user, passHash), -// "PromUrl": fmt.Sprintf("http://%s.%s.svc:%d", -// p.app.Spec.Monitoring.Prometheus.SvcName, -// p.app.Namespace, -// p.app.Spec.Monitoring.Prometheus.Port, -// ), -// }, -// } -//} -// -//func (p *ControlPlane) getEsSecretData() desired.TemplateData { -// return desired.TemplateData{ -// Data: map[string]interface{}{ -// "Namespace": p.app.Namespace, -// "CredsRef": p.app.Spec.Dbs.Es.CredsRef, -// "EsUrl": fmt.Sprintf("%s.%s.svc:%d", -// p.app.Spec.Dbs.Es.SvcName, -// p.app.Namespace, -// p.app.Spec.Dbs.Es.Port), -// "Annotations": p.app.Spec.Annotations, -// "Labels": p.app.Spec.Labels, -// }, -// } -//} -// -//func (p *ControlPlane) getRegistryData() desired.TemplateData { -// p.app.Spec.Registry.User = p.registryUser -// p.app.Spec.Registry.Password = p.registryPass -// return desired.TemplateData{ -// Namespace: p.app.Namespace, -// Data: map[string]interface{}{ -// "Registry": p.app.Spec.Registry, -// "Annotations": p.app.Spec.Annotations, -// "Labels": p.app.Spec.Labels, -// }, -// } -//} -// -//func (p *ControlPlane) setProxy() { -// if p.proxy { -// p.app.Spec.Networking.Proxy.Enabled = true -// p.app.Spec.Networking.Proxy.HttpProxy = []string{"http://corp-proxy-example1"} -// p.app.Spec.Networking.Proxy.HttpsProxy = []string{"http://corp-proxy-example1"} -// p.app.Spec.Networking.Proxy.NoProxy = networking.DefaultNoProxy("cluster.local") -// } -//} diff --git a/pkg/dumper/dumper.go b/pkg/dumper/dumper.go deleted file mode 100644 index b6e7157a..00000000 --- a/pkg/dumper/dumper.go +++ /dev/null @@ -1,6 +0,0 @@ -package dumper - -type Dumper interface { - BuildState() error - Dump(preserveTmplDirs bool) error -} diff --git a/pkg/dumper/networking.go b/pkg/dumper/networking.go deleted file mode 100644 index 56feff4a..00000000 --- a/pkg/dumper/networking.go +++ /dev/null @@ -1,56 +0,0 @@ -package dumper - -// -//import ( -// mlopsv1 "github.com/AccessibleAI/cnvrg-operator/api/v1" -// "github.com/AccessibleAI/cnvrg-operator/controllers" -// "github.com/AccessibleAI/cnvrg-operator/pkg/desired" -// log "github.com/sirupsen/logrus" -// "github.com/spf13/viper" -// "os" -//) -// -//type Networking struct { -// infra *mlopsv1.CnvrgInfra -// state []*desired.State -//} -// -//func NewNetworking(ns string) *Networking { -// infra := &mlopsv1.CnvrgInfra{Spec: mlopsv1.DefaultCnvrgInfraSpec()} -// infra.Spec.InfraNamespace = ns -// if err := controllers.CalculateAndApplyInfraDefaults(infra, &infra.Spec, nil); err != nil { -// log.Fatal(err) -// } -// return &Networking{ -// infra: infra, -// } -//} -// -//func (n *Networking) BuildState() error { -// //n.infra.Spec.Networking.Istio.Enabled = true -// //n.infra.Spec.CnvrgAppPriorityClass = mlopsv1.PriorityClass{Name: "cnvrg-apps-infra", Value: 2000000, Description: "cnvrg control plane apps priority class"} -// // -// //n.state = networking.InfraNetworkingState(n.infra) -// //n.state = append(n.state, networking.IstioCrds()...) -// //n.state = append(n.state, priorityclass.State()...) -// return nil -//} -// -//func (n *Networking) Dump(preserveTemplatesDir bool) error { -// if err := os.RemoveAll(viper.GetString("templates-dump-dir")); err != nil { -// log.Fatal(err) -// } -// for _, o := range n.state { -// -// if o.TemplateData == nil { -// o.TemplateData = n.infra -// } -// if err := o.GenerateDeployable(); err != nil { -// return err -// } -// if err := o.DumpTemplateToFile(preserveTemplatesDir); err != nil { -// return err -// } -// } -// return nil -//} From cfe1aad014004a25d2ac218acaaba6ae775e2dc9 Mon Sep 17 00:00:00 2001 From: Dmitry Kartsev Date: Thu, 8 Feb 2024 16:43:26 +0200 Subject: [PATCH 08/10] make scc unique names --- charts/cnvrg-mlops/templates/ocp-scc.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/cnvrg-mlops/templates/ocp-scc.yml b/charts/cnvrg-mlops/templates/ocp-scc.yml index 65cea914..e1651ce7 100644 --- a/charts/cnvrg-mlops/templates/ocp-scc.yml +++ b/charts/cnvrg-mlops/templates/ocp-scc.yml @@ -1,7 +1,7 @@ kind: SecurityContextConstraints apiVersion: security.openshift.io/v1 metadata: - name: "cnvrg-pg-scc" + name: "cnvrg-pg-scc-{{.Release.Name}}" allowHostDirVolumePlugin: false allowHostIPC: false allowHostNetwork: false @@ -32,7 +32,7 @@ users: kind: SecurityContextConstraints apiVersion: security.openshift.io/v1 metadata: - name: "cnvrg-minio-redis-es-scc" + name: "cnvrg-minio-redis-es-scc-{{.Release.Name}}" allowHostDirVolumePlugin: false allowHostIPC: false allowHostNetwork: false @@ -66,7 +66,7 @@ users: kind: SecurityContextConstraints apiVersion: security.openshift.io/v1 metadata: - name: "cnvrg-jobs" + name: "cnvrg-jobs-{{.Release.Name}}" allowHostDirVolumePlugin: false allowHostIPC: false allowHostNetwork: false From 50c0c758fd9846e75f2f68bcf3aa13eaac37c4d7 Mon Sep 17 00:00:00 2001 From: Dmitry Kartsev Date: Mon, 12 Feb 2024 14:05:40 +0200 Subject: [PATCH 09/10] add missing namesapce in roles --- charts/cnvrg-mlops/templates/ocp-scc.yml | 2 ++ pkg/app/sso/tmpl/jwks/role.tpl | 1 + pkg/app/sso/tmpl/jwks/rolebinding.tpl | 1 + pkg/app/sso/tmpl/proxy/role.tpl | 1 + pkg/app/sso/tmpl/proxy/rolebinding.tpl | 1 + 5 files changed, 6 insertions(+) diff --git a/charts/cnvrg-mlops/templates/ocp-scc.yml b/charts/cnvrg-mlops/templates/ocp-scc.yml index e1651ce7..6857d85d 100644 --- a/charts/cnvrg-mlops/templates/ocp-scc.yml +++ b/charts/cnvrg-mlops/templates/ocp-scc.yml @@ -62,6 +62,8 @@ users: - "system:serviceaccount:{{.Release.Namespace}}:{{.Values.dbs.redis.serviceAccount}}" - "system:serviceaccount:{{.Release.Namespace}}:{{.Values.dbs.es.serviceAccount}}" - "system:serviceaccount:{{.Release.Namespace}}:cnvrg-prom" + - "system:serviceaccount:{{.Release.Namespace}}:cnvrg-jwks" + - "system:serviceaccount:{{.Release.Namespace}}:cnvrg-proxy-central" --- kind: SecurityContextConstraints apiVersion: security.openshift.io/v1 diff --git a/pkg/app/sso/tmpl/jwks/role.tpl b/pkg/app/sso/tmpl/jwks/role.tpl index e6cc2ea7..df58b784 100644 --- a/pkg/app/sso/tmpl/jwks/role.tpl +++ b/pkg/app/sso/tmpl/jwks/role.tpl @@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: name: {{ .Spec.SSO.Jwks.SvcName }} + namespace: {{ .Namespace }} annotations: mlops.cnvrg.io/default-loader: "true" mlops.cnvrg.io/own: "false" diff --git a/pkg/app/sso/tmpl/jwks/rolebinding.tpl b/pkg/app/sso/tmpl/jwks/rolebinding.tpl index dc4f1202..d243d4c1 100644 --- a/pkg/app/sso/tmpl/jwks/rolebinding.tpl +++ b/pkg/app/sso/tmpl/jwks/rolebinding.tpl @@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: {{ .Spec.SSO.Jwks.SvcName }} + namespace: {{.Namespace}} annotations: mlops.cnvrg.io/default-loader: "true" mlops.cnvrg.io/own: "false" diff --git a/pkg/app/sso/tmpl/proxy/role.tpl b/pkg/app/sso/tmpl/proxy/role.tpl index 2ca39a9c..4c572fb4 100644 --- a/pkg/app/sso/tmpl/proxy/role.tpl +++ b/pkg/app/sso/tmpl/proxy/role.tpl @@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: name: {{.Spec.SSO.Proxy.SvcName}} + namespace: {{ .Namespace }} annotations: mlops.cnvrg.io/default-loader: "true" mlops.cnvrg.io/own: "false" diff --git a/pkg/app/sso/tmpl/proxy/rolebinding.tpl b/pkg/app/sso/tmpl/proxy/rolebinding.tpl index c5f31859..7956fbfa 100644 --- a/pkg/app/sso/tmpl/proxy/rolebinding.tpl +++ b/pkg/app/sso/tmpl/proxy/rolebinding.tpl @@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: {{.Spec.SSO.Proxy.SvcName}} + namespace: {{ .Namespace }} annotations: mlops.cnvrg.io/default-loader: "true" mlops.cnvrg.io/own: "false" From 4f7f2402bc2081ec3a4d3df0f096256ee07c918e Mon Sep 17 00:00:00 2001 From: Dmitry Kartsev Date: Mon, 12 Feb 2024 19:46:50 +0200 Subject: [PATCH 10/10] add ns scope limited sso support --- api/v1/appdefaults.go | 6 +++--- charts/cnvrg-mlops/templates/cap.yml | 2 +- charts/cnvrg-mlops/templates/hooks.yml | 4 ++-- charts/cnvrg-mlops/values.yaml | 4 ++-- pkg/app/sso/central.go | 15 +++++++++------ pkg/app/sso/tmpl/jwks/cm.tpl | 1 + 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/api/v1/appdefaults.go b/api/v1/appdefaults.go index 98ad86e8..1cf341be 100644 --- a/api/v1/appdefaults.go +++ b/api/v1/appdefaults.go @@ -459,7 +459,7 @@ var ssoDefault = SSO{ Jwks: Jwks{ Enabled: false, - Image: "cnvrg/jwks:latest", + Image: "cnvrg/jwks:ns-watch-scope", Replicas: 1, SvcName: "cnvrg-jwks", CacheImage: "redis:7.0.5", @@ -470,7 +470,7 @@ var ssoDefault = SSO{ Enabled: false, Replicas: 1, SvcName: "sso-central", - CnvrgProxyImage: "cnvrg-proxy:v1.0.15", + CnvrgProxyImage: "cnvrg-proxy:ns-watch-scope", OauthProxyImage: "oauth2-proxy:v7.4.ssov3.p6", CentralUiImage: "centralsso:latest", EmailDomain: []string{"*"}, @@ -492,7 +492,7 @@ var ssoDefault = SSO{ Proxy: CentralProxy{ Enabled: false, Replicas: 1, - Image: "cnvrg-proxy:v1.0.15", + Image: "cnvrg-proxy:ns-watch-scope", SvcName: "cnvrg-proxy-central", Requests: Requests{ Cpu: "200m", diff --git a/charts/cnvrg-mlops/templates/cap.yml b/charts/cnvrg-mlops/templates/cap.yml index 97773bd6..8d39f7b2 100644 --- a/charts/cnvrg-mlops/templates/cap.yml +++ b/charts/cnvrg-mlops/templates/cap.yml @@ -1,7 +1,7 @@ apiVersion: mlops.cnvrg.io/v1 kind: CnvrgApp metadata: - name: {{ .Release.Name }} + name: cnvrg-app namespace: {{ .Release.Namespace}} spec: clusterDomain: {{.Values.clusterDomain}} diff --git a/charts/cnvrg-mlops/templates/hooks.yml b/charts/cnvrg-mlops/templates/hooks.yml index 4cc287be..e593c24c 100644 --- a/charts/cnvrg-mlops/templates/hooks.yml +++ b/charts/cnvrg-mlops/templates/hooks.yml @@ -23,8 +23,8 @@ spec: - | set -x echo "running cleanup" - kubectl delete cnvrgapp {{ .Release.Name }} -n {{ .Release.Namespace }} --ignore-not-found - while (( $(kubectl get cnvrgapp {{ .Release.Name }} -n {{ .Release.Namespace }} --ignore-not-found | grep {{ .Release.Name }} | wc -l ) != 0 )); do + kubectl delete cnvrgapp cnvrg-app -n {{ .Release.Namespace }} --ignore-not-found + while (( $(kubectl get cnvrgapp cnvrg-app -n {{ .Release.Namespace }} --ignore-not-found | grep cnvrg-app | wc -l ) != 0 )); do echo "waiting for cnvrgapp will be deleted. . . "; sleep 1 done diff --git a/charts/cnvrg-mlops/values.yaml b/charts/cnvrg-mlops/values.yaml index acdbd3c0..478747fd 100644 --- a/charts/cnvrg-mlops/values.yaml +++ b/charts/cnvrg-mlops/values.yaml @@ -327,7 +327,7 @@ sso: jwks: enabled: false name: cnvrg-jwks - image: jwks:latest + image: jwks:ns-watch-scope cacheImage: redis:7.0.5 central: enabled: false @@ -356,7 +356,7 @@ sso: memory: 4Gi proxy: enabled: false - image: cnvrg-proxy:v1.0.15 + image: cnvrg-proxy:ns-watch-scope address: "" readiness: true requests: diff --git a/pkg/app/sso/central.go b/pkg/app/sso/central.go index 9d9b6392..d5f76c84 100644 --- a/pkg/app/sso/central.go +++ b/pkg/app/sso/central.go @@ -74,12 +74,15 @@ func (c *CentralStateManager) proxyCfgData() map[string]interface{} { groups = append(groups, c.domainId()) } d := map[string]interface{}{ - "Namespace": c.app.Namespace, - "EmailDomain": c.app.Spec.SSO.Central.EmailDomain, - "Provider": c.app.Spec.SSO.Central.Provider, - "ClientId": c.app.Spec.SSO.Central.ClientID, - "ClientSecret": c.app.Spec.SSO.Central.ClientSecret, - "RedirectUrl": fmt.Sprintf("%s://%s.%s", c.schema(), c.app.Spec.SSO.Central.SvcName, c.app.Spec.ClusterDomain), + "Namespace": c.app.Namespace, + "EmailDomain": c.app.Spec.SSO.Central.EmailDomain, + "Provider": c.app.Spec.SSO.Central.Provider, + "ClientId": c.app.Spec.SSO.Central.ClientID, + "ClientSecret": c.app.Spec.SSO.Central.ClientSecret, + "RedirectUrl": fmt.Sprintf("%s://%s.%s/oauth2/callback", + c.schema(), + c.app.Spec.SSO.Central.SvcName, + c.app.Spec.ClusterDomain), "OidcIssuerURL": c.app.Spec.SSO.Central.OidcIssuerURL, "Scope": c.app.Spec.SSO.Central.Scope, "InsecureOidcAllowUnverifiedEmail": c.app.Spec.SSO.Central.InsecureOidcAllowUnverifiedEmail, diff --git a/pkg/app/sso/tmpl/jwks/cm.tpl b/pkg/app/sso/tmpl/jwks/cm.tpl index bd33ae82..328b61d0 100644 --- a/pkg/app/sso/tmpl/jwks/cm.tpl +++ b/pkg/app/sso/tmpl/jwks/cm.tpl @@ -18,6 +18,7 @@ data: config.yaml: |- discovery: secret: + namespace: {{.Namespace}} labelKey: domainId dataKey: CNVRG_PKI_PUBLIC_KEY cache: