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
caraml-dev · Apr 5, 2023 · c59e6d5 · c59e6d5
1 parent 7670c82
commit c59e6d5
Show file tree

Hide file tree

Showing 58 changed files with 164 additions and 152 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -7,7 +7,7 @@ API for the Turing experimentation service.
 ### Local Development
 
 #### Requirements
-- Golang 1.18
+- Golang 1.20
 - Docker
 
 #### Setup