Skip to content

Commit

Permalink
Merge branch 'main' into feature/index/correction-job
Browse files Browse the repository at this point in the history
  • Loading branch information
@ykadowak
ykadowak authored Sep 25, 2023
2 parents 97ff3c0 + 644d1ad commit df88705
Show file tree
Hide file tree
Showing 22 changed files with 160 additions and 561 deletions.
4 changes: 2 additions & 2 deletions Makefile.d/helm.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ helm-docs/install: $(BINDIR)/helm-docs
$(BINDIR)/helm-docs:
mkdir -p $(BINDIR)
cd $(TEMP_DIR) \
&& curl -LO https://github.com/norwoodj/helm-docs/releases/download/v$(HELM_DOCS_VERSION)/helm-docs_$(HELM_DOCS_VERSION)_$(UNAME)_$(ARCH).tar.gz \
&& tar xzvf helm-docs_$(HELM_DOCS_VERSION)_$(UNAME)_$(ARCH).tar.gz \
&& curl -LO https://github.com/norwoodj/helm-docs/releases/download/v$(HELM_DOCS_VERSION)/helm-docs_$(UNAME)_$(ARCH).tar.gz \
&& tar xzvf helm-docs_$(UNAME)_$(ARCH).tar.gz \
&& mv helm-docs $(BINDIR)/helm-docs

.PHONY: helm/package/vald
Expand Down
12 changes: 3 additions & 9 deletions Makefile.d/k8s.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,16 +354,10 @@ k8s/monitoring/delete: \
telepresence/install: $(BINDIR)/telepresence

$(BINDIR)/telepresence:
@if echo $(BINDIR) | grep -v '^/' > /dev/null; then \
printf "\x1b[31m%s\x1b[0m\n" "WARNING!! BINDIR must be absolute path"; \
exit 1; \
fi
mkdir -p $(BINDIR)
curl -L "https://github.com/telepresenceio/telepresence/archive/$(TELEPRESENCE_VERSION).tar.gz" -o telepresence.tar.gz
tar xzvf telepresence.tar.gz
rm -rf telepresence.tar.gz
env PREFIX=$(BINDIR:%/bin=%) telepresence-$(TELEPRESENCE_VERSION)/install.sh
rm -rf telepresence-$(TELEPRESENCE_VERSION)
cd $(TEMP_DIR) \
&& curl -fsSL "https://app.getambassador.io/download/tel2oss/releases/download/v$(TELEPRESENCE_VERSION)/telepresence-$(shell echo $(UNAME) | tr '[:upper:]' '[:lower:]')-$(subst x86_64,amd64,$(shell echo $(ARCH) | tr '[:upper:]' '[:lower:]'))" -o $(BINDIR)/telepresence \
&& chmod a+x $(BINDIR)/telepresence

.PHONY: telepresence/swap/agent-ngt
## swap agent-ngt deployment using telepresence
Expand Down
53 changes: 26 additions & 27 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ replace (
cloud.google.com/go/bigquery => cloud.google.com/go/bigquery v1.55.0
cloud.google.com/go/compute => cloud.google.com/go/compute v1.23.0
cloud.google.com/go/datastore => cloud.google.com/go/datastore v1.14.0
cloud.google.com/go/firestore => cloud.google.com/go/firestore v1.12.0
cloud.google.com/go/firestore => cloud.google.com/go/firestore v1.13.0
cloud.google.com/go/iam => cloud.google.com/go/iam v1.1.2
cloud.google.com/go/kms => cloud.google.com/go/kms v1.15.2
cloud.google.com/go/monitoring => cloud.google.com/go/monitoring v1.16.0
Expand Down Expand Up @@ -36,20 +36,20 @@ replace (
github.com/Azure/go-autorest/tracing => github.com/Azure/go-autorest/tracing v0.6.1-0.20230905222633-df94ce56f001
github.com/BurntSushi/toml => github.com/BurntSushi/toml v1.3.2
github.com/DATA-DOG/go-sqlmock => github.com/DATA-DOG/go-sqlmock v1.5.0
github.com/GoogleCloudPlatform/cloudsql-proxy => github.com/GoogleCloudPlatform/cloudsql-proxy v1.33.10
github.com/GoogleCloudPlatform/cloudsql-proxy => github.com/GoogleCloudPlatform/cloudsql-proxy v1.33.11
github.com/Masterminds/semver/v3 => github.com/Masterminds/semver/v3 v3.2.1
github.com/ajstarks/deck => github.com/ajstarks/deck v0.0.0-20230713212537-3862a8c503c2
github.com/ajstarks/deck/generate => github.com/ajstarks/deck/generate v0.0.0-20230713212537-3862a8c503c2
github.com/ajstarks/deck => github.com/ajstarks/deck v0.0.0-20230917174535-ca5324ee72b2
github.com/ajstarks/deck/generate => github.com/ajstarks/deck/generate v0.0.0-20230917174535-ca5324ee72b2
github.com/ajstarks/svgo => github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b
github.com/antihax/optional => github.com/antihax/optional v1.0.0
github.com/armon/go-socks5 => github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.45.10
github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.45.14
github.com/aws/aws-sdk-go-v2 => github.com/aws/aws-sdk-go-v2 v1.21.0
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream => github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.13
github.com/aws/aws-sdk-go-v2/config => github.com/aws/aws-sdk-go-v2/config v1.18.39
github.com/aws/aws-sdk-go-v2/credentials => github.com/aws/aws-sdk-go-v2/credentials v1.13.37
github.com/aws/aws-sdk-go-v2/config => github.com/aws/aws-sdk-go-v2/config v1.18.41
github.com/aws/aws-sdk-go-v2/credentials => github.com/aws/aws-sdk-go-v2/credentials v1.13.39
github.com/aws/aws-sdk-go-v2/feature/ec2/imds => github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.11
github.com/aws/aws-sdk-go-v2/feature/s3/manager => github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.83
github.com/aws/aws-sdk-go-v2/feature/s3/manager => github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.85
github.com/aws/aws-sdk-go-v2/internal/configsources => github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 => github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35
github.com/aws/aws-sdk-go-v2/internal/ini => github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42
Expand All @@ -58,13 +58,13 @@ replace (
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url => github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.35
github.com/aws/aws-sdk-go-v2/service/internal/s3shared => github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.15.4
github.com/aws/aws-sdk-go-v2/service/kms => github.com/aws/aws-sdk-go-v2/service/kms v1.24.5
github.com/aws/aws-sdk-go-v2/service/s3 => github.com/aws/aws-sdk-go-v2/service/s3 v1.38.5
github.com/aws/aws-sdk-go-v2/service/s3 => github.com/aws/aws-sdk-go-v2/service/s3 v1.39.0
github.com/aws/aws-sdk-go-v2/service/secretsmanager => github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.21.3
github.com/aws/aws-sdk-go-v2/service/sns => github.com/aws/aws-sdk-go-v2/service/sns v1.21.5
github.com/aws/aws-sdk-go-v2/service/sns => github.com/aws/aws-sdk-go-v2/service/sns v1.22.0
github.com/aws/aws-sdk-go-v2/service/sqs => github.com/aws/aws-sdk-go-v2/service/sqs v1.24.5
github.com/aws/aws-sdk-go-v2/service/ssm => github.com/aws/aws-sdk-go-v2/service/ssm v1.37.5
github.com/aws/aws-sdk-go-v2/service/sso => github.com/aws/aws-sdk-go-v2/service/sso v1.13.6
github.com/aws/aws-sdk-go-v2/service/sts => github.com/aws/aws-sdk-go-v2/service/sts v1.21.5
github.com/aws/aws-sdk-go-v2/service/sso => github.com/aws/aws-sdk-go-v2/service/sso v1.14.0
github.com/aws/aws-sdk-go-v2/service/sts => github.com/aws/aws-sdk-go-v2/service/sts v1.22.0
github.com/aws/smithy-go => github.com/aws/smithy-go v1.14.2
github.com/benbjohnson/clock => github.com/benbjohnson/clock v1.3.5
github.com/beorn7/perks => github.com/beorn7/perks v1.0.1
Expand Down Expand Up @@ -100,7 +100,7 @@ replace (
github.com/fsnotify/fsnotify => github.com/fsnotify/fsnotify v1.6.0
github.com/gin-contrib/sse => github.com/gin-contrib/sse v0.1.0
github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.1
github.com/go-errors/errors => github.com/go-errors/errors v1.5.0
github.com/go-errors/errors => github.com/go-errors/errors v1.5.1
github.com/go-fonts/dejavu => github.com/go-fonts/dejavu v0.2.0
github.com/go-fonts/latin-modern => github.com/go-fonts/latin-modern v0.3.1
github.com/go-fonts/liberation => github.com/go-fonts/liberation v0.3.1
Expand Down Expand Up @@ -190,7 +190,7 @@ replace (
github.com/jstemmer/go-junit-report => github.com/jstemmer/go-junit-report v1.0.0
github.com/kisielk/errcheck => github.com/kisielk/errcheck v1.6.3
github.com/kisielk/gotool => github.com/kisielk/gotool v1.0.0
github.com/klauspost/compress => github.com/klauspost/compress v1.16.8-0.20230909131757-0e8837ceede6
github.com/klauspost/compress => github.com/klauspost/compress v1.17.1-0.20230918170125-6125c11bae77
github.com/klauspost/cpuid/v2 => github.com/klauspost/cpuid/v2 v2.2.5
github.com/kpango/fastime => github.com/kpango/fastime v1.1.9
github.com/kpango/fuid => github.com/kpango/fuid v0.0.0-20221203053508-503b5ad89aa1
Expand Down Expand Up @@ -222,7 +222,7 @@ replace (
github.com/niemeyer/pretty => github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e
github.com/nxadm/tail => github.com/nxadm/tail v1.4.8
github.com/onsi/ginkgo => github.com/onsi/ginkgo v1.16.5
github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.12.0
github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.12.1
github.com/onsi/gomega => github.com/onsi/gomega v1.27.10
github.com/peterbourgon/diskv => github.com/peterbourgon/diskv v2.0.1+incompatible
github.com/phpdave11/gofpdf => github.com/phpdave11/gofpdf v1.4.2
Expand Down Expand Up @@ -292,7 +292,7 @@ replace (
go.uber.org/zap => go.uber.org/zap v1.26.0
gocloud.dev => gocloud.dev v0.34.0
golang.org/x/crypto => golang.org/x/crypto v0.13.0
golang.org/x/exp => golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb
golang.org/x/exp => golang.org/x/exp v0.0.0-20230905200255-921286631fa9
golang.org/x/exp/typeparams => golang.org/x/exp/typeparams v0.0.0-20230905200255-921286631fa9
golang.org/x/image => golang.org/x/image v0.12.0
golang.org/x/lint => golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
Expand All @@ -311,11 +311,11 @@ replace (
gonum.org/v1/gonum => gonum.org/v1/gonum v0.14.0
gonum.org/v1/hdf5 => gonum.org/v1/hdf5 v0.0.0-20210714002203-8c5d23bc6946
gonum.org/v1/plot => gonum.org/v1/plot v0.14.0
google.golang.org/api => google.golang.org/api v0.141.0
google.golang.org/api => google.golang.org/api v0.142.0
google.golang.org/appengine => google.golang.org/appengine v1.6.8
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb
google.golang.org/genproto/googleapis/api => google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb
google.golang.org/genproto/googleapis/rpc => google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13
google.golang.org/genproto/googleapis/api => google.golang.org/genproto/googleapis/api v0.0.0-20230920204549-e6e6cdab5c13
google.golang.org/genproto/googleapis/rpc => google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13
google.golang.org/grpc => google.golang.org/grpc v1.58.1
google.golang.org/grpc/cmd/protoc-gen-go-grpc => google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
google.golang.org/protobuf => google.golang.org/protobuf v1.31.0
Expand Down Expand Up @@ -388,7 +388,6 @@ require (
go.uber.org/goleak v1.2.1
go.uber.org/zap v1.24.0
gocloud.dev v0.0.0-00010101000000-000000000000
golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b
golang.org/x/net v0.15.0
golang.org/x/oauth2 v0.12.0
golang.org/x/sync v0.3.0
Expand All @@ -397,8 +396,8 @@ require (
golang.org/x/tools v0.13.0
gonum.org/v1/hdf5 v0.0.0-00010101000000-000000000000
gonum.org/v1/plot v0.10.1
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d
google.golang.org/genproto/googleapis/rpc v0.0.0-20230911183012-2d3300fd4832
google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb
google.golang.org/genproto/googleapis/rpc v0.0.0-20230920183334-c177e329c48b
google.golang.org/grpc v1.58.0
google.golang.org/protobuf v1.31.0
gopkg.in/yaml.v2 v2.4.0
Expand All @@ -411,10 +410,10 @@ require (
)

require (
cloud.google.com/go v0.110.7 // indirect
cloud.google.com/go v0.110.8 // indirect
cloud.google.com/go/compute v1.23.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v1.1.1 // indirect
cloud.google.com/go/iam v1.1.2 // indirect
git.sr.ht/~sbinet/gg v0.5.0 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver v1.5.0 // indirect
Expand All @@ -436,7 +435,7 @@ require (
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.4 // indirect
github.com/go-pdf/fpdf v0.8.0 // indirect
github.com/go-pdf/fpdf v0.9.0 // indirect
github.com/go-toolsmith/astcopy v1.0.2 // indirect
github.com/go-toolsmith/astequal v1.1.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
Expand Down Expand Up @@ -501,7 +500,7 @@ require (
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
google.golang.org/api v0.134.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230821184602-ccc8af3d0e93 // indirect
google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.27.2 // indirect
Expand Down
Loading

0 comments on commit df88705

Please sign in to comment.