Add latest istio version support (istio-ecosystem#180)

shriramsharma · Jan 25, 2022 · 74f5db1 · 74f5db1
1 parent cf3b5ed
commit 74f5db1
Show file tree

Hide file tree

Showing 31 changed files with 1,303 additions and 659 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -46,11 +46,11 @@ jobs:
 
   run-integration-tests:
     machine:
-      image: circleci/classic:201808-01
+      image: ubuntu-2004:202010-01
     environment:
-      K8S_VERSION: v1.16.8
+      K8S_VERSION: v1.20.14
       KUBECONFIG: /home/circleci/.kube/config
-      MINIKUBE_VERSION: v1.16.0
+      MINIKUBE_VERSION: v1.18.1
       MINIKUBE_WANTUPDATENOTIFICATION: false
       MINIKUBE_WANTREPORTERRORPROMPT: false
       MINIKUBE_HOME: /home/circleci
@@ -69,6 +69,7 @@ jobs:
           name: setup minikube
           command: |
             curl -Lo minikube https://github.com/kubernetes/minikube/releases/download/${MINIKUBE_VERSION}/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
+            minikube version
       - run:
           name: setup helm
           command: curl -fsSL https://raw.githubusercontent.com/helm/helm/master/scripts/get | bash -s -- -v v2.17.0
@@ -87,23 +88,23 @@ jobs:
             cd tests
             export IS_LOCAL=false
       - run:
-          name: Run Integration Test for Istio 1.5.7
+          name: Run Integration Test for Istio 1.10
           command:  |
             cd tests
             export IS_LOCAL=false
-            ./run.sh "1.16.8" "1.5.7" "../out"
+            ./run.sh "1.20.14" "1.10.6" "../out"
       - run:
-          name: Run Integration Test for Istio 1.6.13
+          name: Run Integration Test for Istio 1.11
           command:  |
             cd tests
             export IS_LOCAL=false
-            ./run.sh "1.16.8" "1.6.13" "../out"
+            ./run.sh "1.20.14" "1.11.4" "../out"
       - run:
-          name: Run Integration Test for Istio 1.7.6
+          name: Run Integration Test for Istio 1.12
           command:  |
             cd tests
             export IS_LOCAL=false
-            ./run.sh "1.16.8" "1.7.6" "../out"
+            ./run.sh "1.20.14" "1.12.2" "../out"
   publish-github-release:
     docker:
     - image: circleci/golang:1.16

diff --git a/.github/workflows/golang-ci-lint.yml b/.github/workflows/golang-ci-lint.yml
@@ -5,6 +5,7 @@ on:
       - v*
     branches:
       - master
+      - main
   pull_request:
 jobs:
   golangci:
@@ -16,7 +17,7 @@ jobs:
         uses: golangci/golangci-lint-action@v2
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: latest
+          version: v1.43.0
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir

diff --git a/admiral/cmd/admiral/cmd/root.go b/admiral/cmd/admiral/cmd/root.go
@@ -114,6 +114,8 @@ func GetRootCmd(args []string) *cobra.Command {
 	rootCmd.PersistentFlags().StringVar(&params.LabelSet.EnvKey, "env_key", "admiral.io/env",
 		"The annotation or label, on a pod spec in a deployment, which will be used to group deployments across regions/clusters under a single environment. Defaults to `admiral.io/env`. "+
 			"The order would be to use annotation specified as `env_key`, followed by label specified as `env_key` and then fallback to the label `env`")
+	rootCmd.PersistentFlags().StringVar(&params.LabelSet.GatewayApp, "gateway_app", "istio-ingressgateway",
+		"The the value of the `app` label to use to match and find the service that represents the ingress for cross cluster traffic (AUTO_PASSTHROUGH mode)")
 
 	return rootCmd
 }

diff --git a/admiral/pkg/apis/admiral/routes/handler_test.go b/admiral/pkg/apis/admiral/routes/handler_test.go
@@ -48,10 +48,9 @@ func TestGetClusters (t *testing.T) {
 		{
 			name:   "success with two clusters case",
 			remoteCluster:     map[string]*secret.RemoteCluster{
-				"cluster1": &secret.RemoteCluster{},
-				"cluster2": &secret.RemoteCluster{},
+				"cluster1": {},
 			},
-			expectedErr:      []string{"cluster1", "cluster2"},
+			expectedErr:      []string{"cluster1"},
 			statusCode:        200,
 		},
 		{