From c59e6d50ce3499f51c8e74481b22fc5eb1b9a7a7 Mon Sep 17 00:00:00 2001 From: Terence Lim Date: Wed, 5 Apr 2023 12:00:30 +0800 Subject: [PATCH] Update reference for Merlin dependency (#327) * Update merlin dependency * Bump go version and fix linting * Attempt to fix dependency issue * Pin k8s dependencies * Use correct dep --- .../actions/setup-test-cluster/action.yaml | 2 +- .github/workflows/cluster-init.yaml | 8 +-- .github/workflows/fluentd-plugin.yaml | 4 +- .github/workflows/helm-chart.yaml | 2 +- .github/workflows/pyfunc-ensembler-job.yaml | 6 +- .../workflows/pyfunc-ensembler-service.yaml | 6 +- .github/workflows/sdk.yaml | 6 +- .github/workflows/turing-publish.yaml | 2 +- .github/workflows/turing.yaml | 32 ++++----- README.md | 4 +- api/Dockerfile | 2 +- api/Makefile | 3 +- api/README.md | 2 +- api/go.mod | 46 ++++++------ api/go.sum | 71 ++++++++++--------- api/turing/api/alerts_api_test.go | 2 +- api/turing/api/appcontext_test.go | 3 +- api/turing/api/deployment_controller.go | 2 +- api/turing/api/deployment_controller_test.go | 11 +-- api/turing/api/ensembling_job_api_it_test.go | 2 +- api/turing/api/ensembling_job_api_test.go | 2 +- api/turing/api/router_versions_api_test.go | 2 +- api/turing/api/routers_api_test.go | 2 +- api/turing/cluster/controller_test.go | 1 + api/turing/config/config.go | 6 +- api/turing/service/alert_service.go | 2 +- api/turing/service/alert_service_test.go | 2 +- api/turing/service/mlp_service.go | 4 +- api/turing/service/mlp_service_test.go | 3 +- api/turing/service/mocks/alert_service.go | 2 +- api/turing/service/mocks/mlp_service.go | 2 +- .../mocks/router_deployment_service.go | 2 +- .../service/router_deployment_service.go | 2 +- .../service/router_deployment_service_test.go | 2 +- .../service/router_monitoring_service_test.go | 2 +- api/turing/service/router_service_test.go | 2 +- .../service/router_version_service_test.go | 2 +- docs/README.md | 2 +- .../configure-general-settings.md | 2 +- engines/experiment/docs/developer_guide.md | 2 +- engines/experiment/docs/rpc_plugins.md | 4 +- .../examples/plugins/hardcoded/Dockerfile | 2 +- .../examples/plugins/hardcoded/go.mod | 2 +- engines/experiment/go.mod | 2 +- engines/router/Dockerfile | 2 +- engines/router/README.md | 2 +- engines/router/go.mod | 2 +- .../router/missionctl/fiberapi/fan_in_test.go | 1 + .../fiberapi/internal/testutils/helpers.go | 4 +- .../missionctl/log/resultlog/fluentd_test.go | 1 + .../missionctl/mission_control_upi_test.go | 4 +- engines/router/traffic_rule_condition_test.go | 4 +- .../charts/turing/subcharts/merlin/README.md | 8 +-- .../turing/subcharts/merlin/values.yaml | 8 +-- infra/charts/turing/subcharts/mlp/README.md | 2 +- infra/charts/turing/subcharts/mlp/values.yaml | 2 +- infra/docker-compose/dev/docker-compose.yml | 2 +- infra/docker-compose/dev/merlin/dev.env | 2 +- 58 files changed, 164 insertions(+), 152 deletions(-) diff --git a/.github/actions/setup-test-cluster/action.yaml b/.github/actions/setup-test-cluster/action.yaml index 7a4ca3209..983b78f74 100644 --- a/.github/actions/setup-test-cluster/action.yaml +++ b/.github/actions/setup-test-cluster/action.yaml @@ -59,7 +59,7 @@ runs: using: composite steps: - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v4 with: go-version: ${{ inputs.go-version }} diff --git a/.github/workflows/cluster-init.yaml b/.github/workflows/cluster-init.yaml index c2d14c728..4d8ac9d20 100644 --- a/.github/workflows/cluster-init.yaml +++ b/.github/workflows/cluster-init.yaml @@ -29,7 +29,7 @@ jobs: outputs: release-type: ${{ steps.release-rules.outputs.release-type }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - id: release-rules uses: ./.github/actions/release-rules with: @@ -41,7 +41,7 @@ jobs: cluster-init-version: ${{ steps.build-cluster-init.outputs.cluster-init-version }} steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 @@ -62,7 +62,7 @@ jobs: - build-cluster-init steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Download Cluster Init Docker tar archieve uses: actions/download-artifact@v2 @@ -130,7 +130,7 @@ jobs: - build-cluster-init - test-e2e steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 diff --git a/.github/workflows/fluentd-plugin.yaml b/.github/workflows/fluentd-plugin.yaml index 49b0c6448..ff0299fb6 100644 --- a/.github/workflows/fluentd-plugin.yaml +++ b/.github/workflows/fluentd-plugin.yaml @@ -21,7 +21,7 @@ jobs: outputs: release-type: ${{ steps.release-rules.outputs.release-type }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - id: release-rules uses: ./.github/actions/release-rules with: @@ -46,7 +46,7 @@ jobs: needs: - release-rules steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 diff --git a/.github/workflows/helm-chart.yaml b/.github/workflows/helm-chart.yaml index 548e86589..62fb3cde3 100644 --- a/.github/workflows/helm-chart.yaml +++ b/.github/workflows/helm-chart.yaml @@ -25,7 +25,7 @@ jobs: release: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Run chart-releaser uses: stefanprodan/helm-gh-pages@v1.4.1 with: diff --git a/.github/workflows/pyfunc-ensembler-job.yaml b/.github/workflows/pyfunc-ensembler-job.yaml index 806896d80..accbabd30 100644 --- a/.github/workflows/pyfunc-ensembler-job.yaml +++ b/.github/workflows/pyfunc-ensembler-job.yaml @@ -33,7 +33,7 @@ jobs: python-version: ["3.7", "3.8", "3.9", "3.10"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup Python ${{ matrix.python-version }} uses: actions/setup-python@v2 @@ -70,7 +70,7 @@ jobs: outputs: release-type: ${{ steps.release-rules.outputs.release-type }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - id: release-rules uses: ./.github/actions/release-rules with: @@ -97,7 +97,7 @@ jobs: - release-rules - test steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 diff --git a/.github/workflows/pyfunc-ensembler-service.yaml b/.github/workflows/pyfunc-ensembler-service.yaml index 58cc3243b..593978335 100644 --- a/.github/workflows/pyfunc-ensembler-service.yaml +++ b/.github/workflows/pyfunc-ensembler-service.yaml @@ -33,7 +33,7 @@ jobs: python-version: ["3.7", "3.8", "3.9", "3.10"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup Python ${{ matrix.python-version }} uses: actions/setup-python@v2 @@ -64,7 +64,7 @@ jobs: outputs: release-type: ${{ steps.release-rules.outputs.release-type }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - id: release-rules uses: ./.github/actions/release-rules with: @@ -91,7 +91,7 @@ jobs: - release-rules - test steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 diff --git a/.github/workflows/sdk.yaml b/.github/workflows/sdk.yaml index 13783f7e6..a2987e4fc 100644 --- a/.github/workflows/sdk.yaml +++ b/.github/workflows/sdk.yaml @@ -32,7 +32,7 @@ jobs: working-directory: ./sdk steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup Python ${{ matrix.python-version }} uses: actions/setup-python@v2 @@ -58,7 +58,7 @@ jobs: outputs: release-type: ${{ steps.release-rules.outputs.release-type }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - id: release-rules uses: ./.github/actions/release-rules with: @@ -80,7 +80,7 @@ jobs: environment: ${{ needs.release-rules.outputs.release-type == 'dev' && 'manual' || '' }} steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: # fetch full history for a proper version number assignment fetch-depth: 0 diff --git a/.github/workflows/turing-publish.yaml b/.github/workflows/turing-publish.yaml index a9cca3355..2e256b836 100644 --- a/.github/workflows/turing-publish.yaml +++ b/.github/workflows/turing-publish.yaml @@ -55,7 +55,7 @@ jobs: environment: ${{ inputs.environment }} steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Log in to the Container registry uses: docker/login-action@v1 diff --git a/.github/workflows/turing.yaml b/.github/workflows/turing.yaml index 0abd1815f..60cf8f1cf 100644 --- a/.github/workflows/turing.yaml +++ b/.github/workflows/turing.yaml @@ -39,8 +39,8 @@ on: env: ARTIFACT_RETENTION_DAYS: 7 - GO_VERSION: 1.18 - GO_LINT_VERSION: v1.48.0 + GO_VERSION: '1.20' + GO_LINT_VERSION: v1.51.2 CLUSTER_NAME: turing-e2e ISTIO_VERSION: 1.9.9 KNATIVE_VERSION: 1.7.4 @@ -54,7 +54,7 @@ jobs: api-version: ${{ steps.build-image.outputs.api-version }} steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 @@ -85,7 +85,7 @@ jobs: router-version: ${{ steps.build-image.outputs.router-version }} steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 @@ -118,7 +118,7 @@ jobs: test-experiment-engine-plugin-version: ${{ env.VERSION }} steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Build Docker image working-directory: engines/experiment/examples/plugins/hardcoded @@ -146,7 +146,7 @@ jobs: working-directory: ui steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Install system dependencies run: sudo apt-get install --no-install-recommends gcc make libpng-dev @@ -188,7 +188,7 @@ jobs: cluster-init-version: ${{ steps.build-cluster-init.outputs.cluster-init-version }} steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 @@ -220,10 +220,10 @@ jobs: - 5432:5432 steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v4 with: go-version: ${{ env.GO_VERSION }} @@ -263,10 +263,10 @@ jobs: - build-router steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v4 with: go-version: ${{ env.GO_VERSION }} @@ -298,10 +298,10 @@ jobs: GOPATH: ${{ github.workspace }}/engines/experiment/.go steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v4 with: go-version: ${{ env.GO_VERSION }} @@ -353,7 +353,7 @@ jobs: steps: - name: Check out code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set Up Test Cluster uses: ./.github/actions/setup-test-cluster @@ -373,7 +373,7 @@ jobs: cluster_init_version: ${{ env.CLUSTER_INIT_VERSION }} - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v4 with: go-version: ${{ env.GO_VERSION }} @@ -477,7 +477,7 @@ jobs: outputs: release-type: ${{ steps.release-rules.outputs.release-type }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - id: release-rules uses: ./.github/actions/release-rules diff --git a/README.md b/README.md index 3ee75adb2..edb342bce 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ Refer to the README under the individual directories for getting started with th The following guide will help you quickly get started with running Turing. Turing requires these infrastructure dependencies in order to function properly: - [MLP](https://github.com/gojek/mlp) API server to namespace Turing routers -- [Merlin](https://github.com/gojek/merlin) API server to manage environments where Turing routers are deployed +- [Merlin](https://github.com/caraml-dev/merlin) API server to manage environments where Turing routers are deployed - [Kubernetes](https://kubernetes.io/) cluster (with [Knative Serving](https://knative.dev/docs/serving/) and [Istio](https://istio.io/) installed and [Spark on K8s Operator](https://github.com/GoogleCloudPlatform/spark-on-k8s-operator)) to provision and manage Turing router workloads (Note that our local setup does not install Spark on K8s Operator as of writing) - [Vault](https://www.vaultproject.io/) to store deployment and user secrets @@ -56,7 +56,7 @@ in these getting started guide. - [Docker](https://www.docker.com/get-started) v19.03 - [Docker compose](https://docs.docker.com/compose/) v1.27 -- [Go](https://golang.org/dl/) v1.18 +- [Go](https://golang.org/dl/) v1.20 - [Node.js](https://nodejs.org/en/download/) v14 and yarn 1.22.x - [Kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) v1.22 (optional) - [Python](https://www.python.org/downloads/) >=3.7 diff --git a/api/Dockerfile b/api/Dockerfile index 299367d61..210e58108 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -3,7 +3,7 @@ FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:alpine as gke-plugin-builde RUN gcloud components install gke-gcloud-auth-plugin --quiet # Build turing-api binary -FROM golang:1.18-alpine as api-builder +FROM golang:1.20-alpine as api-builder ARG API_BIN_NAME=turing-api ENV GO111MODULE=on \ diff --git a/api/Makefile b/api/Makefile index 2ed790b20..541b84dd3 100644 --- a/api/Makefile +++ b/api/Makefile @@ -14,8 +14,7 @@ clean: .PHONY: setup setup: @echo "Setting up tools..." - @test -x $(shell go env GOPATH)/bin/golangci-lint || \ - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/v1.48.0/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.48.0 + @test -x ${GOPATH}/bin/golangci-lint || go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.51.2 .PHONY: fmt fmt: diff --git a/api/README.md b/api/README.md index 7ed8278cb..361ee3436 100644 --- a/api/README.md +++ b/api/README.md @@ -7,7 +7,7 @@ API for the Turing experimentation service. ### Local Development #### Requirements -- Golang 1.18 +- Golang 1.20 - Docker #### Setup diff --git a/api/go.mod b/api/go.mod index 9cac55d6e..a6bd20cf5 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,12 +1,13 @@ module github.com/caraml-dev/turing/api -go 1.18 +go 1.20 require ( bou.ke/monkey v1.0.2 github.com/DATA-DOG/go-sqlmock v1.3.3 - github.com/GoogleCloudPlatform/spark-on-k8s-operator v0.0.0-20220113170521-22cd4a2c6990 + github.com/GoogleCloudPlatform/spark-on-k8s-operator v0.0.0-20220214044918-55732a6a392c github.com/antihax/optional v1.0.0 + github.com/caraml-dev/merlin v0.0.0 github.com/caraml-dev/turing/engines/experiment v0.0.0 github.com/caraml-dev/turing/engines/router v0.0.0 github.com/caraml-dev/universal-prediction-interface v0.3.4 @@ -15,7 +16,6 @@ require ( github.com/ghodss/yaml v1.0.0 github.com/go-playground/validator/v10 v10.11.1 github.com/gojek/fiber v0.2.1-rc2 - github.com/gojek/merlin v0.0.0 github.com/gojek/mlp v1.7.6-0.20230329030735-c28dca2aeef9 github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 github.com/golang-migrate/migrate/v4 v4.11.0 @@ -37,7 +37,6 @@ require ( github.com/xanzy/go-gitlab v0.32.0 go.uber.org/zap v1.21.0 golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 - google.golang.org/api v0.103.0 google.golang.org/grpc v1.51.0 google.golang.org/protobuf v1.28.1 gopkg.in/yaml.v2 v2.4.0 @@ -59,6 +58,7 @@ require ( require ( cloud.google.com/go/compute v1.14.0 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect + github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect github.com/ajg/form v1.5.1 // indirect github.com/andybalholm/brotli v1.0.3 // indirect github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect @@ -66,15 +66,15 @@ require ( github.com/buger/jsonparser v1.1.1 // indirect github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 // indirect github.com/cespare/xxhash v1.1.0 // indirect - github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/dgraph-io/ristretto v0.0.1 // indirect - github.com/docker/cli v20.10.12+incompatible // indirect + github.com/docker/cli v20.10.13+incompatible // indirect github.com/docker/distribution v2.8.1+incompatible // indirect github.com/docker/docker v20.10.17+incompatible // indirect github.com/docker/docker-credential-helpers v0.6.4 // indirect - github.com/evanphx/json-patch v4.11.0+incompatible // indirect - github.com/evanphx/json-patch/v5 v5.5.0 // indirect + github.com/evanphx/json-patch v4.12.0+incompatible // indirect + github.com/evanphx/json-patch/v5 v5.6.0 // indirect github.com/fatih/color v1.13.0 // indirect github.com/fatih/structs v1.1.0 // indirect github.com/fsnotify/fsnotify v1.5.4 // indirect @@ -89,7 +89,7 @@ require ( github.com/go-openapi/spec v0.20.2 // indirect github.com/go-openapi/strfmt v0.19.5 // indirect github.com/go-openapi/swag v0.19.15 // indirect - github.com/go-openapi/validate v0.19.7 // indirect + github.com/go-openapi/validate v0.19.8 // indirect github.com/go-playground/locales v0.14.0 // indirect github.com/go-playground/universal-translator v0.18.0 // indirect github.com/go-playground/validator v9.31.0+incompatible // indirect @@ -104,12 +104,12 @@ require ( github.com/googleapis/gnostic v0.5.5 // indirect github.com/gorilla/websocket v1.4.2 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.2 // indirect - github.com/hashicorp/errwrap v1.0.0 // indirect + github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-hclog v0.16.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-plugin v1.4.3 // indirect - github.com/hashicorp/go-retryablehttp v0.6.6 // indirect + github.com/hashicorp/go-retryablehttp v0.7.0 // indirect github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect @@ -150,10 +150,10 @@ require ( github.com/ory/keto-client-go v0.4.4-alpha.1 // indirect github.com/pelletier/go-toml v1.9.5 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.11.1 // indirect + github.com/prometheus/client_golang v1.12.1 // indirect github.com/prometheus/client_model v0.2.0 // indirect - github.com/prometheus/common v0.31.1 // indirect - github.com/prometheus/procfs v0.6.0 // indirect + github.com/prometheus/common v0.32.1 // indirect + github.com/prometheus/procfs v0.7.3 // indirect github.com/sergi/go-diff v1.1.0 // indirect github.com/sirupsen/logrus v1.9.0 // indirect github.com/spf13/afero v1.9.2 // indirect @@ -179,13 +179,14 @@ require ( go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/crypto v0.5.0 // indirect - golang.org/x/net v0.5.0 // indirect + golang.org/x/net v0.7.0 // indirect golang.org/x/sync v0.1.0 // indirect - golang.org/x/sys v0.4.0 // indirect - golang.org/x/term v0.4.0 // indirect - golang.org/x/text v0.6.0 // indirect - golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect + golang.org/x/sys v0.5.0 // indirect + golang.org/x/term v0.5.0 // indirect + golang.org/x/text v0.7.0 // indirect + golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect + google.golang.org/api v0.103.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230104163317-caabf589fcbf // indirect gopkg.in/errgo.v2 v2.1.0 // indirect @@ -207,15 +208,15 @@ replace ( github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.4.0+incompatible github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.9.0 + github.com/caraml-dev/merlin => github.com/caraml-dev/merlin/api v0.0.0-20230403075012-795947162429 + github.com/caraml-dev/merlin-pyspark-app => github.com/caraml-dev/merlin/python/batch-predictor v0.0.0-20230403075012-795947162429 + github.com/caraml-dev/turing/engines/experiment => ../engines/experiment github.com/caraml-dev/turing/engines/router => ../engines/router // The older version of k8 lib uses 0.4, UPI indirect depencies uses 1.2 which is compatible github.com/go-logr/logr => github.com/go-logr/logr v0.4.0 - github.com/gojek/merlin => github.com/gojek/merlin/api v0.0.0-20210723093139-cc0240032d58 - github.com/gojek/merlin-pyspark-app => github.com/gojek/merlin/python/batch-predictor v0.0.0-20210723093139-cc0240032d58 - k8s.io/api => k8s.io/api v0.22.7 k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.7 @@ -244,4 +245,5 @@ replace ( k8s.io/mount-utils => k8s.io/mount-utils v0.22.7 k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.22.7 k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.22.7 + knative.dev/pkg => knative.dev/pkg v0.0.0-20220222221138-929d328ad73c ) diff --git a/api/go.sum b/api/go.sum index b3170aafd..c74719d20 100644 --- a/api/go.sum +++ b/api/go.sum @@ -96,10 +96,11 @@ github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5H github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20180321230639-1e456b1c68cb/go.mod h1:aJ4qN3TfrelA6NZ6AXsXRfmEVaYin3EDbSPJrKS8OXo= github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20200415212048-7901bc822317/go.mod h1:DF8FZRxMHMGv/vP2lQP6h+dYzzjpuRn24VeRiYn3qjQ= github.com/GoogleCloudPlatform/spark-on-k8s-operator v0.0.0-20200424034326-7cd886c7ec44/go.mod h1:QckherVewmoCxpfwPZxI0MHFbMpxQ9LZOpff4Pies1M= -github.com/GoogleCloudPlatform/spark-on-k8s-operator v0.0.0-20220113170521-22cd4a2c6990 h1:17whXivP8mS7zr9Y+KbdfuLpJYkbl3WUi0EOzTpn5aU= -github.com/GoogleCloudPlatform/spark-on-k8s-operator v0.0.0-20220113170521-22cd4a2c6990/go.mod h1:24D2qSkdsK49gBmUsVPMoen7GY96De9bkpFRqJJP8nc= -github.com/HdrHistogram/hdrhistogram-go v1.0.1 h1:GX8GAYDuhlFQnI2fRDHQhTlkHMz8bEn0jTI6LJU0mpw= +github.com/GoogleCloudPlatform/spark-on-k8s-operator v0.0.0-20220214044918-55732a6a392c h1:qbQFTsl53QjsfWjuy1QfTqvuHi2PmBJiUi+dumvA0Ao= +github.com/GoogleCloudPlatform/spark-on-k8s-operator v0.0.0-20220214044918-55732a6a392c/go.mod h1:24D2qSkdsK49gBmUsVPMoen7GY96De9bkpFRqJJP8nc= github.com/HdrHistogram/hdrhistogram-go v1.0.1/go.mod h1:BWJ+nMSHY3L41Zj7CA3uXnloDp7xxV0YvstAE7nKTaM= +github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= +github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod h1:3VYc5hodBMJ5+l/7J4xAyMeuM2PNuepvHlGs8yilUCA= github.com/Jeffail/gabs v0.0.0-20180420203615-7a0fed31069a/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc= github.com/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= @@ -239,6 +240,9 @@ github.com/butuzov/ireturn v0.1.1/go.mod h1:Wh6Zl3IMtTpaIKbmwzqi6olnM9ptYQxxVacM github.com/c2h5oh/datasize v0.0.0-20171227191756-4eba002a5eae/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M= github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M= github.com/cactus/go-statsd-client/statsd v0.0.0-20200423205355-cb0885a1018c/go.mod h1:l/bIBLeOl9eX+wxJAzxS4TveKRtAqlyDpHjhkfO0MEI= +github.com/caraml-dev/merlin/api v0.0.0-20230403075012-795947162429 h1:utxGPa/erqKIUhgBFMgnbORjKUIqVKLs7VXa0ZB0jNY= +github.com/caraml-dev/merlin/api v0.0.0-20230403075012-795947162429/go.mod h1:BRGKVbv3zEu9rE6pE2RNlj/IZfqy/3HEqBQGLK5rHMc= +github.com/caraml-dev/merlin/python/batch-predictor v0.0.0-20230403075012-795947162429/go.mod h1:jYSIcxx7FDccKSva3mo12YhQ0rYuP4MOEbgSveY82HE= github.com/caraml-dev/universal-prediction-interface v0.3.4 h1:cPytzpjXE/8RhSw3iS0JFZzNdM3tJ/l8UcHTPrxQWEo= github.com/caraml-dev/universal-prediction-interface v0.3.4/go.mod h1:e0qmFOXQxx8HFg5ObYyQO3WVnrqsr5v5JApFmeF7eJo= github.com/casbin/casbin v1.7.0/go.mod h1:c67qKN6Oum3UF5Q1+BByfFxkwKvhwW57ITjqwtzR1KE= @@ -252,8 +256,9 @@ github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 h1:uH66TXeswKn5P github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= github.com/charithe/durationcheck v0.0.9/go.mod h1:SSbRIBVfMjCi/kEB6K65XEA83D6prSM8ap1UCpNKtgg= github.com/chavacava/garif v0.0.0-20210405164556-e8a0a408d6af/go.mod h1:Qjyv4H3//PWVzTeCezG2b9IRn6myJxJSr4TD/xo6ojU= @@ -441,8 +446,8 @@ github.com/dnaeon/go-vcr v0.0.0-20180504081357-f8a7e8b9c630/go.mod h1:aBB1+wY4s9 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= github.com/docker/cli v0.0.0-20190925022749-754388324470/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v20.10.7+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v20.10.12+incompatible h1:lZlz0uzG+GH+c0plStMUdF/qk3ppmgnswpR5EbqzVGA= -github.com/docker/cli v20.10.12+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v20.10.13+incompatible h1:o/STAn7e+b/pQ6keReGRoewVmAgXUkZAMQ8st4vHdKg= +github.com/docker/cli v20.10.13+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= github.com/docker/distribution v2.6.0-rc.1.0.20180327202408-83389a148052+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.7.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= @@ -505,10 +510,12 @@ github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMi github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch v4.11.0+incompatible h1:glyUF9yIYtMHzn8xaKw5rMhdWcwsYV8dZHIq5567/xs= github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch/v5 v5.5.0 h1:bAmFiUJ+o0o2B4OiTFeE3MqCOtyo+jjPP9iZ0VRxYUc= +github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= +github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch/v5 v5.5.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= +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/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= github.com/fasthttp/websocket v1.4.3-rc.6 h1:omHqsl8j+KXpmzRjF8bmzOSYJ8GnS0E3efi1wYT+niY= github.com/fasthttp/websocket v1.4.3-rc.6/go.mod h1:43W9OM2T8FeXpCWMsBd9Cb7nE2CACNqNvCqQCoty/Lc= @@ -655,8 +662,8 @@ github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2K github.com/go-openapi/validate v0.19.3/go.mod h1:90Vh6jjkTn+OT1Eefm0ZixWNFjhtOH7vS9k0lo6zwJo= github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= github.com/go-openapi/validate v0.19.6/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= -github.com/go-openapi/validate v0.19.7 h1:fR4tP2xc+25pdo5Qvv4v6g+5QKFgNg8nrifTE7V8ibA= -github.com/go-openapi/validate v0.19.7/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= +github.com/go-openapi/validate v0.19.8 h1:YFzsdWIDfVuLvIOF+ZmKjVg1MbPJ1QgY9PihMwei1ys= +github.com/go-openapi/validate v0.19.8/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU= github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= @@ -718,9 +725,6 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69 github.com/gojek/fiber v0.2.1-rc2 h1:hJPaH4jDlIBhfRKQby2CISPnbSh7vx5S996IvuXA34U= github.com/gojek/fiber v0.2.1-rc2/go.mod h1:R5cRkUnXdTLpdchCkm3lmGJS+nfhPhLDOklRq1T65Jg= github.com/gojek/heimdall/v7 v7.0.2/go.mod h1:Z43HtMid7ysSjmsedPTXAki6jcdcNVnjn5pmsTyiMic= -github.com/gojek/merlin/api v0.0.0-20210723093139-cc0240032d58 h1:8cVTLtTFHjfoTKQyL4sMSnfmTlTJU+Cizfy4hzRl2Tg= -github.com/gojek/merlin/api v0.0.0-20210723093139-cc0240032d58/go.mod h1:FYMy4bZcts0UkTDE/rgGRWTOG4sUc5NvkljQqw4C8AE= -github.com/gojek/merlin/python/batch-predictor v0.0.0-20210723093139-cc0240032d58/go.mod h1:6bIwAgLu3zvo/0u9W95zuFglJHSfXrVJZ05E/dCSUfM= github.com/gojek/mlp v0.0.0-20201002030420-4e35e69a9ab8/go.mod h1:IjQCiAzap7TZRZVZ4r2RdzVTuAzoyR5el2GgEu2X1FM= github.com/gojek/mlp v1.7.6-0.20230329030735-c28dca2aeef9 h1:R6sFh5lqE8ulke5nDQrLTQPbsNhk80gMeBC7qcOoBeo= github.com/gojek/mlp v1.7.6-0.20230329030735-c28dca2aeef9/go.mod h1:HJDSyFXHB9FG479T0mrQ6cBDdftZ7an/3HfFxRGu3BA= @@ -927,8 +931,9 @@ github.com/hashicorp/consul/api v1.10.1/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/ github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= 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.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= @@ -952,8 +957,9 @@ github.com/hashicorp/go-plugin v1.4.3 h1:DXmvivbWD5qdiBts9TpBC7BYL1Aia5sxbRgQB+v github.com/hashicorp/go-plugin v1.4.3/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ= github.com/hashicorp/go-retryablehttp v0.5.4/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-retryablehttp v0.6.4/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= -github.com/hashicorp/go-retryablehttp v0.6.6 h1:HJunrbHTDDbBb/ay4kxa1n+dLmttUlnP3V9oNE4hmsM= github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= +github.com/hashicorp/go-retryablehttp v0.7.0 h1:eu1EI/mbirUgP5C8hVsTNaGZreBDlYiwC1FZWkvQPQ4= +github.com/hashicorp/go-retryablehttp v0.7.0/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-rootcerts v1.0.1/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= @@ -1260,7 +1266,6 @@ github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR 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/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= -github.com/mitchellh/protoc-gen-go-json v1.0.0/go.mod h1:RB1NY3ZteDVJDkCF+RJz0/zRd/FV5XR7RGRp4OIkIFI= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= @@ -1448,8 +1453,8 @@ github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQ github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.11.1 h1:+4eQaD7vAZ6DsfsxB15hbE0odUjGI5ARs9yskGu1v4s= -github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk= +github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= @@ -1469,8 +1474,9 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.28.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.31.1 h1:d18hG4PkHnNAKNMOmFuXFaiY8Us0nird/2m60uS1AMs= github.com/prometheus/common v0.31.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= +github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1483,8 +1489,9 @@ github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDa github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= +github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/statsd_exporter v0.21.0 h1:hA05Q5RFeIjgwKIYEdFd59xu5Wwaznf33yKI+pyX6T8= github.com/prometheus/statsd_exporter v0.21.0/go.mod h1:rbT83sZq2V+p73lHhPZfMc3MLCHmSHelCh9hSGYNLTQ= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= @@ -1991,8 +1998,8 @@ golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw= -golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= +golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/oauth2 v0.0.0-20180603041954-1e0a3fa8ba9a/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180724155351-3d292e4d0cdc/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -2147,6 +2154,7 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -2158,14 +2166,14 @@ golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18= -golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.4.0 h1:O7UWfv5+A2qiuulQk30kVinPoMtoIPeVaKLEgLpVkvg= -golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= +golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2177,8 +2185,8 @@ 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.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k= -golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= 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= @@ -2189,8 +2197,8 @@ golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44= -golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 h1:M73Iuj3xbbb9Uk1DYhzydthsj6oOd6l9bpuFcNoUvTs= +golang.org/x/time v0.0.0-20220224211638-0e9765cccd65/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180314180217-d853e8088c62/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -2309,6 +2317,7 @@ gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJ gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= gonum.org/v1/gonum v0.6.2/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU= +gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ= @@ -2641,8 +2650,6 @@ knative.dev/hack v0.0.0-20211101195839-11d193bf617b/go.mod h1:PHt8x8yX5Z9pPquBEf knative.dev/hack v0.0.0-20211122163517-fe1340f21191/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= knative.dev/networking v0.0.0-20211101215640-8c71a2708e7d h1:nCnuNfcLWuyAdZYgVfwSooa3+p2ebx+V+qhGXXF/FIk= knative.dev/networking v0.0.0-20211101215640-8c71a2708e7d/go.mod h1:7SKKM4MsBANrXNRZhb/zMkNjTdxYbNjwQDWgu+Fyye4= -knative.dev/pkg v0.0.0-20191217184203-cf220a867b3d/go.mod h1:pgODObA1dTyhNoFxPZTTjNWfx6F0aKsKzn+vaT9XO/Q= -knative.dev/pkg v0.0.0-20211101212339-96c0204a70dc/go.mod h1:SkfDk9bWIiNZD7XtILGkG7AKVyF/M6M0bGxLgl0SYL8= knative.dev/pkg v0.0.0-20220222221138-929d328ad73c h1:rgbAOzxv+3wBR8MqU8LZO+5qDmysbhNOocbgQwF0q5I= knative.dev/pkg v0.0.0-20220222221138-929d328ad73c/go.mod h1:SkfDk9bWIiNZD7XtILGkG7AKVyF/M6M0bGxLgl0SYL8= knative.dev/serving v0.11.0/go.mod h1:x2n255JS2XBI39tmjZ8CwTxIf9EKNMCrkVuiOttLRm0= diff --git a/api/turing/api/alerts_api_test.go b/api/turing/api/alerts_api_test.go index ad786e7cc..6c411b36d 100644 --- a/api/turing/api/alerts_api_test.go +++ b/api/turing/api/alerts_api_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/mock" - merlin "github.com/gojek/merlin/client" + merlin "github.com/caraml-dev/merlin/client" mlp "github.com/gojek/mlp/api/client" testifyAssert "github.com/stretchr/testify/assert" "gotest.tools/assert" diff --git a/api/turing/api/appcontext_test.go b/api/turing/api/appcontext_test.go index b62a89293..9eaa4c2fc 100644 --- a/api/turing/api/appcontext_test.go +++ b/api/turing/api/appcontext_test.go @@ -4,8 +4,9 @@ import ( "testing" "time" + //nolint:all "bou.ke/monkey" - merlin "github.com/gojek/merlin/client" + merlin "github.com/caraml-dev/merlin/client" mlpcluster "github.com/gojek/mlp/api/pkg/cluster" "github.com/gojek/mlp/api/pkg/instrumentation/sentry" "github.com/stretchr/testify/assert" diff --git a/api/turing/api/deployment_controller.go b/api/turing/api/deployment_controller.go index be75dc74a..b36dc8363 100644 --- a/api/turing/api/deployment_controller.go +++ b/api/turing/api/deployment_controller.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - merlin "github.com/gojek/merlin/client" + merlin "github.com/caraml-dev/merlin/client" mlp "github.com/gojek/mlp/api/client" "github.com/caraml-dev/turing/api/turing/models" diff --git a/api/turing/api/deployment_controller_test.go b/api/turing/api/deployment_controller_test.go index d9f1afded..52f306b39 100644 --- a/api/turing/api/deployment_controller_test.go +++ b/api/turing/api/deployment_controller_test.go @@ -7,16 +7,17 @@ import ( "fmt" "testing" + merlin "github.com/caraml-dev/merlin/client" + mlp "github.com/gojek/mlp/api/client" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/mock" + "github.com/stretchr/testify/require" + "github.com/caraml-dev/turing/api/turing/config" "github.com/caraml-dev/turing/api/turing/models" "github.com/caraml-dev/turing/api/turing/service" "github.com/caraml-dev/turing/api/turing/service/mocks" "github.com/caraml-dev/turing/engines/experiment/manager" - merlin "github.com/gojek/merlin/client" - mlp "github.com/gojek/mlp/api/client" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/mock" - "github.com/stretchr/testify/require" ) func TestDeployVersionSuccess(t *testing.T) { diff --git a/api/turing/api/ensembling_job_api_it_test.go b/api/turing/api/ensembling_job_api_it_test.go index 1dd2bd523..bc83709e1 100644 --- a/api/turing/api/ensembling_job_api_it_test.go +++ b/api/turing/api/ensembling_job_api_it_test.go @@ -15,7 +15,7 @@ import ( "github.com/caraml-dev/turing/api/turing/config" "github.com/caraml-dev/turing/api/turing/server" - merlin "github.com/gojek/merlin/client" + merlin "github.com/caraml-dev/merlin/client" mlp "github.com/gojek/mlp/api/client" "github.com/stretchr/testify/mock" "gotest.tools/assert" diff --git a/api/turing/api/ensembling_job_api_test.go b/api/turing/api/ensembling_job_api_test.go index 34eef0292..f52ebafa5 100644 --- a/api/turing/api/ensembling_job_api_test.go +++ b/api/turing/api/ensembling_job_api_test.go @@ -7,7 +7,7 @@ import ( "github.com/caraml-dev/turing/api/turing/batch" - merlin "github.com/gojek/merlin/client" + merlin "github.com/caraml-dev/merlin/client" mlp "github.com/gojek/mlp/api/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/api/turing/api/router_versions_api_test.go b/api/turing/api/router_versions_api_test.go index 2dbc86a21..09ae24292 100644 --- a/api/turing/api/router_versions_api_test.go +++ b/api/turing/api/router_versions_api_test.go @@ -4,7 +4,7 @@ import ( "errors" "testing" - merlin "github.com/gojek/merlin/client" + merlin "github.com/caraml-dev/merlin/client" mlp "github.com/gojek/mlp/api/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/api/turing/api/routers_api_test.go b/api/turing/api/routers_api_test.go index d584efe3d..da0a21c35 100644 --- a/api/turing/api/routers_api_test.go +++ b/api/turing/api/routers_api_test.go @@ -4,7 +4,7 @@ import ( "errors" "testing" - merlin "github.com/gojek/merlin/client" + merlin "github.com/caraml-dev/merlin/client" mlp "github.com/gojek/mlp/api/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/api/turing/cluster/controller_test.go b/api/turing/cluster/controller_test.go index a5ecafd42..722f69b35 100644 --- a/api/turing/cluster/controller_test.go +++ b/api/turing/cluster/controller_test.go @@ -10,6 +10,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" + //nolint:all "bou.ke/monkey" sparkv1beta2 "github.com/GoogleCloudPlatform/spark-on-k8s-operator/pkg/apis/sparkoperator.k8s.io/v1beta2" diff --git a/api/turing/config/config.go b/api/turing/config/config.go index 53b954833..ebd17236e 100644 --- a/api/turing/config/config.go +++ b/api/turing/config/config.go @@ -9,8 +9,6 @@ import ( "strings" "time" - "io/ioutil" - "github.com/go-playground/validator/v10" "github.com/gojek/mlp/api/pkg/instrumentation/newrelic" "github.com/gojek/mlp/api/pkg/instrumentation/sentry" @@ -61,7 +59,7 @@ func (qty *Quantity) MarshalJSON() ([]byte, error) { type EngineConfig map[string]interface{} // EnvironmentConfig is a abridged version of -// https://github.dev/gojek/merlin/blob/98ada0d3aa8de30d73e441d3fd1000fe5d5ac266/api/config/environment.go#L26 +// https://github.dev/caraml-dev/merlin/blob/98ada0d3aa8de30d73e441d3fd1000fe5d5ac266/api/config/environment.go#L26 // Only requires Name and K8sConfig // This struct should be removed when Environments API is moved from Merlin to MLP type EnvironmentConfig struct { @@ -372,7 +370,7 @@ func (c *ClusterConfig) ProcessEnvConfigs() error { if c.InClusterConfig { return nil } - envConfig, err := ioutil.ReadFile(c.EnvironmentConfigPath) + envConfig, err := os.ReadFile(c.EnvironmentConfigPath) if err != nil { return err } diff --git a/api/turing/service/alert_service.go b/api/turing/service/alert_service.go index fe116e7c7..ef9256e98 100644 --- a/api/turing/service/alert_service.go +++ b/api/turing/service/alert_service.go @@ -7,7 +7,7 @@ import ( "path" "text/template" - merlin "github.com/gojek/merlin/client" + merlin "github.com/caraml-dev/merlin/client" mlp "github.com/gojek/mlp/api/client" "github.com/caraml-dev/turing/api/turing/config" diff --git a/api/turing/service/alert_service_test.go b/api/turing/service/alert_service_test.go index 8409de8ff..5e8a79fee 100644 --- a/api/turing/service/alert_service_test.go +++ b/api/turing/service/alert_service_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - merlin "github.com/gojek/merlin/client" + merlin "github.com/caraml-dev/merlin/client" mlp "github.com/gojek/mlp/api/client" "github.com/caraml-dev/turing/api/turing/config" diff --git a/api/turing/service/mlp_service.go b/api/turing/service/mlp_service.go index 26389bf10..1426d6651 100644 --- a/api/turing/service/mlp_service.go +++ b/api/turing/service/mlp_service.go @@ -7,9 +7,9 @@ import ( "time" "github.com/antihax/optional" + merlin "github.com/caraml-dev/merlin/client" "github.com/caraml-dev/turing/api/turing/log" "github.com/caraml-dev/turing/api/turing/models" - merlin "github.com/gojek/merlin/client" mlp "github.com/gojek/mlp/api/client" "github.com/gojek/mlp/api/pkg/auth" "github.com/patrickmn/go-cache" @@ -80,7 +80,7 @@ func NewMLPService( ) (MLPService, error) { // Create an HTTP client with Google default credential. // Following this approach: - // https://github.com/gojek/merlin/blob/7fb3bcd28de9c8007e14da40f0dd84be19cebe3b/api/cmd/main.go#L115 + // https://github.com/caraml-dev/merlin/blob/7fb3bcd28de9c8007e14da40f0dd84be19cebe3b/api/cmd/main.go#L115 httpClient := http.DefaultClient googleClient, err := auth.InitGoogleClient(context.Background()) diff --git a/api/turing/service/mlp_service_test.go b/api/turing/service/mlp_service_test.go index 5028d01ed..e42509443 100644 --- a/api/turing/service/mlp_service_test.go +++ b/api/turing/service/mlp_service_test.go @@ -8,6 +8,7 @@ import ( "testing" "time" + //nolint:all "bou.ke/monkey" "github.com/gojek/mlp/api/pkg/auth" "github.com/patrickmn/go-cache" @@ -15,7 +16,7 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/oauth2/google" - merlin "github.com/gojek/merlin/client" + merlin "github.com/caraml-dev/merlin/client" mlp "github.com/gojek/mlp/api/client" ) diff --git a/api/turing/service/mocks/alert_service.go b/api/turing/service/mocks/alert_service.go index a9721fa01..f18983eb7 100644 --- a/api/turing/service/mocks/alert_service.go +++ b/api/turing/service/mocks/alert_service.go @@ -3,7 +3,7 @@ package mocks import ( - merlinclient "github.com/gojek/merlin/client" + merlinclient "github.com/caraml-dev/merlin/client" client "github.com/gojek/mlp/api/client" mock "github.com/stretchr/testify/mock" diff --git a/api/turing/service/mocks/mlp_service.go b/api/turing/service/mocks/mlp_service.go index 4df880c97..e7292b665 100644 --- a/api/turing/service/mocks/mlp_service.go +++ b/api/turing/service/mocks/mlp_service.go @@ -3,7 +3,7 @@ package mocks import ( - client "github.com/gojek/merlin/client" + client "github.com/caraml-dev/merlin/client" apiclient "github.com/gojek/mlp/api/client" diff --git a/api/turing/service/mocks/router_deployment_service.go b/api/turing/service/mocks/router_deployment_service.go index 40d8a30a9..81ec7f60d 100644 --- a/api/turing/service/mocks/router_deployment_service.go +++ b/api/turing/service/mocks/router_deployment_service.go @@ -7,7 +7,7 @@ import ( client "github.com/gojek/mlp/api/client" - merlinclient "github.com/gojek/merlin/client" + merlinclient "github.com/caraml-dev/merlin/client" mock "github.com/stretchr/testify/mock" diff --git a/api/turing/service/router_deployment_service.go b/api/turing/service/router_deployment_service.go index 859d874bb..1aa9afc40 100644 --- a/api/turing/service/router_deployment_service.go +++ b/api/turing/service/router_deployment_service.go @@ -9,7 +9,7 @@ import ( "sync" "time" - merlin "github.com/gojek/merlin/client" + merlin "github.com/caraml-dev/merlin/client" mlp "github.com/gojek/mlp/api/client" "github.com/pkg/errors" "k8s.io/apimachinery/pkg/api/resource" diff --git a/api/turing/service/router_deployment_service_test.go b/api/turing/service/router_deployment_service_test.go index e71391eb6..6bd3aa482 100644 --- a/api/turing/service/router_deployment_service_test.go +++ b/api/turing/service/router_deployment_service_test.go @@ -11,7 +11,7 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" - merlin "github.com/gojek/merlin/client" + merlin "github.com/caraml-dev/merlin/client" mlp "github.com/gojek/mlp/api/client" "github.com/pkg/errors" diff --git a/api/turing/service/router_monitoring_service_test.go b/api/turing/service/router_monitoring_service_test.go index 06be3a5a0..07392e7e0 100644 --- a/api/turing/service/router_monitoring_service_test.go +++ b/api/turing/service/router_monitoring_service_test.go @@ -9,7 +9,7 @@ import ( "github.com/caraml-dev/turing/api/turing/service" "github.com/caraml-dev/turing/api/turing/service/mocks" - merlin "github.com/gojek/merlin/client" + merlin "github.com/caraml-dev/merlin/client" mlp "github.com/gojek/mlp/api/client" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/api/turing/service/router_service_test.go b/api/turing/service/router_service_test.go index ab4d54a77..a64d061db 100644 --- a/api/turing/service/router_service_test.go +++ b/api/turing/service/router_service_test.go @@ -9,7 +9,7 @@ import ( "github.com/caraml-dev/turing/api/turing/service" "github.com/caraml-dev/turing/api/turing/service/mocks" - merlin "github.com/gojek/merlin/client" + merlin "github.com/caraml-dev/merlin/client" mlp "github.com/gojek/mlp/api/client" "github.com/stretchr/testify/assert" mock "github.com/stretchr/testify/mock" diff --git a/api/turing/service/router_version_service_test.go b/api/turing/service/router_version_service_test.go index 2b4fbe206..d402e162e 100644 --- a/api/turing/service/router_version_service_test.go +++ b/api/turing/service/router_version_service_test.go @@ -10,7 +10,7 @@ import ( "github.com/caraml-dev/turing/api/turing/service" "github.com/caraml-dev/turing/api/turing/service/mocks" - merlin "github.com/gojek/merlin/client" + merlin "github.com/caraml-dev/merlin/client" mlp "github.com/gojek/mlp/api/client" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" diff --git a/docs/README.md b/docs/README.md index 3f9076ad9..896d21410 100644 --- a/docs/README.md +++ b/docs/README.md @@ -2,7 +2,7 @@ ## What is Turing? -Turing is a fast, scalable and extensible system that can be used to design, deploy and evaluate ML experiments in production. It takes care of the core Engineering aspects of experimentation such as traffic routing, outcome logging, system monitoring, etc. and is designed to work with pluggable Experiment Engines, pre and post processors. It is backed by existing systems like [Merlin](https://github.com/gojek/merlin) for model endpoints. +Turing is a fast, scalable and extensible system that can be used to design, deploy and evaluate ML experiments in production. It takes care of the core Engineering aspects of experimentation such as traffic routing, outcome logging, system monitoring, etc. and is designed to work with pluggable Experiment Engines, pre and post processors. It is backed by existing systems like [Merlin](https://github.com/caraml-dev/merlin) for model endpoints. ## Features * Low-latency, high-throughput traffic routing to an unlimited number of ML models. diff --git a/docs/how-to/create-a-router/configure-general-settings.md b/docs/how-to/create-a-router/configure-general-settings.md index d898649b1..109676623 100644 --- a/docs/how-to/create-a-router/configure-general-settings.md +++ b/docs/how-to/create-a-router/configure-general-settings.md @@ -2,7 +2,7 @@ There are 4 required inputs: -**Environment**: A drop down menu of the target environment your router will be deployed to. This is set [here](https://github.com/gojek/merlin/blob/main/charts/merlin/values.yaml#L102-L130). An example used in Turing is [here](https://github.com/caraml-dev/turing/blob/main/infra/docker-compose/dev/merlin/deployment-config.yaml). As Turing manages multiple deployment environments, you are free to choose which environment your router will be deployed in. +**Environment**: A drop down menu of the target environment your router will be deployed to. This is set [here](https://github.com/caraml-dev/merlin/blob/main/charts/merlin/values.yaml#L102-L130). An example used in Turing is [here](https://github.com/caraml-dev/turing/blob/main/infra/docker-compose/dev/merlin/deployment-config.yaml). As Turing manages multiple deployment environments, you are free to choose which environment your router will be deployed in. **Protocol**: Protocol of router, currently HTTP and UPI (gRPC) are supported. diff --git a/engines/experiment/docs/developer_guide.md b/engines/experiment/docs/developer_guide.md index 7dee9bd38..9ab33ada9 100644 --- a/engines/experiment/docs/developer_guide.md +++ b/engines/experiment/docs/developer_guide.md @@ -3,7 +3,7 @@ ## Local Development ### Requirements -- Golang 1.18 +- Golang 1.20 ## Adding a new Experiment Engine diff --git a/engines/experiment/docs/rpc_plugins.md b/engines/experiment/docs/rpc_plugins.md index 5cd0581d8..f2421be8d 100644 --- a/engines/experiment/docs/rpc_plugins.md +++ b/engines/experiment/docs/rpc_plugins.md @@ -30,7 +30,7 @@ experiment treatment to each incoming request to the router. ![experiment_manager_data_types](./assets/exp_runner_plugin_diagram.png) ### Pre-requisites - * Golang 1.18 + * Golang 1.20 * Git * Docker @@ -71,7 +71,7 @@ library, which is added into the plugin module as the dependency in [`go.mod`](. ```shell module github.com/caraml-dev/turing/engines/experiment/examples/plugins/hardcoded -go 1.18 +go 1.20 require github.com/caraml-dev/turing/engines/experiment v1.0.0 diff --git a/engines/experiment/examples/plugins/hardcoded/Dockerfile b/engines/experiment/examples/plugins/hardcoded/Dockerfile index 326c80335..feaf89a43 100644 --- a/engines/experiment/examples/plugins/hardcoded/Dockerfile +++ b/engines/experiment/examples/plugins/hardcoded/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.18-alpine as builder +FROM golang:1.20-alpine as builder ARG binary_name="plugin" ARG project_root=github.com/caraml-dev/turing/engines/experiment/examples/plugins/hardcoded/cmd diff --git a/engines/experiment/examples/plugins/hardcoded/go.mod b/engines/experiment/examples/plugins/hardcoded/go.mod index fe078b8cd..418c59eef 100644 --- a/engines/experiment/examples/plugins/hardcoded/go.mod +++ b/engines/experiment/examples/plugins/hardcoded/go.mod @@ -1,6 +1,6 @@ module github.com/caraml-dev/turing/engines/experiment/examples/plugins/hardcoded -go 1.18 +go 1.20 require ( github.com/caraml-dev/turing/engines/experiment v1.0.0 diff --git a/engines/experiment/go.mod b/engines/experiment/go.mod index d15b94ef9..9b1d5138a 100644 --- a/engines/experiment/go.mod +++ b/engines/experiment/go.mod @@ -1,6 +1,6 @@ module github.com/caraml-dev/turing/engines/experiment -go 1.18 +go 1.20 require ( bou.ke/monkey v1.0.2 diff --git a/engines/router/Dockerfile b/engines/router/Dockerfile index 9c827fb81..7f98992be 100644 --- a/engines/router/Dockerfile +++ b/engines/router/Dockerfile @@ -1,5 +1,5 @@ # Build application binary -FROM golang:1.18-alpine as builder +FROM golang:1.20-alpine as builder ARG BIN_NAME=turing-router ARG VERSION ARG USER diff --git a/engines/router/README.md b/engines/router/README.md index 77b4d2158..a72b0ab6d 100644 --- a/engines/router/README.md +++ b/engines/router/README.md @@ -4,7 +4,7 @@ Turing enables DS teams to run ML experiments in the production environment. ## Local Development Requirements: -* Golang 1.18 +* Golang 1.20 ### Running the Turing Router locally 1. Provide configs for the turing router. Some sample configs are in `configs/` diff --git a/engines/router/go.mod b/engines/router/go.mod index cfa45aaca..ce1f62162 100644 --- a/engines/router/go.mod +++ b/engines/router/go.mod @@ -1,6 +1,6 @@ module github.com/caraml-dev/turing/engines/router -go 1.18 +go 1.20 require ( bou.ke/monkey v1.0.2 diff --git a/engines/router/missionctl/fiberapi/fan_in_test.go b/engines/router/missionctl/fiberapi/fan_in_test.go index 2a5a6a0c4..27a8b8d14 100644 --- a/engines/router/missionctl/fiberapi/fan_in_test.go +++ b/engines/router/missionctl/fiberapi/fan_in_test.go @@ -11,6 +11,7 @@ import ( "testing" "time" + //nolint:all "bou.ke/monkey" "github.com/gojek/fiber" fiberHttp "github.com/gojek/fiber/http" diff --git a/engines/router/missionctl/fiberapi/internal/testutils/helpers.go b/engines/router/missionctl/fiberapi/internal/testutils/helpers.go index 6021f10f8..7d6320d19 100644 --- a/engines/router/missionctl/fiberapi/internal/testutils/helpers.go +++ b/engines/router/missionctl/fiberapi/internal/testutils/helpers.go @@ -1,7 +1,7 @@ package testutils import ( - "io/ioutil" + "io" "net/http" "strings" "testing" @@ -35,7 +35,7 @@ func NewFiberCaller(t testing.TB, callerID string) fiber.Component { func NewHTTPFiberRequest(t testing.TB, header http.Header, body string) fiber.Request { r, err := fiberHttp.NewHTTPRequest(&http.Request{ Header: header, - Body: ioutil.NopCloser(strings.NewReader(body)), + Body: io.NopCloser(strings.NewReader(body)), }) if err != nil { t.Fatal(err) diff --git a/engines/router/missionctl/log/resultlog/fluentd_test.go b/engines/router/missionctl/log/resultlog/fluentd_test.go index d4c43cbce..37ea2f078 100644 --- a/engines/router/missionctl/log/resultlog/fluentd_test.go +++ b/engines/router/missionctl/log/resultlog/fluentd_test.go @@ -3,6 +3,7 @@ package resultlog import ( "testing" + //nolint:all "bou.ke/monkey" "github.com/fluent/fluent-logger-golang/fluent" "github.com/stretchr/testify/assert" diff --git a/engines/router/missionctl/mission_control_upi_test.go b/engines/router/missionctl/mission_control_upi_test.go index c574598af..dbfa1241c 100644 --- a/engines/router/missionctl/mission_control_upi_test.go +++ b/engines/router/missionctl/mission_control_upi_test.go @@ -3,7 +3,7 @@ package missionctl import ( "bytes" "context" - "io/ioutil" + "io" "net/http" "os" "testing" @@ -163,7 +163,7 @@ func Test_missionControlUpi_Route(t *testing.T) { mockReturn: fiber.NewResponseQueueFromResponses(fiberHttp.NewHTTPResponse( &http.Response{ StatusCode: http.StatusOK, - Body: ioutil.NopCloser(bytes.NewReader([]byte("dummy res"))), + Body: io.NopCloser(bytes.NewReader([]byte("dummy res"))), })), }, } diff --git a/engines/router/traffic_rule_condition_test.go b/engines/router/traffic_rule_condition_test.go index 3202debd8..7098e08fd 100644 --- a/engines/router/traffic_rule_condition_test.go +++ b/engines/router/traffic_rule_condition_test.go @@ -2,7 +2,7 @@ package router_test import ( "encoding/json" - "io/ioutil" + "io" "net/http" "strings" "testing" @@ -223,7 +223,7 @@ func TestTrafficRuleCondition_TestRequest(t *testing.T) { t.Run(name, func(t *testing.T) { r, _ := fiberHttp.NewHTTPRequest(&http.Request{ Header: tt.header, - Body: ioutil.NopCloser(strings.NewReader(tt.payload)), + Body: io.NopCloser(strings.NewReader(tt.payload)), }) actual, err := tt.condition.TestRequest(r) diff --git a/infra/charts/turing/subcharts/merlin/README.md b/infra/charts/turing/subcharts/merlin/README.md index 2ba2e9440..f0ea01411 100644 --- a/infra/charts/turing/subcharts/merlin/README.md +++ b/infra/charts/turing/subcharts/merlin/README.md @@ -78,7 +78,7 @@ The following table lists the configurable parameters of the Turing chart and th | authorization.enabled | bool | `false` | | | authorization.serverUrl | string | `"http://mlp-authorization-keto"` | | | dockerRegistries | string | `"docker.io,ghcr.io/gojek"` | | -| docsURL | string | `"https://github.com/gojek/merlin/blob/main/docs/getting-started/README.md"` | | +| docsURL | string | `"https://github.com/caraml-dev/merlin/blob/main/docs/getting-started/README.md"` | | | environment | string | `"dev"` | | | environmentConfigs[0].cluster | string | `"dev"` | | | environmentConfigs[0].cpu_limit | string | `"400m"` | | @@ -108,17 +108,17 @@ The following table lists the configurable parameters of the Turing chart and th | homepage | string | `"/merlin"` | | | image.pullPolicy | string | `"IfNotPresent"` | | | image.registry | string | `"ghcr.io"` | | -| image.repository | string | `"gojek/merlin"` | | +| image.repository | string | `"caraml-dev/merlin"` | | | image.tag | string | `"v0.9.1"` | | | imageBuilder.baseImage | string | `""` | | -| imageBuilder.buildContextURI | string | `"git://TOKEN@github.com/gojek/merlin.git#refs/tags/v0.1"` | | +| imageBuilder.buildContextURI | string | `"git://TOKEN@github.com/caraml-dev/merlin.git#refs/tags/v0.1"` | | | imageBuilder.clusterName | string | `"dev"` | | | imageBuilder.contextSubPath | string | `"python/pyfunc-server"` | | | imageBuilder.dockerRegistry | string | `"gojek"` | | | imageBuilder.dockerfilePath | string | `"./Dockerfile"` | | | imageBuilder.namespace | string | `"mlp"` | | | imageBuilder.predictionJobBaseImage | string | `"gojek/mlp/merlin-pyspark:v0.4.1"` | | -| imageBuilder.predictionJobBuildContextURI | string | `"git://TOKEN@github.com/gojek/merlin.git#refs/tags/v0.1"` | | +| imageBuilder.predictionJobBuildContextURI | string | `"git://TOKEN@github.com/caraml-dev/merlin.git#refs/tags/v0.1"` | | | imageBuilder.predictionJobContextSubPath | string | `"python/batch-predictor"` | | | imageBuilder.predictionJobDockerfilePath | string | `"docker/app.Dockerfile"` | | | imageBuilder.timeout | string | `"30m"` | | diff --git a/infra/charts/turing/subcharts/merlin/values.yaml b/infra/charts/turing/subcharts/merlin/values.yaml index 289ca8387..6885ef019 100644 --- a/infra/charts/turing/subcharts/merlin/values.yaml +++ b/infra/charts/turing/subcharts/merlin/values.yaml @@ -5,7 +5,7 @@ global: image: pullPolicy: IfNotPresent registry: ghcr.io - repository: gojek/merlin + repository: caraml-dev/merlin tag: v0.9.1 replicaCount: "1" resources: @@ -26,7 +26,7 @@ ingress: environment: dev homepage: /merlin apiHost: http://merlin.mlp/v1 -docsURL: "https://github.com/gojek/merlin/blob/main/docs/getting-started/README.md" +docsURL: "https://github.com/caraml-dev/merlin/blob/main/docs/getting-started/README.md" # Comma-separated value of Docker registries that can be chosen in deployment page dockerRegistries: docker.io,ghcr.io/gojek @@ -38,10 +38,10 @@ mlpApi: imageBuilder: clusterName: "dev" - buildContextURI: "git://TOKEN@github.com/gojek/merlin.git#refs/tags/v0.1" + buildContextURI: "git://TOKEN@github.com/caraml-dev/merlin.git#refs/tags/v0.1" baseImage: "" dockerfilePath: "./Dockerfile" - predictionJobBuildContextURI: "git://TOKEN@github.com/gojek/merlin.git#refs/tags/v0.1" + predictionJobBuildContextURI: "git://TOKEN@github.com/caraml-dev/merlin.git#refs/tags/v0.1" predictionJobBaseImage: "gojek/mlp/merlin-pyspark:v0.4.1" predictionJobDockerfilePath: "docker/app.Dockerfile" namespace: "mlp" diff --git a/infra/charts/turing/subcharts/mlp/README.md b/infra/charts/turing/subcharts/mlp/README.md index 3f58fa616..201894312 100644 --- a/infra/charts/turing/subcharts/mlp/README.md +++ b/infra/charts/turing/subcharts/mlp/README.md @@ -71,7 +71,7 @@ The following table lists the configurable parameters of the Turing chart and th | authorization.enabled | bool | `false` | | | authorization.serverUrl | string | `"http://mlp-authorization-keto"` | | | dbMigrations.image.tag | string | `"v4.7.1"` | | -| docs[0].href | string | `"https://github.com/gojek/merlin/blob/main/docs/getting-started/README.md"` | | +| docs[0].href | string | `"https://github.com/caraml-dev/merlin/blob/main/docs/getting-started/README.md"` | | | docs[0].label | string | `"Merlin User Guide"` | | | docs[1].href | string | `"https://github.com/caraml-dev/turing"` | | | docs[1].label | string | `"Turing User Guide"` | | diff --git a/infra/charts/turing/subcharts/mlp/values.yaml b/infra/charts/turing/subcharts/mlp/values.yaml index 32abe26f0..fe5e03d23 100644 --- a/infra/charts/turing/subcharts/mlp/values.yaml +++ b/infra/charts/turing/subcharts/mlp/values.yaml @@ -57,7 +57,7 @@ docs: [ { "label": "Merlin User Guide", - "href": "https://github.com/gojek/merlin/blob/main/docs/getting-started/README.md" + "href": "https://github.com/caraml-dev/merlin/blob/main/docs/getting-started/README.md" }, { "label": "Turing User Guide", diff --git a/infra/docker-compose/dev/docker-compose.yml b/infra/docker-compose/dev/docker-compose.yml index 37f36dca3..025370e8e 100644 --- a/infra/docker-compose/dev/docker-compose.yml +++ b/infra/docker-compose/dev/docker-compose.yml @@ -179,7 +179,7 @@ services: POSTGRESQL_PASSWORD: merlin merlin: - image: ghcr.io/gojek/merlin:v0.8.0-alpha + image: ghcr.io/caraml-dev/merlin:v0.8.0-alpha restart: on-failure volumes: - "./merlin/deployment-config.yaml:/deployment-config.yaml" diff --git a/infra/docker-compose/dev/merlin/dev.env b/infra/docker-compose/dev/merlin/dev.env index 010b63b7f..6ff058921 100644 --- a/infra/docker-compose/dev/merlin/dev.env +++ b/infra/docker-compose/dev/merlin/dev.env @@ -21,7 +21,7 @@ IMG_BUILDER_CLUSTER_NAME=k3s # IMG_BUILDER_BUILD_CONTEXT_URI= # IMG_BUILDER_PREDICTION_JOB_BUILD_CONTEXT_URI= IMG_BUILDER_PREDICTION_JOB_DOCKERFILE_PATH=docker/app.Dockerfile -IMG_BUILDER_PREDICTION_JOB_BASE_IMAGE=ghcr.io/gojek/merlin-pyspark-base:v0.7.0 +IMG_BUILDER_PREDICTION_JOB_BASE_IMAGE=ghcr.io/caraml-dev/merlin-pyspark-base:v0.7.0 IMG_BUILDER_NAMESPACE=mlp IMG_BUILDER_DOCKER_REGISTRY=ghcr.io/gojek IMG_BUILDER_TIMEOUT=10m