upstream refresh

.github/CODEOWNERS

@@ -0,0 +1,10 @@
+@aattuluri
+@nirvanagit
+@shriramsharma
+@kpharasi
+@vinay-g
+@vrushalijoshi
+@virajrk
+@rtay1188
+@Punakshi
+@psikka1

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,15 @@
+### Checklist
+🚨 Please review this repository's [contribution guidelines](./CONTRIBUTING.md).
+
+- [ ] I've read and agree to the project's contribution guidelines.
+- [ ] I'm requesting to **pull a topic/feature/bugfix branch**.
+- [ ] I checked that my code additions will pass code linting checks and unit tests.
+- [ ] I updated unit and integration tests (if applicable).
+- [ ] I'm ready to notify the team of this contribution.
+
+### Description
+What does this change do and why?
+
+[Link to related ISSUE]
+
+Thank you!

.gitignore

@@ -1,8 +1,11 @@
 .idea
 .idea/vcs.xml
 
-out*
+out/*
+out.yaml
 *.tar.gz
 *.out
+*.prof
 istio-*
 .DS_Store
+cobertura-coverage.xml

.golangci.yml

@@ -0,0 +1,36 @@
+name: golangci-lint
+on:
+  push:
+    tags:
+      - v*
+    branches:
+      - master
+      - main
+  pull_request:
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-go@v3
+        with:
+          go-version: '1.17.7'
+      - name: golangci-lint
+        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: v1.47.3
+          skip-go-installation: true
+
+          # Optional: working directory, useful for monorepos
+          # working-directory: somedir
+
+          # Optional: golangci-lint command line arguments.
+          args: >-
+            --skip-dirs=admiral/pkg/client/clientset/versioned
+            --tests=false
+            --timeout=5m
+
+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          # only-new-issues: true

CONTRIBUTING.md

@@ -21,7 +21,7 @@ export KUBECONFIG=~/.kube/config
 ```
 * Install [Prerequisites](./docs/Examples.md#Prerequisite) and make sure to install istio control plane in cluster. Alternatively, you can use the script to install istio control plane on the cluster created in previous step:
 
-Mac: `$ADMIRAL_HOME/tests/install_istio.sh 1.7.4 osx` 
+Mac: `$ADMIRAL_HOME/tests/install_istio.sh 1.10.4 osx` 
 
 Mac (Apple Silicon): `$ADMIRAL_HOME/tests/install_istio.sh 1.7.4 osx-arm64`
 
@@ -73,7 +73,38 @@ minikube service prometheus -n istio-system --url
 ```
 
 ## Protobuf code generation
-* If you've made changes to protobuf model objects and need to re-generate their clientsets, use `sh hack/update-codegen.sh` and checkin the generated files
+* Required installations and their versions -
+
+### Initial Setup
+```bash
+Install protobuf
+go install sigs.k8s.io/[email protected]
+go install k8s.io/code-generator v0.24.2
+go install google.golang.org/[email protected]
+make setup
+``` 
+
+### Generate `*.pb.go` files from `*.proto` files
+```bash
+go generate ./...
+```
+
+### Generate deepcopy functions
+```bash
+make model-gen
+```
+
+* If you've made changes to protobuf model objects and need to re-generate their clientsets, use following steps and checkin the generated files 
+### Generate clientsets
+```bash
+sh hack/update-codegen.sh
+```
+
+### Generate CRD
+```bash
+set $GOPATH based on your go setup
+chmod +x $GOPATH/pkg/mod/sigs.k8s.io/[email protected]/.run-in.sh && sh $GOPATH/pkg/mod/sigs.k8s.io/[email protected]/.run-controller-gen.sh crd paths=./admiral/pkg/apis/admiral/v1/... output:stdout > admiral/crd/out.yaml
+```
 
 ## Integration tests
 ### Single cluster
@@ -87,4 +118,21 @@ cd $ADMIRAL_HOME/tests
 ```
 TODO
 ```
-
+
+## Before PR 
+1. Clone repository
+1. Add unit tests and fmea tests(in case applicable) along with the checked in code.
+1. Confirm that the unit test coverage did not drop with your change.
+1. Run regression and make sure it is not failing
+1. Please update any bdd tests in case applicable
+
+## During PR
+1. Create Pull Request from your branch to the master branch. 
+1. Make sure the build succeeds
+1. Maintainers on Admiral Repository will review the pull request.
+1. PR will be merged after code is reviewed and all checks are passing
+
+## After PR
+1. When merging the PR, ensure that all commits are squashed into a single commit. (This can be done in advance via interactive rebase or through the github UI)
+1. Once the changes are deployed to qal environment, verify the fix looks good and bdds are successful.
+

DESIGN.md

@@ -0,0 +1 @@
+# Admiral

Makefile

@@ -10,10 +10,10 @@ SHELL := /bin/bash
 GOCMD?=go
 GOBUILD?=$(GOCMD) build
 GOCLEAN?=$(GOCMD) clean
-GOTEST?=$(GOCMD) test -race
+GOTEST?=$(GOCMD) test
 GOGET?=$(GOCMD) get
-GOBIN?=$(GOPATH)/bin
 OUT?=./out/
+GOLINTER_VERSION=v1.58.1
 
 BINARY_NAME?=$(OUT)admiral
 BINARY_DARWIN?=$(BINARY_NAME)_darwin
@@ -45,7 +45,9 @@ build-mac:
 	$(GOBUILD) -o $(BINARY_DARWIN) -v $(MAIN_PATH_ADMIRAL)
 
 test:
-	$(GOTEST) -v `go list ./... | grep -v client` -coverprofile=c.out
+	$(GOTEST) -v -failfast -race -timeout 0 `go list ./... | grep -v client | grep -v fmeatests | grep -v tests` -coverprofile=c.out
+	$(GOCMD) install github.com/boumenot/gocover-cobertura@latest
+	$(GOPATH)/bin/gocover-cobertura < c.out > cobertura-coverage.xml
 
 clean:
 	$(GOCLEAN)
@@ -95,10 +97,16 @@ docker-build: set-tag
     #NOTE: Assumes binary has already been built (admiral)
 	docker build -t $(IMAGE):$(TAG) -f ./admiral/docker/$(DOCKERFILE) .
 
+podman-build: set-tag
+    #NOTE: Assumes binary has already been built (admiral)
+	podman build --storage-driver=overlay --isolation=chroot --ulimit=nofile=1048576:1048576 --cgroup-manager=cgroupfs --events-backend=file -t $(IMAGE):$(TAG) -f ./admiral/docker/$(DOCKERFILE) .
+
 docker-publish:
 ifndef DO_NOT_PUBLISH
+ifndef PIPELINE_BUILD
 	echo "$(DOCKER_PASS)" | docker login -u $(DOCKER_USER) --password-stdin
 endif
+endif
 ifeq ($(TAG),)
 	echo "This is not a Tag/Release, skipping docker publish"
 else
@@ -115,6 +123,30 @@ else
 endif
 endif
 
+podman-publish:
+ifndef DO_NOT_PUBLISH
+ifndef PIPELINE_BUILD
+	echo "$(DOCKER_PASS)" | podman login -u ${DOCKER_USERNAME} --password-stdin --storage-driver=overlay
+endif
+endif
+ifeq ($(TAG),)
+	echo "This is not a Tag/Release, skipping docker publish"
+else
+ifndef DO_NOT_PUBLISH
+	podman push $(IMAGE):$(TAG) --storage-driver=overlay --cgroup-manager=cgroupfs --events-backend=file
+	podman pull $(IMAGE):$(TAG) --storage-driver=overlay --cgroup-manager=cgroupfs --events-backend=file
+endif
+endif
+#no tag set and its master branch, in this case publish `latest` tag
+ifeq ($(TAG),)
+ifeq ($(BRANCH),master)
+	podman push $(IMAGE):latest --storage-driver=overlay --cgroup-manager=cgroupfs --events-backend=file
+	podman pull $(IMAGE):$(TAG) --storage-driver=overlay --cgroup-manager=cgroupfs --events-backend=file
+else
+	echo "This is not master branch, skipping to publish 'latest' tag"
+endif
+endif
+
 download-kustomize:
 	curl -s -O -L https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_${OPSYS}_amd64.tar.gz
 	tar xzf ./kustomize_v${KUSTOMIZE_VERSION}_${OPSYS}_amd64.tar.gz
@@ -141,3 +173,14 @@ gen-yaml:
 	cp ./install/prometheus/prometheus.yaml ./out/yaml/prometheus.yaml
 	cp ./install/sample/rp.yaml ./out/yaml/rp.yaml
 	cp ./install/scripts/*.sh ./out/scripts/
+
+install_linter:
+	go install github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLINTER_VERSION}
+
+lint:
+	golangci-lint run --fast -c .golangci.yml
+
+perf:
+	go install github.com/onsi/ginkgo/v2/ginkgo
+	TOTAL_ASSETS=10 API_SERVER_DELAY_MULTIPLIER=1ms ginkgo -v --fail-fast ./tests/perf
+	TOTAL_ASSETS=25 API_SERVER_DELAY_MULTIPLIER=1ms ginkgo -v --fail-fast ./tests/perf

README.md

@@ -4,7 +4,15 @@
 </p>
 
 
-[![CircleCI](https://circleci.com/gh/istio-ecosystem/admiral/tree/master.svg?style=svg)](https://circleci.com/gh/istio-ecosystem/admiral/tree/master) [![codecov](https://codecov.io/gh/istio-ecosystem/admiral/branch/master/graph/badge.svg)](https://codecov.io/gh/istio-ecosystem/admiral)
+[//]: # (Build Status)
+
+[![CircleCI](https://circleci.com/gh/istio-ecosystem/admiral/tree/master.svg?style=svg)](https://circleci.com/gh/istio-ecosystem/admiral/tree/master)
+
+[//]: # (Code Coverage)
+
+[![codecov](https://codecov.io/gh/istio-ecosystem/admiral/branch/master/graph/badge.svg)](https://codecov.io/gh/istio-ecosystem/admiral)
+
+[//]: # (usage)
 
 **Admiral provides automatic configuration and service discovery for multicluster Istio service mesh**
 
@@ -32,59 +40,87 @@ Organizations below are **officially** using Admiral. Please send a PR with your
 
 * [Scaling Service Mesh to an Enterprise Microservices Ecosystem](https://apiworld2019aidevworld2019.sched.com/event/SLIQ/pro-talk-scaling-service-mesh-to-an-enterprise-microservices-ecosystem)
 
+* [Admiral – Enabling Multi-Cluster Mesh](https://www.meetup.com/San-Diego-Cloud-Native-Computing-Meetup/events/262826967/)
+
+[//]: # (support)
+
 ## Collaboration and Communication
 
 [Admiral Slack Channel](https://istio.slack.com/archives/CT3F18T08) - `Note:` This channel is under Istio slack org, please fill out this [form](https://docs.google.com/forms/d/e/1FAIpQLSfdsupDfOWBtNVvVvXED6ULxtR4UIsYGCH_cQcRr0VcG1ZqQQ/viewform) to get access to Istio slack.
 
+## Local Development
+Refer to [Local Development Setup](./CONTRIBUTING.md#setting-up-for-local-development)
+
 ## Contributing
 Refer to [Contributing doc](./CONTRIBUTING.md)
 
 ## Release Cadence
 
 Details can be found [here](./docs/Processes.md)
 
-## Admiral sequence diagram
+## Admiral Sequence Diagram
+
+### Legend:
+SE - Istio ServiceEntry
+
+VS - Istio VirtualService
+
+DR - Istio DestinationRule
+
+K8sAPI - Kubernetes API Server
+
+GTP - Admiral GlobalTrafficPolicy
+
 ```mermaid
 sequenceDiagram
 		autonumber 1
     Service/VirtualService Handler->>+Rollout/Deployment Handler: Add/Update/Delete events
-    loop
-			autonumber 1
-			GTP Handler->>GTP Handler: Add/Update/Delete events
-    end
 		autonumber 1
-    GTP Handler ->> ServiceEntry Handler: Add/Update
-		loop
-				autonumber 1
-        Rollout/Deployment Handler->>Rollout/Deployment Handler: Add/Delete events of rollout/deployment
-    end
+    GTP/OutlierDetection Handler->>Update All Resources: Add/Update
+    autonumber 1
+    DependencyRecord Handler->>Update All Resources: Add/Update
 		autonumber 1
-		Rollout/Deployment Handler->>ServiceEntry Handler: Add/Update
+		Rollout/Deployment Handler->>Update All Resources: Add/Update
+
     autonumber 2
-    ServiceEntry Handler->>RemoteControllers: Fetch All Cluster Controllers
+    Update All Resources->>RemoteControllers: Fetch All Cluster Controllers
 		rect rgb(255, 255, 220)
 	    loop
-		    ServiceEntry Handler->>K8sAPI 1..N: For each cluster, get corresponding service object
-				K8sAPI 1..N-->>ServiceEntry Handler: Continue if service does not exist for deployment/rollout
-				K8sAPI 1..N-->>ServiceEntry Handler: Build list of source services
+		    Update All Resources->>K8sAPI 1..N: For each cluster, get corresponding service object
+				K8sAPI 1..N-->>Update All Resources: Continue if service does not exist for deployment/rollout
+				K8sAPI 1..N-->>Update All Resources: Build list of source services
 	    end
 		end
 	  rect rgb(255, 255, 220)
 	    loop
-				ServiceEntry Handler->>K8sAPI 1..N: Derive SE from each service in the list
-				ServiceEntry Handler->>GTP Cache: Derive DR from GTP
+				Update All Resources->>K8sAPI 1..N: Derive SE from each service in the list
+				Update All Resources->>GTP/OutlierDetection Cache: Derive DR from GTP/OutlierDetection
 			  rect rgb(204, 255, 204)
 			    loop
-				    ServiceEntry Handler->>K8sAPI 1..N: Add/Update SE/DR in source clusters
+				    Update All Resources->>K8sAPI 1..N: Add/Update SE/DR/VS in source clusters
+				    Update All Resources->>DynamoDB: Add/Update WorkloadData for source clusters
 					end
 		    end
 	    end
 		end
 
-    ServiceEntry Handler->>DependencyCache: Fetch dependent clusters
+    Update All Resources->>DependencyCache: Fetch dependent clusters
 		rect rgb(204, 255, 204)
 	    loop
-				ServiceEntry Handler->>K8sAPI 1..N: Add/Update SE/DR in dependent clusters
+				Update All Resources->>K8sAPI 1..N: Add/Update SE/DR/VS in dependent clusters
+        Update All Resources->>DynamoDB: Add/Update WorkloadData for dependent clusters
 			end
 		end
 ```
+
+# Core contributors
+- [Anil Attuluri](https://github.com/aattuluri)
+- [Anubhav Aeron](https://github.com/nirvanagit)
+- [Shriram Sharma](https://github.com/shriramsharma)
+- [Kartikeya Pharasi](https://github.com/kpharasi)
+- [Vinay Gonuguntla](https://github.com/vinay-g)
+- [Vrushali Joshi](https://github.com/vrushalijoshi)
+- [Viraj Kulkarni](https://github.com/virajrk)
+- [Ryan Tay](https://github.com/rtay1188)
+- [Punakshi Chaand](https://github.com/Punakshi)
+- [Pankaj Sikka](https://github.com/psikka1)