automatic tagging of docker images and integration test fixes (#42)

.circleci/config.yml

@@ -34,7 +34,7 @@ jobs:
           command: docker login ${DOCKER_REGISTRY} -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD}
       - run:
           name: "Seldon-core Domino Build & Push Script"
-          command: ./domino-build.sh
+          command: ./domino-build.sh -a
       - persist_to_workspace:
           root: ~/
           paths:
@@ -53,11 +53,11 @@ jobs:
           at: ~/
       - checkout
       - helm/install-helm-client:
-          version: v3.6.3
+          version: v3.13.1
       - run:
           name: Install and Launch Kubernetes
           command: |
-            curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=v1.24.3+k3s1 sh -x -
+            curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION=v1.28.3+k3s1 sh -x -
             sleep 10
             kubectl wait --for=condition=Available --timeout=60s deployments --all -n kube-system
       - run:
@@ -94,12 +94,12 @@ workflows:
             - org-global
           filters:
             tags:
-              only: /v\d+(\.\d+)*(-.*)*/
+              only: /\d+(\.\d+)*(-.*)*-rabbitmq(-.*)*/
       - test:
           context:
             - org-global
           requires:
             - build-and-push
           filters:
             tags:
-              only: /v\d+(\.\d+)*(-.*)*/
+              only: /\d+(\.\d+)*(-.*)*-rabbitmq(-.*)*/

.github/workflows/alibidetect_tests.yml

@@ -2,9 +2,9 @@ name: V1 Alibi Detect Tests
 
 on:
   push:
-    branches: [ master, rabbitmq* ]
+    branches: [ master ]
   pull_request:
-    branches: [ master, rabbitmq*  ]
+    branches: [ master  ]
 
 jobs:
   lint:

.github/workflows/alibiexplainer_tests.yml

@@ -2,9 +2,9 @@ name: V1 Alibi Explainer Tests
 
 on:
   push:
-    branches: [ master, rabbitmq* ]
+    branches: [ master ]
   pull_request:
-    branches: [ master, rabbitmq*  ]
+    branches: [ master ]
 
 jobs:
   lint:

.github/workflows/docs.yml

@@ -2,9 +2,9 @@ name: V1 Docs Test
 
 on:
   push:
-    branches: [ master, rabbitmq* ]
+    branches: [ master ]
   pull_request:
-    branches: [ master, rabbitmq*  ]
+    branches: [ master ]
 
 jobs:
   docs-lint:

.github/workflows/executor_lint.yml

@@ -15,7 +15,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-go@v3      
       with:
-        go-version: '^1.17.0'
+        go-version: '^1.20.0'
     - name: test-executor
       run: |
         make -C executor lint

.github/workflows/executor_tests.yml

@@ -15,7 +15,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-go@v3      
       with:
-        go-version: '^1.17.0'
+        go-version: '^1.20.0'
     - name: test-executor
       run: |
         make -C executor test

.github/workflows/operator_lint.yml

@@ -15,7 +15,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-go@v3      
       with:
-        go-version: '^1.17.0'
+        go-version: '^1.20.0'
     - name: test-executor
       run: |
         make -C operator lint

.github/workflows/operator_tests.yml

@@ -15,7 +15,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-go@v3      
       with:
-        go-version: '^1.17.0'
+        go-version: '^1.20.0'
     - name: test-operator
       run: |
         make -C operator test

.github/workflows/python_lint.yml

@@ -2,9 +2,9 @@ name: V1 Python Lint
 
 on:
   push:
-    branches: [ master, rabbitmq* ]
+    branches: [ master ]
   pull_request:
-    branches: [ master, rabbitmq*  ]
+    branches: [ master  ]
 
 jobs:
   python-lint:

.github/workflows/python_tests.yml

@@ -2,9 +2,9 @@ name: V1 Python Tests
 
 on:
   push:
-    branches: [ master, rabbitmq* ]
+    branches: [ master ]
   pull_request:
-    branches: [ master, rabbitmq*  ]
+    branches: [ master  ]
 
 jobs:
   python-tests:

.github/workflows/security_tests.yml

@@ -2,9 +2,9 @@ name: V1 Security Tests
 
 on:
   push:
-    branches: [ master, rabbitmq* ]
+    branches: [ master ]
   pull_request:
-    branches: [ master, rabbitmq*  ]
+    branches: [ master  ]
   workflow_dispatch:
 
 jobs:

domino-build.sh

@@ -2,20 +2,23 @@
 set -o nounset -o errexit -o pipefail
 set -e
 
-nopush_flag=''
-tag_arg=''
-while getopts 'nt:' flag; do
+AUTO_TAG_FLAG=''
+NO_PUSH_FLAG=''
+TAG_ARG=''
+while getopts 'ant:' flag; do
   case "${flag}" in
-    n) nopush_flag='true' ;;
-    t) tag_arg="${OPTARG}" ;;
+    a) AUTO_TAG_FLAG='true' ;;
+    n) NO_PUSH_FLAG='true' ;;
+    t) TAG_ARG="${OPTARG}" ;;
     *)
       echo "Unexpected option ${flag}"
       exit 1
       ;;
   esac
 done
-readonly nopush_flag
-readonly tag_arg
+readonly AUTO_TAG_FLAG
+readonly NO_PUSH_FLAG
+readonly TAG_ARG
 
 SELDON_REPO=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
@@ -31,21 +34,26 @@ if [ -n "${BRANCH_NAME}" ]; then
   TARGET_IMAGE_TAGS+=("${SOURCE_IMAGE_TAG}-${BRANCH_NAME}.latest")
 fi
 
-if [ -n "${tag_arg}" ]; then
-  TARGET_IMAGE_TAGS+=("${tag_arg}")
+if [ -n "${TAG_ARG}" ]; then
+  TARGET_IMAGE_TAGS+=("${TAG_ARG}")
+fi
+
+GIT_HEAD_TAG="$(git describe --tags --exact-match HEAD 2> /dev/null || echo "")"
+if [ -n "${AUTO_TAG_FLAG}" ] && [ -n "${GIT_HEAD_TAG}" ]; then
+  TARGET_IMAGE_TAGS+=("${GIT_HEAD_TAG}")
 fi
 
 echo -e "\n  Building operator...\n"
 cd "$SELDON_REPO/operator"
-make docker-build-no-test
+make docker-build
 
 echo -e "\n  Building executor...\n"
 cd "$SELDON_REPO/executor"
 make docker-build
 
 cd "${SELDON_REPO}"
 
-if [ "${nopush_flag}" == "" ]; then
+if [ -z "${NO_PUSH_FLAG}" ]; then
 
   if [ -f ~/.docker/config.json ] && [ "$(cat ~/.docker/config.json | jq '.auths | has("quay.io")')" == "true" ]; then
     echo -e "[Docker is already logged into quay.io, using existing credentials.]"

executor/licenses/dep.txt

@@ -1,13 +1,127 @@
 github.com/seldonio/seldon-core/executor
 cloud.google.com/go
+cloud.google.com/go/accessapproval
+cloud.google.com/go/accesscontextmanager
+cloud.google.com/go/aiplatform
+cloud.google.com/go/analytics
+cloud.google.com/go/apigateway
+cloud.google.com/go/apigeeconnect
+cloud.google.com/go/apigeeregistry
+cloud.google.com/go/apikeys
+cloud.google.com/go/appengine
+cloud.google.com/go/area120
+cloud.google.com/go/artifactregistry
+cloud.google.com/go/asset
+cloud.google.com/go/assuredworkloads
+cloud.google.com/go/automl
+cloud.google.com/go/baremetalsolution
+cloud.google.com/go/batch
+cloud.google.com/go/beyondcorp
 cloud.google.com/go/bigquery
+cloud.google.com/go/billing
+cloud.google.com/go/binaryauthorization
+cloud.google.com/go/certificatemanager
+cloud.google.com/go/channel
+cloud.google.com/go/cloudbuild
+cloud.google.com/go/clouddms
+cloud.google.com/go/cloudtasks
 cloud.google.com/go/compute
+cloud.google.com/go/compute/metadata
+cloud.google.com/go/contactcenterinsights
+cloud.google.com/go/container
+cloud.google.com/go/containeranalysis
+cloud.google.com/go/datacatalog
+cloud.google.com/go/dataflow
+cloud.google.com/go/dataform
+cloud.google.com/go/datafusion
+cloud.google.com/go/datalabeling
+cloud.google.com/go/dataplex
+cloud.google.com/go/dataproc
+cloud.google.com/go/dataqna
 cloud.google.com/go/datastore
+cloud.google.com/go/datastream
+cloud.google.com/go/deploy
+cloud.google.com/go/dialogflow
+cloud.google.com/go/dlp
+cloud.google.com/go/documentai
+cloud.google.com/go/domains
+cloud.google.com/go/edgecontainer
+cloud.google.com/go/errorreporting
+cloud.google.com/go/essentialcontacts
+cloud.google.com/go/eventarc
+cloud.google.com/go/filestore
 cloud.google.com/go/firestore
+cloud.google.com/go/functions
+cloud.google.com/go/gaming
+cloud.google.com/go/gkebackup
+cloud.google.com/go/gkeconnect
+cloud.google.com/go/gkehub
+cloud.google.com/go/gkemulticloud
+cloud.google.com/go/gsuiteaddons
 cloud.google.com/go/iam
+cloud.google.com/go/iap
+cloud.google.com/go/ids
+cloud.google.com/go/iot
+cloud.google.com/go/kms
+cloud.google.com/go/language
+cloud.google.com/go/lifesciences
+cloud.google.com/go/logging
+cloud.google.com/go/longrunning
+cloud.google.com/go/managedidentities
+cloud.google.com/go/maps
+cloud.google.com/go/mediatranslation
+cloud.google.com/go/memcache
+cloud.google.com/go/metastore
 cloud.google.com/go/monitoring
+cloud.google.com/go/networkconnectivity
+cloud.google.com/go/networkmanagement
+cloud.google.com/go/networksecurity
+cloud.google.com/go/notebooks
+cloud.google.com/go/optimization
+cloud.google.com/go/orchestration
+cloud.google.com/go/orgpolicy
+cloud.google.com/go/osconfig
+cloud.google.com/go/oslogin
+cloud.google.com/go/phishingprotection
+cloud.google.com/go/policytroubleshooter
+cloud.google.com/go/privatecatalog
 cloud.google.com/go/pubsub
+cloud.google.com/go/pubsublite
+cloud.google.com/go/recaptchaenterprise/v2
+cloud.google.com/go/recommendationengine
+cloud.google.com/go/recommender
+cloud.google.com/go/redis
+cloud.google.com/go/resourcemanager
+cloud.google.com/go/resourcesettings
+cloud.google.com/go/retail
+cloud.google.com/go/run
+cloud.google.com/go/scheduler
+cloud.google.com/go/secretmanager
+cloud.google.com/go/security
+cloud.google.com/go/securitycenter
+cloud.google.com/go/servicecontrol
+cloud.google.com/go/servicedirectory
+cloud.google.com/go/servicemanagement
+cloud.google.com/go/serviceusage
+cloud.google.com/go/shell
+cloud.google.com/go/spanner
+cloud.google.com/go/speech
 cloud.google.com/go/storage
+cloud.google.com/go/storagetransfer
+cloud.google.com/go/talent
+cloud.google.com/go/texttospeech
+cloud.google.com/go/tpu
+cloud.google.com/go/trace
+cloud.google.com/go/translate
+cloud.google.com/go/video
+cloud.google.com/go/videointelligence
+cloud.google.com/go/vision/v2
+cloud.google.com/go/vmmigration
+cloud.google.com/go/vmwareengine
+cloud.google.com/go/vpcaccess
+cloud.google.com/go/webrisk
+cloud.google.com/go/websecurityscanner
+cloud.google.com/go/workflows
 contrib.go.opencensus.io/exporter/ocagent
 contrib.go.opencensus.io/exporter/prometheus
 contrib.go.opencensus.io/exporter/zipkin
@@ -111,6 +225,7 @@ github.com/elastic/go-elasticsearch/v7
 github.com/elazarl/goproxy
 github.com/emicklei/go-restful
 github.com/emicklei/go-restful-swagger12
+github.com/emicklei/go-restful/v3
 github.com/emissary-ingress/emissary/v3
 github.com/envoyproxy/go-control-plane
 github.com/envoyproxy/protoc-gen-validate

operator/licenses/dep.txt

@@ -115,6 +115,7 @@ github.com/elastic/go-elasticsearch/v7
 github.com/elazarl/goproxy
 github.com/emicklei/go-restful
 github.com/emicklei/go-restful-swagger12
+github.com/emicklei/go-restful/v3
 github.com/emissary-ingress/emissary/v3
 github.com/envoyproxy/go-control-plane
 github.com/envoyproxy/protoc-gen-validate

test/models/cifar10-rest-rabbitmq.yaml

@@ -1,5 +1,31 @@
 # Source: https://docs.seldon.io/projects/seldon-core/en/latest/streaming/kafka.html
 ---
+apiVersion: rabbitmq.com/v1beta1
+kind: Queue
+metadata:
+  name: cifar10-rest-input
+  namespace: seldon-regression-test
+spec:
+  name: cifar10-rest-input
+  autoDelete: false
+  durable: true
+  rabbitmqClusterReference:
+    name: rabbitmq-cluster
+    namespace: rabbitmq
+---
+apiVersion: rabbitmq.com/v1beta1
+kind: Queue
+metadata:
+  name: cifar10-rest-output
+  namespace: seldon-regression-test
+spec:
+  name: cifar10-rest-output
+  autoDelete: false
+  durable: true
+  rabbitmqClusterReference:
+    name: rabbitmq-cluster
+    namespace: rabbitmq
+---
 apiVersion: machinelearning.seldon.io/v1
 kind: SeldonDeployment
 metadata: