Repository: skupperproject/skupper
Pull request #1613 (2024-08-22 15:02:22)

Include Version in kube/flow's SiteRecord
This is needed in the network console. It was previously set in the v1 collector-lite but was missed in the migration.


Patch:
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0f1f2463..cfa6b547 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -99,6 +99,8 @@ commands:
             echo 'export PATH=$GOPATH/bin:$GOROOT/bin:$PATH' >> $BASH_ENV
             echo "export SKUPPER_CONTROLLER_IMAGE=${LOCAL_IP}:5000/controller" >> $BASH_ENV
             echo "export SKUPPER_CONFIG_SYNC_IMAGE=${LOCAL_IP}:5000/config-sync" >> $BASH_ENV
+            echo "export SKUPPER_NETWORK_CONSOLE_COLLECTOR_IMAGE=${LOCAL_IP}:5000/network-console-collector" >> $BASH_ENV
+            echo "export SKUPPER_BOOTSTRAP_IMAGE=${LOCAL_IP}:5000/bootstrap" >> $BASH_ENV
             echo "export TEST_IMAGE=${LOCAL_IP}:5000/skupper-tests" >> $BASH_ENV
             source $BASH_ENV
       - checkout
@@ -135,15 +137,15 @@ commands:
             gunzip -c /tmp/images/config-sync.gz | docker load
             gunzip -c /tmp/images/network-console-collector.gz | docker import - 0.0.0.0:5000/network-console-collector
             gunzip -c /tmp/images/network-console-collector.gz | docker load
-            gunzip -c /tmp/images/test-image.gz | docker import - 0.0.0.0:5000/skupper-tests
-            gunzip -c /tmp/images/test-image.gz | docker load
+            gunzip -c /tmp/images/bootstrap.gz | docker import - 0.0.0.0:5000/bootstrap
+            gunzip -c /tmp/images/bootstrap.gz | docker load
       - run:
           name: push to local registry
           command: |
             docker push 0.0.0.0:5000/controller
             docker push 0.0.0.0:5000/config-sync
             docker push 0.0.0.0:5000/network-console-collector
-            docker push 0.0.0.0:5000/skupper-tests
+            docker push 0.0.0.0:5000/bootstrap
 
   system_monitor:
     description: shows continuous system state
@@ -160,6 +162,7 @@ commands:
         name: journalctl monitoring
         command: journalctl -p 7 -b -f
         background: true
+
   system_status:
     description: shows some point-in-time system status
     parameters:
@@ -344,6 +347,12 @@ yaml-templates:
         ignore: /.*/
         only: /main/
 
+  v2_branch_filters: &run_for_v2_branch
+    filters:
+      branches:
+        ignore: /.*/
+        only: /v2/
+
   release_filters: &run_for_numeric_tags
     filters:
       branches:
@@ -359,6 +368,12 @@ yaml-templates:
       - main_tests_minikube_local_cluster
       - policy_tests_minikube_local_cluster
 
+  v2_release_requires: &v2_release_requires
+    requires:
+      - build-all
+      - test-skupper-binary
+      - test
+
 workflows:
   version: 2.1
   build-workflow:
@@ -378,8 +393,8 @@ workflows:
             - build-all
       - test:
           <<: *run_for_all_branches_and_numeric_tags
-      # - build_and_save_test_images:
-      #     <<: *run_for_all_branches_and_numeric_tags
+      - build_and_save_test_images:
+          <<: *run_for_all_branches_and_numeric_tags
 
       # - main_tests_minikube_local_cluster:
       #     <<: *run_for_all_branches_and_numeric_tags
@@ -398,10 +413,10 @@ workflows:
       #       - build_and_save_test_images
 
       # - publish-github-release-images:
-      #     <<: *run_for_numeric_tags
-      #     <<: *release_requires
-      #     context:
-      #       - skupper-org
+      #    <<: *run_for_numeric_tags
+      #    <<: *release_requires
+      #    context:
+      #      - skupper-org
 
       # - generate-manifest:
       #     <<: *run_for_numeric_tags
@@ -433,6 +448,19 @@ workflows:
       #     context:
       #       - skupper-org
 
+      - publish-github-v2-artifacts:
+          <<: *run_for_v2_branch
+          requires:
+            - publish-github-v2-latest-images
+          context:
+            - skupper-org
+
+      - publish-github-v2-latest-images:
+          <<: *run_for_v2_branch
+          <<: *v2_release_requires
+          context:
+            - skupper-org
+
 jobs:
   test:
     executor:
@@ -475,14 +503,14 @@ jobs:
           name: persisting images to workspace
           command: |
             mkdir /tmp/images
-            docker tag quay.io/skupper/controller 0.0.0.0:5000/controller
+            docker tag quay.io/skupper/controller:v2-latest 0.0.0.0:5000/controller
             docker save 0.0.0.0:5000/controller | gzip > /tmp/images/controller.gz
-            docker tag quay.io/skupper/config-sync 0.0.0.0:5000/config-sync
+            docker tag quay.io/skupper/config-sync:v2-latest 0.0.0.0:5000/config-sync
             docker save 0.0.0.0:5000/config-sync | gzip > /tmp/images/config-sync.gz
-            docker tag quay.io/skupper/network-console-collector 0.0.0.0:5000/network-console-collector
+            docker tag quay.io/skupper/network-console-collector:v2-latest 0.0.0.0:5000/network-console-collector
             docker save 0.0.0.0:5000/network-console-collector | gzip > /tmp/images/network-console-collector.gz
-            docker tag quay.io/skupper/boostrap 0.0.0.0:5000/bootstrap
-            docker save 0.0.0.0:5000/bootstrap | gzip > /tmp/images/boostrap.gz
+            docker tag quay.io/skupper/bootstrap:v2-latest 0.0.0.0:5000/bootstrap
+            docker save 0.0.0.0:5000/bootstrap | gzip > /tmp/images/bootstrap.gz
       - persist_to_workspace:
           root: /tmp
           paths:
@@ -692,3 +720,45 @@ jobs:
             done
             cd ${BASEDIR}
             ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -replace -prerelease ${VERSION} "${BASEDIR}/archives"
+
+  publish-github-v2-latest-images:
+    executor:
+      name: go_cimg
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run: docker login quay.io -u ${QUAY_LOGIN} -p ${QUAY_PASSWORD}
+      - run:
+          name: "Publishing v2 images"
+          command: |
+            echo 'export CONTROLLER_IMAGE=quay.io/skupper/controller:v2-latest' >> $BASH_ENV
+            echo 'export CONFIG_SYNC_IMAGE=quay.io/skupper/config-sync:v2-latest' >> $BASH_ENV
+            echo 'export NETWORK_CONSOLE_COLLECTOR_IMAGE=quay.io/skupper/network-console-collector:v2-latest' >> $BASH_ENV
+            echo 'export BOOTSTRAP_IMAGE=quay.io/skupper/bootstrap:v2-latest' >> $BASH_ENV
+            source $BASH_ENV
+            docker buildx create --use --name skupper-buildx
+            make -e docker-build
+            make -e docker-push
+
+  publish-github-v2-artifacts:
+    docker:
+      - image: cibuilds/github:0.10
+    steps:
+      - attach_workspace:
+          at: .
+      - run:
+          name: "Create a V2 Pre-Release on GitHub"
+          command: |
+            VERSION="v2-release"
+            BASEDIR=`pwd`
+            mkdir "${BASEDIR}/archives"
+            for p in `ls dist` ; do
+              cd "$BASEDIR/dist/$p"
+              if [[ $p == windows* ]] ; then
+                zip -q "${BASEDIR}/archives/skupper-cli-${VERSION}-$p.zip" *
+              else
+                tar -zcf "${BASEDIR}/archives/skupper-cli-${VERSION}-$p.tgz" *
+              fi
+            done
+            cd ${BASEDIR}
+            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -replace -prerelease ${VERSION} "${BASEDIR}/archives"
diff --git a/Makefile b/Makefile
index bb843702..f09ad5e3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 VERSION := $(shell git describe --tags --dirty=-modified --always)
-CONTROLLER_IMAGE := quay.io/skupper/controller
-BOOTSTRAP_IMAGE := quay.io/skupper/bootstrap
-CONFIG_SYNC_IMAGE := quay.io/skupper/config-sync
-NETWORK_CONSOLE_COLLECTOR_IMAGE := quay.io/skupper/network-console-collector
-TEST_IMAGE := quay.io/skupper/skupper-tests
+CONTROLLER_IMAGE := quay.io/skupper/controller:v2-latest
+BOOTSTRAP_IMAGE := quay.io/skupper/bootstrap:v2-latest
+CONFIG_SYNC_IMAGE := quay.io/skupper/config-sync:v2-latest
+NETWORK_CONSOLE_COLLECTOR_IMAGE := quay.io/skupper/network-console-collector:v2-latest
+TEST_IMAGE := quay.io/skupper/skupper-tests:v2-latest
 TEST_BINARIES_FOLDER := ${PWD}/test/integration/bin
 DOCKER := docker
 LDFLAGS := -X github.com/skupperproject/skupper/pkg/version.Version=${VERSION}
@@ -11,7 +11,7 @@ PLATFORMS ?= linux/amd64,linux/arm64
 GOOS ?= linux
 GOARCH ?= amd64
 
-all: build-cmd build-config-sync build-controller build-tests build-manifest
+all: build-cmd build-config-sync build-controller build-bootstrap build-tests build-manifest build-network-console-collector
 
 build-tests:
 	mkdir -p ${TEST_BINARIES_FOLDER}
@@ -47,7 +47,7 @@ docker-build-test-image:
 	${DOCKER} buildx build --platform ${PLATFORMS} -t ${TEST_IMAGE} -f Dockerfile.ci-test .
 	${DOCKER} buildx build --load -t ${TEST_IMAGE} -f Dockerfile.ci-test .
 
-docker-build: docker-build-test-image
+docker-build: docker-build-test-image docker-build-bootstrap docker-build-network-console-collector
 	${DOCKER} buildx build --platform ${PLATFORMS} -t ${CONTROLLER_IMAGE} -f Dockerfile.controller .
 	${DOCKER} buildx build --load  -t ${CONTROLLER_IMAGE} -f Dockerfile.controller .
 	${DOCKER} buildx build --platform ${PLATFORMS} -t ${CONFIG_SYNC_IMAGE} -f Dockerfile.config-sync .
@@ -64,11 +64,15 @@ docker-build-network-console-collector:
 	${DOCKER} buildx build --platform ${PLATFORMS} -t ${NETWORK_CONSOLE_COLLECTOR_IMAGE} -f Dockerfile.network-console-collector .
 	${DOCKER} buildx build --load  -t ${NETWORK_CONSOLE_COLLECTOR_IMAGE} -f Dockerfile.network-console-collector .
 
+docker-push-network-console-collector:
+	${DOCKER} buildx build --push --platform ${PLATFORMS} -t ${NETWORK_CONSOLE_COLLECTOR_IMAGE} -f Dockerfile.network-console-collector .
+
 docker-push-test-image:
 	${DOCKER} buildx build --push --platform ${PLATFORMS} -t ${TEST_IMAGE} -f Dockerfile.ci-test .
 
-docker-push: docker-push-test-image
+docker-push: docker-push-test-image docker-push-bootstrap docker-push-network-console-collector
 	${DOCKER} buildx build --push --platform ${PLATFORMS} -t ${CONFIG_SYNC_IMAGE} -f Dockerfile.config-sync .
+	${DOCKER} buildx build --push --platform ${PLATFORMS} -t ${CONTROLLER_IMAGE} -f Dockerfile.controller .
 
 format:
 	go fmt ./...
@@ -96,7 +100,7 @@ test:
 	go test -v -count=1 ./pkg/... ./internal/... ./cmd/...
 
 clean:
-	rm -rf skupper controller release config-sync manifest bootstrap ${TEST_BINARIES_FOLDER}
+	rm -rf skupper controller release config-sync manifest bootstrap network-console-collector ${TEST_BINARIES_FOLDER}
 
 package: release/windows.zip release/darwin.zip release/linux.tgz release/s390x.tgz release/arm64.tgz
 
diff --git a/cmd/bootstrap/bootstrap.sh b/cmd/bootstrap/bootstrap.sh
index c6922225..ea973ab7 100755
--- a/cmd/bootstrap/bootstrap.sh
+++ b/cmd/bootstrap/bootstrap.sh
@@ -2,7 +2,7 @@
 
 set -Ceu
 
-IMAGE="quay.io/skupper/bootstrap"
+IMAGE="quay.io/skupper/bootstrap:v2-latest"
 INPUT_PATH="${1:-${PWD}}"
 SKUPPER_OUTPUT_PATH="${XDG_DATA_HOME:-${HOME}/.local/share}/skupper"
 SERVICE_DIR="${XDG_CONFIG_HOME:-${HOME}/.config}/systemd/user"
diff --git a/cmd/config-sync/collector.go b/cmd/config-sync/collector.go
index 7f95146c..1116f119 100644
--- a/cmd/config-sync/collector.go
+++ b/cmd/config-sync/collector.go
@@ -15,6 +15,7 @@ import (
 	kubeflow "github.com/skupperproject/skupper/pkg/kube/flow"
 	"github.com/skupperproject/skupper/pkg/vanflow"
 	"github.com/skupperproject/skupper/pkg/vanflow/session"
+	"github.com/skupperproject/skupper/pkg/version"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	corev1informer "k8s.io/client-go/informers/core/v1"
 	"k8s.io/client-go/tools/cache"
@@ -85,6 +86,7 @@ func startFlowController(ctx context.Context, cli *internalclient.KubeClient) er
 			Name:       &siteName,
 			Namespace:  &cli.Namespace,
 			Platform:   &platform,
+			Version:    &version.Version,
 		},
 	})
 	go informer.Run(ctx.Done())
diff --git a/cmd/controller/controller.go b/cmd/controller/controller.go
index 6248f8d1..a71c74da 100644
--- a/cmd/controller/controller.go
+++ b/cmd/controller/controller.go
@@ -22,10 +22,9 @@ import (
 	skupperv1alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v1alpha1"
 	"github.com/skupperproject/skupper/pkg/kube"
 	"github.com/skupperproject/skupper/pkg/kube/certificates"
-	"github.com/skupperproject/skupper/pkg/kube/claims"
+	"github.com/skupperproject/skupper/pkg/kube/grants"
 	"github.com/skupperproject/skupper/pkg/kube/securedaccess"
 	"github.com/skupperproject/skupper/pkg/kube/site"
-	"github.com/skupperproject/skupper/pkg/kube/tokens"
 	"github.com/skupperproject/skupper/pkg/network"
 )
 
@@ -38,7 +37,7 @@ type Controller struct {
 	linkAccessWatcher    *kube.RouterAccessWatcher
 	grantWatcher         *kube.AccessGrantWatcher
 	sites                map[string]*site.Site
-	grants               claims.GrantManager
+	startGrantServer     func()
 	accessMgr            *securedaccess.SecuredAccessManager
 	accessRecovery       AccessRecovery
 	certMgr              *certificates.CertificateManagerImpl
@@ -107,7 +106,7 @@ func dynamicSecuredAccess() dynamicinformer.TweakListOptionsFunc {
 	return dynamicWatcherOptions("internal.skupper.io/secured-access")
 }
 
-func NewController(cli internalclient.Clients, watchNamespace string, currentNamespace string) (*Controller, error) {
+func NewController(cli internalclient.Clients, grantConfig *grants.GrantConfig, watchNamespace string, currentNamespace string) (*Controller, error) {
 	controller := &Controller{
 		controller:           kube.NewController("Controller", cli),
 		sites:                map[string]*site.Site{},
@@ -135,9 +134,7 @@ func NewController(cli internalclient.Clients, watchNamespace string, currentNam
 	controller.accessRecovery.routeWatcher = controller.controller.WatchRoutes(routeSecuredAccess(), watchNamespace, controller.checkSecuredAccessRoute)
 	controller.accessRecovery.httpProxyWatcher = controller.controller.WatchContourHttpProxies(dynamicSecuredAccess(), watchNamespace, controller.checkSecuredAccessHttpProxy)
 
-	controller.grants = claims.NewGrantManager(controller.controller, claims.GrantConfigFromEnv(), controller.generateLinkConfig)
-	controller.grantWatcher = controller.controller.WatchAccessGrants(watchNamespace, controller.grants.GrantChanged)
-	controller.grants.Watch(controller.controller, currentNamespace)
+	controller.startGrantServer = grants.Initialise(controller.controller, currentNamespace, watchNamespace, grantConfig, controller.generateLinkConfig)
 
 	return controller, nil
 }
@@ -174,12 +171,11 @@ func (c *Controller) Run(stopCh <-chan struct{}) error {
 		site := c.getSite(la.ObjectMeta.Namespace)
 		site.CheckRouterAccess(la.ObjectMeta.Name, la)
 	}
-	for _, grant := range c.grantWatcher.List() {
-		c.grants.GrantChanged(fmt.Sprintf("%s/%s", grant.Namespace, grant.Name), grant)
-	}
 	c.certMgr.Recover()
 	c.accessRecovery.recoverAll(c.accessMgr)
-	c.grants.Start()
+	if c.startGrantServer != nil {
+		c.startGrantServer()
+	}
 
 	log.Println("Starting event loop")
 	c.controller.Start(stopCh)
@@ -265,7 +261,7 @@ func (c *Controller) checkAccessToken(key string, token *skupperv1alpha1.AccessT
 	if site == nil {
 		return nil
 	}
-	return claims.RedeemAccessToken(token, site, c.controller)
+	return grants.RedeemAccessToken(token, site, c.controller)
 }
 
 func (c *Controller) routerPodEvent(key string, pod *corev1.Pod) error {
@@ -281,7 +277,7 @@ func (c *Controller) generateLinkConfig(namespace string, name string, subject s
 	if site == nil {
 		return fmt.Errorf("Site not yet defined for %s", namespace)
 	}
-	generator, err := tokens.NewTokenGeneratorForSite(site, c.controller)
+	generator, err := grants.NewTokenGenerator(site, c.controller)
 	if err != nil {
 		return err
 	}
@@ -294,7 +290,6 @@ func (c *Controller) checkSecuredAccess(key string, se *skupperv1alpha1.SecuredA
 		return c.accessMgr.SecuredAccessDeleted(key)
 	}
 	c.getSite(se.ObjectMeta.Namespace).CheckSecuredAccess(se)
-	c.grants.SecuredAccessChanged(key, se)
 	return c.accessMgr.SecuredAccessChanged(key, se)
 }
 
diff --git a/cmd/controller/deploy_cluster_scope.yaml b/cmd/controller/deploy_cluster_scope.yaml
index 63ef8ecc..e681b0ef 100644
--- a/cmd/controller/deploy_cluster_scope.yaml
+++ b/cmd/controller/deploy_cluster_scope.yaml
@@ -174,6 +174,10 @@ spec:
         application: skupper-controller
     spec:
       serviceAccountName: skupper-controller
+      # Prevent kubernetes from injecting env vars for grant service
+      # as these then collide with those that actually configure the
+      # controller:
+      enableServiceLinks: false
       # Please ensure that you can use SeccompProfile and do not use
       # if your project must work on old Kubernetes
       # versions < 1.19 or on vendors versions which
@@ -186,13 +190,9 @@ spec:
       - name: controller
         image: quay.io/skupper/controller:v2-latest
         imagePullPolicy: Always
+        command: ["/app/controller"]
+        args: ["-enable-grants", "-grant-server-autoconfigure"]
         env:
-        - name: SKUPPER_ENABLE_GRANTS
-          value: "true"
-        - name: SKUPPER_CLAIMS_GET_BASE_URL_FROM
-          value: skupper/skupper-grant-server
-        - name: SKUPPER_CLAIMS_TLS_CREDENTIALS_SECRET
-          value: skupper-grant-server
         - name: SKUPPER_CONFIG_SYNC_IMAGE
           value: quay.io/skupper/config-sync:v2-latest
         securityContext:
@@ -207,27 +207,3 @@ spec:
       volumes:
       - name: tls-credentials
         emptyDir: {}
----
-apiVersion: skupper.io/v1alpha1
-kind: Certificate
-metadata:
-  name: skupper-grant-server-ca
-  namespace: skupper
-spec:
-  signing: true
-  ca:      ""
-  subject: "grant server CA"
----
-apiVersion: skupper.io/v1alpha1
-kind: SecuredAccess
-metadata:
-  name: skupper-grant-server
-  namespace: skupper
-spec:
-  selector:
-      application: skupper-controller
-  ports:
-  - name: https
-    port: 9090
-  issuer: skupper-grant-server-ca
-  certificate: skupper-grant-server
diff --git a/cmd/controller/deploy_namespace_scope.yaml b/cmd/controller/deploy_namespace_scope.yaml
index accf3249..ac7d6d19 100644
--- a/cmd/controller/deploy_namespace_scope.yaml
+++ b/cmd/controller/deploy_namespace_scope.yaml
@@ -166,6 +166,10 @@ spec:
         application: skupper-controller
     spec:
       serviceAccountName: skupper-controller
+      # Prevent kubernetes from injecting env vars for grant service
+      # as these then collide with those that actually configure the
+      # controller:
+      enableServiceLinks: false
       securityContext:
         runAsNonRoot: true
         seccompProfile:
@@ -174,13 +178,9 @@ spec:
       - name: controller
         image: quay.io/skupper/controller:v2-latest
         imagePullPolicy: Always
+        command: ["/app/controller"]
+        args: ["-enable-grants", "-grant-server-autoconfigure"]
         env:
-        - name: SKUPPER_ENABLE_GRANTS
-          value: "true"
-        - name: SKUPPER_CLAIMS_GET_BASE_URL_FROM
-          value: grs/skupper-grant-server
-        - name: SKUPPER_CLAIMS_TLS_CREDENTIALS_SECRET
-          value: skupper-grant-server
         - name: SKUPPER_CONFIG_SYNC_IMAGE
           value: quay.io/skupper/config-sync:v2-latest
         - name: WATCH_NAMESPACE
@@ -199,25 +199,3 @@ spec:
       volumes:
       - name: tls-credentials
         emptyDir: {}
----
-apiVersion: skupper.io/v1alpha1
-kind: Certificate
-metadata:
-  name: skupper-grant-server-ca
-spec:
-  signing: true
-  ca:      ""
-  subject: "grant server CA"
----
-apiVersion: skupper.io/v1alpha1
-kind: SecuredAccess
-metadata:
-  name: skupper-grant-server
-spec:
-  selector:
-      application: skupper-controller
-  ports:
-  - name: https
-    port: 9090
-  issuer: skupper-grant-server-ca
-  certificate: skupper-grant-server
diff --git a/cmd/controller/main.go b/cmd/controller/main.go
index e31090dd..56092d9e 100644
--- a/cmd/controller/main.go
+++ b/cmd/controller/main.go
@@ -10,7 +10,9 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	iflag "github.com/skupperproject/skupper/internal/flag"
 	internalclient "github.com/skupperproject/skupper/internal/kube/client"
+	"github.com/skupperproject/skupper/pkg/kube/grants"
 	"github.com/skupperproject/skupper/pkg/version"
 )
 
@@ -39,37 +41,43 @@ func SetupSignalHandler() (stopCh <-chan struct{}) {
 }
 
 func main() {
+	flags := flag.NewFlagSet("", flag.ExitOnError)
+	grantConfig, err := grants.BoundGrantConfig(flags)
+	if err != nil {
+		fmt.Println(err.Error())
+		os.Exit(1)
+	}
+
+	var namespace string
+	var kubeconfig string
+	iflag.StringVar(flags, &namespace, "namespace", "NAMESPACE", "", "The Kubernetes namespace scope for the controller")
+	iflag.StringVar(flags, &kubeconfig, "kubeconfig", "KUBECONFIG", "", "A path to the kubeconfig file to use")
+
+	var watchNamespace string
+	iflag.StringVar(flags, &watchNamespace, "watch-namespace", "WATCH_NAMESPACE", metav1.NamespaceAll, "The Kubernetes namespace the controller should monitor for controlled resources (will monitor all if not specified)")
 	// if -version used, report and exit
-	isVersion := flag.Bool("version", false, "Report the version of the Skupper Site Controller")
-	flag.Parse()
+	isVersion := flags.Bool("version", false, "Report the version of the Skupper Controller")
+	flags.Parse(os.Args[1:])
 	if *isVersion {
 		fmt.Println(version.Version)
 		os.Exit(0)
 	}
-
-	namespace := os.Getenv("NAMESPACE")
-	kubeconfig := os.Getenv("KUBECONFIG")
+	log.Printf("Version: %s", version.Version)
+	if watchNamespace == metav1.NamespaceAll {
+		log.Println("Skupper controller watching all namespaces")
+	} else {
+		log.Println("Skupper controller watching namespace", watchNamespace)
+	}
 
 	// set up signals so we handle the first shutdown signal gracefully
 	stopCh := SetupSignalHandler()
 
-	// todo, get context from env?
 	cli, err := internalclient.NewClient(namespace, "", kubeconfig)
 	if err != nil {
 		log.Fatal("Error getting van client ", err.Error())
 	}
 
-	var watchNamespace string
-	if os.Getenv("WATCH_NAMESPACE") != "" {
-		watchNamespace = os.Getenv("WATCH_NAMESPACE")
-		log.Println("Skupper controller watching current namespace ", watchNamespace)
-	} else {
-		watchNamespace = metav1.NamespaceAll
-		log.Println("Skupper controller watching all namespaces")
-	}
-	log.Printf("Version: %s", version.Version)
-
-	controller, err := NewController(cli, watchNamespace, cli.Namespace)
+	controller, err := NewController(cli, grantConfig, watchNamespace, cli.Namespace)
 	if err != nil {
 		log.Fatal("Error getting new site controller ", err.Error())
 	}
diff --git a/cmd/network-console-collector/resources/developer/native-complete.yaml b/cmd/network-console-collector/resources/developer/native-complete.yaml
index be4e4c18..13acf5d2 100644
--- a/cmd/network-console-collector/resources/developer/native-complete.yaml
+++ b/cmd/network-console-collector/resources/developer/native-complete.yaml
@@ -242,7 +242,7 @@ spec:
         app.kubernetes.io/component: server
     spec:
       containers:
-      - image: quay.io/ckruse/network-console-collector:latest
+      - image: quay.io/skupper/network-console-collector:v2-latest
         imagePullPolicy: Always
         name: network-console
         args:
diff --git a/cmd/network-console-collector/resources/developer/openshift-complete.yaml b/cmd/network-console-collector/resources/developer/openshift-complete.yaml
index 0b66d529..9f07dab7 100644
--- a/cmd/network-console-collector/resources/developer/openshift-complete.yaml
+++ b/cmd/network-console-collector/resources/developer/openshift-complete.yaml
@@ -238,7 +238,7 @@ spec:
         app.kubernetes.io/component: server
     spec:
       containers:
-      - image: quay.io/ckruse/network-console-collector:latest
+      - image: quay.io/skupper/network-console-collector:v2-latest
         imagePullPolicy: Always
         name: network-console
         args:
diff --git a/cmd/network-console-collector/resources/native/deployment.yaml b/cmd/network-console-collector/resources/native/deployment.yaml
index 86a962c8..cd38c877 100644
--- a/cmd/network-console-collector/resources/native/deployment.yaml
+++ b/cmd/network-console-collector/resources/native/deployment.yaml
@@ -58,7 +58,7 @@ spec:
         app.kubernetes.io/component: server
     spec:
       containers:
-      - image: quay.io/ckruse/network-console-collector:latest
+      - image: quay.io/skupper/network-console-collector:v2-latest
         imagePullPolicy: Always
         name: network-console
         args:
diff --git a/cmd/network-console-collector/resources/openshift/deployment.yaml b/cmd/network-console-collector/resources/openshift/deployment.yaml
index 76de3868..45d9b0af 100644
--- a/cmd/network-console-collector/resources/openshift/deployment.yaml
+++ b/cmd/network-console-collector/resources/openshift/deployment.yaml
@@ -43,7 +43,7 @@ spec:
       serviceAccountName: network-console-collector
       containers:
       - name: network-console
-        image: quay.io/ckruse/network-console-collector:latest
+        image: quay.io/skupper/network-console-collector:v2-latest
         imagePullPolicy: Always
         args:
           - -listen=127.0.0.1:8080
diff --git a/internal/cmd/skupper/connector/kube/connector_create.go b/internal/cmd/skupper/connector/kube/connector_create.go
index 2a958ad8..5513bbde 100644
--- a/internal/cmd/skupper/connector/kube/connector_create.go
+++ b/internal/cmd/skupper/connector/kube/connector_create.go
@@ -253,7 +253,7 @@ func (cmd *CmdConnectorCreate) WaitUntil() error {
 	})
 
 	if err != nil {
-		return fmt.Errorf("Connector %q not ready yet, check the logs for more information\n", cmd.name)
+		return fmt.Errorf("Connector %q not ready yet, check the status for more information\n", cmd.name)
 	}
 
 	fmt.Printf("Connector %q is ready\n", cmd.name)
diff --git a/internal/cmd/skupper/connector/kube/connector_delete.go b/internal/cmd/skupper/connector/kube/connector_delete.go
index beaeff66..c199bb60 100644
--- a/internal/cmd/skupper/connector/kube/connector_delete.go
+++ b/internal/cmd/skupper/connector/kube/connector_delete.go
@@ -119,7 +119,7 @@ func (cmd *CmdConnectorDelete) WaitUntil() error {
 	})
 
 	if err != nil {
-		return fmt.Errorf("Connector %q not deleted yet, check the logs for more information %s\n", cmd.name, err)
+		return fmt.Errorf("Connector %q not deleted yet, check the status for more information %s\n", cmd.name, err)
 	}
 
 	fmt.Printf("Connector %q deleted\n", cmd.name)
diff --git a/internal/cmd/skupper/connector/kube/connector_update.go b/internal/cmd/skupper/connector/kube/connector_update.go
index d8e2da63..0c605a54 100644
--- a/internal/cmd/skupper/connector/kube/connector_update.go
+++ b/internal/cmd/skupper/connector/kube/connector_update.go
@@ -262,7 +262,7 @@ func (cmd *CmdConnectorUpdate) WaitUntil() error {
 	})
 
 	if err != nil {
-		return fmt.Errorf("Connector %q not ready yet, check the logs for more information\n", cmd.name)
+		return fmt.Errorf("Connector %q not ready yet, check the status for more information\n", cmd.name)
 	}
 
 	fmt.Printf("Connector %q is ready\n", cmd.name)
diff --git a/internal/cmd/skupper/link/kube/link_delete.go b/internal/cmd/skupper/link/kube/link_delete.go
index 08d36bfe..b96578c8 100644
--- a/internal/cmd/skupper/link/kube/link_delete.go
+++ b/internal/cmd/skupper/link/kube/link_delete.go
@@ -123,7 +123,7 @@ func (cmd *CmdLinkDelete) WaitUntil() error {
 	})
 
 	if err != nil {
-		return fmt.Errorf("Link %q not deleted yet, check the logs for more information\n", cmd.linkName)
+		return fmt.Errorf("Link %q not deleted yet, check the status for more information\n", cmd.linkName)
 	}
 
 	fmt.Printf("Link %q is deleted\n", cmd.linkName)
diff --git a/internal/cmd/skupper/link/kube/link_generate.go b/internal/cmd/skupper/link/kube/link_generate.go
index ef464090..0d2c1276 100644
--- a/internal/cmd/skupper/link/kube/link_generate.go
+++ b/internal/cmd/skupper/link/kube/link_generate.go
@@ -280,7 +280,7 @@ func (cmd *CmdLinkGenerate) WaitUntil() error {
 		})
 
 		if err != nil {
-			return fmt.Errorf("TLS secret %q not ready yet, check the logs for more information\n", cmd.tlsSecret)
+			return fmt.Errorf("TLS secret %q not ready yet, check the status for more information\n", cmd.tlsSecret)
 		}
 
 	}
diff --git a/internal/cmd/skupper/link/kube/link_update.go b/internal/cmd/skupper/link/kube/link_update.go
index 4472b61b..ac234971 100644
--- a/internal/cmd/skupper/link/kube/link_update.go
+++ b/internal/cmd/skupper/link/kube/link_update.go
@@ -222,7 +222,7 @@ func (cmd *CmdLinkUpdate) WaitUntil() error {
 	})
 
 	if err != nil {
-		return fmt.Errorf("Link %q not updated yet, check the logs for more information\n", cmd.linkName)
+		return fmt.Errorf("Link %q not updated yet, check the status for more information\n", cmd.linkName)
 	}
 
 	fmt.Printf("Link %q is updated\n", cmd.linkName)
diff --git a/internal/cmd/skupper/listener/kube/listener_create.go b/internal/cmd/skupper/listener/kube/listener_create.go
index 53035df6..eb0a6cdd 100644
--- a/internal/cmd/skupper/listener/kube/listener_create.go
+++ b/internal/cmd/skupper/listener/kube/listener_create.go
@@ -230,7 +230,7 @@ func (cmd *CmdListenerCreate) WaitUntil() error {
 	})
 
 	if err != nil {
-		return fmt.Errorf("Listener %q not ready yet, check the logs for more information\n", cmd.name)
+		return fmt.Errorf("Listener %q not ready yet, check the status for more information\n", cmd.name)
 	}
 
 	fmt.Printf("Listener %q is ready\n", cmd.name)
diff --git a/internal/cmd/skupper/listener/kube/listener_delete.go b/internal/cmd/skupper/listener/kube/listener_delete.go
index fea5fdcc..158bf66d 100644
--- a/internal/cmd/skupper/listener/kube/listener_delete.go
+++ b/internal/cmd/skupper/listener/kube/listener_delete.go
@@ -120,7 +120,7 @@ func (cmd *CmdListenerDelete) WaitUntil() error {
 	})
 
 	if err != nil {
-		return fmt.Errorf("Listener %q not deleted yet, check the logs for more information %s\n", cmd.name, err)
+		return fmt.Errorf("Listener %q not deleted yet, check the status for more information %s\n", cmd.name, err)
 	}
 
 	fmt.Printf("Listener %q deleted\n", cmd.name)
diff --git a/internal/cmd/skupper/listener/kube/listener_update.go b/internal/cmd/skupper/listener/kube/listener_update.go
index 04cb62d7..ed3ad08b 100644
--- a/internal/cmd/skupper/listener/kube/listener_update.go
+++ b/internal/cmd/skupper/listener/kube/listener_update.go
@@ -231,7 +231,7 @@ func (cmd *CmdListenerUpdate) WaitUntil() error {
 	})
 
 	if err != nil {
-		return fmt.Errorf("Listener %q not ready yet, check the logs for more information\n", cmd.name)
+		return fmt.Errorf("Listener %q not ready yet, check the status for more information\n", cmd.name)
 	}
 
 	fmt.Printf("Listener %q is ready\n", cmd.name)
diff --git a/internal/cmd/skupper/site/kube/site_create.go b/internal/cmd/skupper/site/kube/site_create.go
index 24fa721b..575c2952 100644
--- a/internal/cmd/skupper/site/kube/site_create.go
+++ b/internal/cmd/skupper/site/kube/site_create.go
@@ -6,16 +6,14 @@ package kube
 import (
 	"context"
 	"fmt"
-	"k8s.io/client-go/kubernetes"
-
 	"github.com/skupperproject/skupper/internal/cmd/skupper/utils"
 	"github.com/skupperproject/skupper/internal/kube/client"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v1alpha1"
 	skupperv1alpha1 "github.com/skupperproject/skupper/pkg/generated/client/clientset/versioned/typed/skupper/v1alpha1"
-	"github.com/skupperproject/skupper/pkg/site"
 	"github.com/skupperproject/skupper/pkg/utils/validator"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/kubernetes"
 )
 
 var (
@@ -36,7 +34,6 @@ type CmdSiteCreate struct {
 	KubeClient         kubernetes.Interface
 	CobraCmd           cobra.Command
 	flags              CreateFlags
-	options            map[string]string
 	siteName           string
 	serviceAccountName string
 	Namespace          string
@@ -46,8 +43,7 @@ type CmdSiteCreate struct {
 
 func NewCmdSiteCreate() *CmdSiteCreate {
 
-	options := make(map[string]string)
-	skupperCmd := CmdSiteCreate{options: options, flags: CreateFlags{}}
+	skupperCmd := CmdSiteCreate{flags: CreateFlags{}}
 
 	cmd := cobra.Command{
 		Use:    "create <name>",
@@ -152,15 +148,8 @@ func (cmd *CmdSiteCreate) InputToOptions() {
 		} else {
 			cmd.linkAccessType = cmd.flags.linkAccessType
 		}
-	} else {
-		cmd.linkAccessType = "none"
 	}
 
-	options := make(map[string]string)
-	options[site.SiteConfigNameKey] = cmd.siteName
-
-	cmd.options = options
-
 	cmd.output = cmd.flags.output
 
 }
@@ -177,7 +166,6 @@ func (cmd *CmdSiteCreate) Run() error {
 			Namespace: cmd.Namespace,
 		},
 		Spec: v1alpha1.SiteSpec{
-			Settings:       cmd.options,
 			ServiceAccount: cmd.serviceAccountName,
 			LinkAccess:     cmd.linkAccessType,
 		},
@@ -218,7 +206,7 @@ func (cmd *CmdSiteCreate) WaitUntil() error {
 	})
 
 	if err != nil {
-		return fmt.Errorf("Site %q not configured yet, check the logs for more information\n", cmd.siteName)
+		return fmt.Errorf("Site %q not configured yet, check the status for more information\n", cmd.siteName)
 	}
 
 	fmt.Printf("Site %q is configured. Check the status to see when it is ready\n", cmd.siteName)
diff --git a/internal/cmd/skupper/site/kube/site_delete.go b/internal/cmd/skupper/site/kube/site_delete.go
index f43133e7..b795f454 100644
--- a/internal/cmd/skupper/site/kube/site_delete.go
+++ b/internal/cmd/skupper/site/kube/site_delete.go
@@ -113,7 +113,7 @@ func (cmd *CmdSiteDelete) WaitUntil() error {
 	})
 
 	if err != nil {
-		return fmt.Errorf("Site %q not deleted yet, check the logs for more information\n", cmd.siteName)
+		return fmt.Errorf("Site %q not deleted yet, check the status for more information\n", cmd.siteName)
 	}
 
 	fmt.Printf("Site %q is deleted\n", cmd.siteName)
diff --git a/internal/cmd/skupper/site/kube/site_update.go b/internal/cmd/skupper/site/kube/site_update.go
index 1bf99fe0..53b47d32 100644
--- a/internal/cmd/skupper/site/kube/site_update.go
+++ b/internal/cmd/skupper/site/kube/site_update.go
@@ -244,7 +244,7 @@ func (cmd *CmdSiteUpdate) WaitUntil() error {
 	})
 
 	if err != nil {
-		return fmt.Errorf("Site %q not ready yet, check the logs for more information\n", cmd.siteName)
+		return fmt.Errorf("Site %q not ready yet, check the status for more information\n", cmd.siteName)
 	}
 
 	fmt.Printf("Site %q is updated\n", cmd.siteName)
diff --git a/internal/cmd/skupper/token/kube/token_issue.go b/internal/cmd/skupper/token/kube/token_issue.go
index e98afe96..8899ff93 100644
--- a/internal/cmd/skupper/token/kube/token_issue.go
+++ b/internal/cmd/skupper/token/kube/token_issue.go
@@ -9,13 +9,11 @@ import (
 	"github.com/skupperproject/skupper/internal/cmd/skupper/utils"
 	"github.com/skupperproject/skupper/internal/kube/client"
 	"github.com/skupperproject/skupper/pkg/apis/skupper/v1alpha1"
-	"github.com/skupperproject/skupper/pkg/generated/client/clientset/versioned/scheme"
 	skupperv1alpha1 "github.com/skupperproject/skupper/pkg/generated/client/clientset/versioned/typed/skupper/v1alpha1"
 	"github.com/skupperproject/skupper/pkg/utils/validator"
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime/serializer/json"
 )
 
 var (
@@ -112,7 +110,7 @@ func (cmd *CmdTokenIssue) ValidateInput(args []string) []error {
 	if siteList == nil || len(siteList.Items) == 0 {
 		validationErrors = append(validationErrors, fmt.Errorf("A site must exist in namespace %s before a token can be created", cmd.namespace))
 	} else {
-		if !utils.SiteConfigured(siteList) {
+		if !utils.SiteReady(siteList) {
 			validationErrors = append(validationErrors, fmt.Errorf("there is no active skupper site in this namespace"))
 		}
 	}
@@ -167,31 +165,46 @@ func (cmd *CmdTokenIssue) Run() error {
 func (cmd *CmdTokenIssue) WaitUntil() error {
 	err := utils.NewSpinnerWithTimeout("Waiting for token status ...", int(cmd.flags.timeout.Seconds()), func() error {
 
-		token, err := cmd.client.AccessGrants(cmd.namespace).Get(context.TODO(), cmd.grantName, metav1.GetOptions{})
+		accessGrant, err := cmd.client.AccessGrants(cmd.namespace).Get(context.TODO(), cmd.grantName, metav1.GetOptions{})
 		if err != nil {
 			return err
 		}
 
-		if token != nil && token.IsReady() {
-			// write token to file
-			s := json.NewYAMLSerializer(json.DefaultMetaFactory, scheme.Scheme, scheme.Scheme)
-			out, err := os.Create(cmd.fileName)
-			if err != nil {
-				return fmt.Errorf("Could not write to file " + cmd.fileName + ": " + err.Error())
+		if accessGrant != nil && accessGrant.IsReady() {
+
+			accessToken := v1alpha1.AccessToken{
+				TypeMeta: metav1.TypeMeta{
+					APIVersion: "skupper.io/v1alpha1",
+					Kind:       "AccessToken",
+				},
+				ObjectMeta: metav1.ObjectMeta{
+					Name: accessGrant.Name,
+				},
+				Spec: v1alpha1.AccessTokenSpec{
+					Url:  accessGrant.Status.Url,
+					Code: accessGrant.Status.Code,
+					Ca:   accessGrant.Status.Ca,
+				},
 			}
-			err = s.Encode(token, out)
+
+			encodedResource, err := utils.Encode("yaml", accessToken)
 			if err != nil {
 				return fmt.Errorf("Could not write out generated token: " + err.Error())
-			} else {
-				return nil
 			}
+
+			err = os.WriteFile(cmd.fileName, []byte(encodedResource), 0644)
+			if err != nil {
+				return fmt.Errorf("Could not write to file " + cmd.fileName + ": " + err.Error())
+			}
+
+			return nil
 		}
 
 		return fmt.Errorf("error getting the resource")
 	})
 
 	if err != nil {
-		return fmt.Errorf("Grant %q not ready yet, check the logs for more information\n", cmd.grantName)
+		return fmt.Errorf("Grant %q not ready yet, check the status for more information\n", cmd.grantName)
 	}
 
 	fmt.Printf("\nGrant %q is ready\n", cmd.grantName)
diff --git a/internal/cmd/skupper/token/kube/token_redeem.go b/internal/cmd/skupper/token/kube/token_redeem.go
index b85ebec2..1c9d9e86 100644
--- a/internal/cmd/skupper/token/kube/token_redeem.go
+++ b/internal/cmd/skupper/token/kube/token_redeem.go
@@ -97,7 +97,7 @@ func (cmd *CmdTokenRedeem) ValidateInput(args []string) []error {
 	if siteList == nil || len(siteList.Items) == 0 {
 		validationErrors = append(validationErrors, fmt.Errorf("A site must exist in namespace %s before a token can be redeemed", cmd.namespace))
 	} else {
-		if !utils.SiteConfigured(siteList) {
+		if !utils.SiteReady(siteList) {
 			validationErrors = append(validationErrors, fmt.Errorf("there is no active skupper site in this namespace"))
 		}
 	}
@@ -121,7 +121,7 @@ func (cmd *CmdTokenRedeem) ValidateInput(args []string) []error {
 func (cmd *CmdTokenRedeem) Run() error {
 
 	// get data from token file
-	var grant v1alpha1.AccessGrant
+	var accessToken v1alpha1.AccessToken
 	var tokenFile []byte
 	tokenFile, err := os.ReadFile(cmd.fileName)
 	if err != nil {
@@ -129,27 +129,12 @@ func (cmd *CmdTokenRedeem) Run() error {
 		return err
 	}
 	yamlS := json.NewSerializerWithOptions(json.DefaultMetaFactory, scheme.Scheme, scheme.Scheme, json.SerializerOptions{Yaml: true})
-	yamlS.Decode(tokenFile, nil, &grant)
-	cmd.name = grant.Name
-
-	// create AccessToken
-	resource := v1alpha1.AccessToken{
-		TypeMeta: metav1.TypeMeta{
-			APIVersion: "skupper.io/v1alpha1",
-			Kind:       "AccessToken",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      cmd.name,
-			Namespace: cmd.namespace,
-		},
-		Spec: v1alpha1.AccessTokenSpec{
-			Url:  grant.Status.Url,
-			Ca:   grant.Status.Ca,
-			Code: grant.Status.Code,
-		},
-	}
+	yamlS.Decode(tokenFile, nil, &accessToken)
+
+	accessToken.Namespace = cmd.namespace
+	cmd.name = accessToken.Name
 
-	_, err = cmd.client.AccessTokens(cmd.namespace).Create(context.TODO(), &resource, metav1.CreateOptions{})
+	_, err = cmd.client.AccessTokens(cmd.namespace).Create(context.TODO(), &accessToken, metav1.CreateOptions{})
 	return err
 }
 
@@ -170,7 +155,7 @@ func (cmd *CmdTokenRedeem) WaitUntil() error {
 	})
 
 	if err != nil {
-		return fmt.Errorf("Token %q redeem not ready yet, check the logs for more information\n", cmd.name)
+		return fmt.Errorf("Token %q redeem not ready yet, check the status for more information\n", cmd.name)
 	}
 
 	fmt.Printf("Token %q has been redeemed\n", cmd.name)
diff --git a/internal/cmd/skupper/utils/config.go b/internal/cmd/skupper/utils/config.go
new file mode 100644
index 00000000..bd7ff1e3
--- /dev/null
+++ b/internal/cmd/skupper/utils/config.go
@@ -0,0 +1,23 @@
+package utils
+
+import "time"
+
+type RetryProfile struct {
+	MinimumTimeout  time.Duration
+	MinimumInterval time.Duration
+}
+
+var DefaultRetryProfile = RetryProfile{
+	MinimumTimeout:  30 * time.Second,
+	MinimumInterval: 1 * time.Second,
+}
+
+var TestRetryProfile = RetryProfile{
+	MinimumTimeout:  1 * time.Second,
+	MinimumInterval: 1 * time.Millisecond,
+}
+
+var selectedProfile = DefaultRetryProfile
+
+func GetConfiguredRetryProfile() RetryProfile { return selectedProfile }
+func SetRetryProfile(profile RetryProfile)    { selectedProfile = profile }
diff --git a/internal/cmd/skupper/utils/encode.go b/internal/cmd/skupper/utils/encode.go
index fd0554cd..aaf70a85 100644
--- a/internal/cmd/skupper/utils/encode.go
+++ b/internal/cmd/skupper/utils/encode.go
@@ -3,6 +3,7 @@ package utils
 import (
 	"encoding/json"
 	"fmt"
+	"reflect"
 	"sigs.k8s.io/yaml"
 )
 
@@ -13,12 +14,75 @@ func Encode(outputType string, resource interface{}) (string, error) {
 
 	switch outputType {
 	case "json":
-		result, err = json.MarshalIndent(resource, "", "  ")
+		{
+			initialMap := make(map[string]interface{})
+			jsonData, err := json.MarshalIndent(resource, "", "  ")
+			if err != nil {
+				return "", err
+			}
+
+			err = json.Unmarshal(jsonData, &initialMap)
+			if err != nil {
+				return "", err
+			}
+
+			cleanedMap := omitEmptyValues(initialMap)
+			result, err = json.MarshalIndent(cleanedMap, "", "  ")
+		}
 	case "yaml":
-		result, err = yaml.Marshal(resource)
+		{
+			initialMap := make(map[string]interface{})
+			yamlData, err := yaml.Marshal(resource)
+			if err != nil {
+				return "", err
+			}
+
+			err = yaml.Unmarshal(yamlData, &initialMap)
+			if err != nil {
+				return "", err
+			}
+
+			cleanedMap := omitEmptyValues(initialMap)
+
+			result, err = yaml.Marshal(cleanedMap)
+		}
+
 	default:
 		return "", fmt.Errorf("format %s not supported", outputType)
 	}
 
 	return string(result), err
 }
+
+func omitEmptyValues(data map[string]interface{}) map[string]interface{} {
+	cleaned := make(map[string]interface{})
+	for k, v := range data {
+		if !isZeroValue(v) {
+			if reflect.TypeOf(v).Kind() == reflect.Map {
+				if vm, ok := v.(map[string]interface{}); ok {
+					v = omitEmptyValues(vm)
+				}
+			}
+			cleaned[k] = v
+		}
+	}
+	return cleaned
+}
+
+func isZeroValue(x interface{}) bool {
+	if x == nil {
+		return true
+	}
+
+	v := reflect.ValueOf(x)
+	switch v.Kind() {
+	case reflect.Map, reflect.Slice, reflect.Array:
+		return v.Len() == 0
+	case reflect.Struct:
+		z := reflect.New(v.Type()).Elem().Interface()
+		return reflect.DeepEqual(x, z)
+	default:
+		z := reflect.Zero(v.Type()).Interface()
+		return reflect.DeepEqual(x, z)
+	}
+}
diff --git a/internal/cmd/skupper/utils/handle_error.go b/internal/cmd/skupper/utils/handle_error.go
index 821c6e43..51623f21 100644
--- a/internal/cmd/skupper/utils/handle_error.go
+++ b/internal/cmd/skupper/utils/handle_error.go
@@ -5,10 +5,15 @@ import (
 	"syscall"
 )
 
+const (
+	GenericError    = 1
+	ValidationError = 2
+)
+
 func HandleError(err error) {
 	if err != nil {
 		fmt.Println(err)
-		syscall.Exit(0)
+		syscall.Exit(GenericError)
 	}
 }
 
@@ -18,7 +23,7 @@ func HandleErrorList(errList []error) {
 			fmt.Println(err)
 		}
 
-		syscall.Exit(0)
+		syscall.Exit(ValidationError)
 	}
 }
 
diff --git a/internal/cmd/skupper/utils/spinner.go b/internal/cmd/skupper/utils/spinner.go
index 13bafde0..526a248e 100644
--- a/internal/cmd/skupper/utils/spinner.go
+++ b/internal/cmd/skupper/utils/spinner.go
@@ -2,14 +2,15 @@ package utils
 
 import (
 	"context"
+	"time"
+
 	"github.com/briandowns/spinner"
 	"github.com/skupperproject/skupper/pkg/utils"
-	"time"
 )
 
 func NewSpinner(message string, maxRetries int, function func() error) error {
 
-	spin := spinner.New(spinner.CharSets[9], 100*time.Millisecond)
+	spin := spinner.New(spinner.CharSets[9], 100*time.Millisecond, spinner.WithHiddenCursor(false))
 	spin.Prefix = message
 	spin.FinalMSG = message + "\n"
 
@@ -28,6 +29,7 @@ func NewSpinner(message string, maxRetries int, function func() error) error {
 
 func NewSpinnerWithTimeout(message string, timeoutInSeconds int, function func() error) error {
 
+	retryProfile := GetConfiguredRetryProfile()
 	spin := spinner.New(spinner.CharSets[9], 100*time.Millisecond)
 	spin.Prefix = message
 	spin.FinalMSG = message + "\n"
@@ -37,7 +39,7 @@ func NewSpinnerWithTimeout(message string, timeoutInSeconds int, function func()
 
 	spin.Start()
 
-	err := utils.RetryErrorWithContext(ctx, time.Second, function)
+	err := utils.RetryErrorWithContext(ctx, retryProfile.MinimumInterval, function)
 
 	spin.Stop()
 
diff --git a/internal/cmd/skupper/utils/status.go b/internal/cmd/skupper/utils/status.go
index 1029bd50..04a9377e 100644
--- a/internal/cmd/skupper/utils/status.go
+++ b/internal/cmd/skupper/utils/status.go
@@ -12,3 +12,12 @@ func SiteConfigured(siteList *v1alpha1.SiteList) bool {
 	}
 	return false
 }
+
+func SiteReady(siteList *v1alpha1.SiteList) bool {
+	for _, s := range siteList.Items {
+		if s.IsReady() {
+			return true
+		}
+	}
+	return false
+}
diff --git a/internal/flag/flag.go b/internal/flag/flag.go
new file mode 100644
index 00000000..807d14c6
--- /dev/null
+++ b/internal/flag/flag.go
@@ -0,0 +1,55 @@
+package flag
+
+import (
+	"flag"
+	"fmt"
+	"os"
+	"strconv"
+)
+
+func StringVar(flags *flag.FlagSet, output *string, flagName string, envVarName string, defaultValue string, usage string) {
+	flags.StringVar(output, flagName, stringEnvVar(envVarName, defaultValue), usage)
+}
+
+func BoolVar(flags *flag.FlagSet, output *bool, flagName string, envVarName string, defaultValue bool, usage string) error {
+	dval, err := boolEnvVar(envVarName, defaultValue)
+	//set flag inspite of error, caller can decide whether to ignore and go with default or not
+	flags.BoolVar(output, flagName, dval, usage)
+	return err
+}
+
+func IntVar(flags *flag.FlagSet, output *int, flagName string, envVarName string, defaultValue int, usage string) error {
+	dval, err := intEnvVar(envVarName, defaultValue)
+	//set flag inspite of error, caller can decide whether to ignore and go with default or not
+	flags.IntVar(output, flagName, dval, usage)
+	return err
+}
+
+func intEnvVar(name string, defaultValue int) (int, error) {
+	if svalue, ok := os.LookupEnv(name); ok {
+		value, err := strconv.Atoi(svalue)
+		if err != nil {
+			return defaultValue, fmt.Errorf("Bad value for %q: %s", name, err)
+		}
+		return value, nil
+	}
+	return defaultValue, nil
+}
+
+func boolEnvVar(name string, defaultValue bool) (bool, error) {
+	if svalue, ok := os.LookupEnv(name); ok {
+		value, err := strconv.ParseBool(svalue)
+		if err != nil {
+			return defaultValue, fmt.Errorf("Bad value for %q: %s", name, err)
+		}
+		return value, nil
+	}
+	return defaultValue, nil
+}
+
+func stringEnvVar(name string, defaultValue string) string {
+	if value, ok := os.LookupEnv(name); ok {
+		return value
+	}
+	return defaultValue
+}
diff --git a/pkg/apis/skupper/v1alpha1/types.go b/pkg/apis/skupper/v1alpha1/types.go
index 3ff6539d..28ae691a 100644
--- a/pkg/apis/skupper/v1alpha1/types.go
+++ b/pkg/apis/skupper/v1alpha1/types.go
@@ -54,6 +54,16 @@ func (s *Site) GetSiteId() string {
 	return string(s.ObjectMeta.UID)
 }
 
+func (s *Site) DefaultIssuer() string {
+	if s.Spec.DefaultIssuer != "" {
+		return s.Spec.DefaultIssuer
+	}
+	if s.Status.DefaultIssuer != "" {
+		return s.Status.DefaultIssuer
+	}
+	return "skupper-site-ca"
+}
+
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // SiteList contains a List of Site instances
diff --git a/pkg/certs/certs.go b/pkg/certs/certs.go
index 3312409e..c3321815 100644
--- a/pkg/certs/certs.go
+++ b/pkg/certs/certs.go
@@ -163,6 +163,8 @@ func generateSecret(name string, subject string, hosts string, ca *CertificateAu
 	secret.Data["tls.key"] = []byte(keyString)
 	if ca != nil {
 		secret.Data["ca.crt"] = ca.CrtData
+	} else {
+		secret.Data["ca.crt"] = secret.Data["tls.crt"] //self.signed
 	}
 
 	return secret
diff --git a/pkg/kube/claims/grant_config.go b/pkg/kube/claims/grant_config.go
deleted file mode 100644
index 25a50bfc..00000000
--- a/pkg/kube/claims/grant_config.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package claims
-
-import (
-	"os"
-	"path"
-	"strconv"
-)
-
-type GrantConfig struct {
-	Enabled              bool
-	BaseUrl              string
-	SecuredAccessKey     string
-	Addr                 string
-	TlsCredentialsPath   string
-	TlsCredentialsSecret string
-	CertPath             string
-	KeyPath              string
-	CaPath               string
-}
-
-func GrantConfigFromEnv() *GrantConfig {
-	c := &GrantConfig{
-		Enabled:              boolEnvVar("SKUPPER_ENABLE_GRANTS"),
-		BaseUrl:              os.Getenv("SKUPPER_CLAIMS_BASE_URL"),
-		SecuredAccessKey:     os.Getenv("SKUPPER_CLAIMS_GET_BASE_URL_FROM"),
-		TlsCredentialsPath:   os.Getenv("SKUPPER_CLAIMS_TLS_CREDENTIALS_PATH"),
-		TlsCredentialsSecret: os.Getenv("SKUPPER_CLAIMS_TLS_CREDENTIALS_SECRET"),
-	}
-
-	port := os.Getenv("SKUPPER_CLAIMS_PORT")
-	if port == "" {
-		port = "9090"
-	}
-	c.Addr = ":" + port
-
-	if c.TlsCredentialsSecret != "" && c.TlsCredentialsPath == "" {
-		c.TlsCredentialsPath = "/etc/controller/grant-server"
-	}
-	if c.TlsCredentialsPath != "" {
-		c.CertPath = path.Join(c.TlsCredentialsPath, "tls.crt")
-		c.KeyPath = path.Join(c.TlsCredentialsPath, "tls.key")
-		c.CaPath = path.Join(c.TlsCredentialsPath, "ca.crt")
-	}
-
-	return c
-}
-
-func (c *GrantConfig) scheme() string {
-	if c.TlsCredentialsSecret != "" {
-		return "https"
-	} else {
-		return "http"
-	}
-}
-
-func boolEnvVar(name string) bool {
-	value, _ := strconv.ParseBool(os.Getenv(name))
-	return value
-}
diff --git a/pkg/kube/claims/grant_manager.go b/pkg/kube/claims/grant_manager.go
deleted file mode 100644
index a3f1ea51..00000000
--- a/pkg/kube/claims/grant_manager.go
+++ /dev/null
@@ -1,102 +0,0 @@
-package claims
-
-import (
-	"context"
-	"log"
-
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	internalclient "github.com/skupperproject/skupper/internal/kube/client"
-	skupperv1alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v1alpha1"
-	"github.com/skupperproject/skupper/pkg/kube"
-)
-
-type GrantManager interface {
-	Watch(controller *kube.Controller, namespace string)
-	Start()
-	GrantChanged(key string, grant *skupperv1alpha1.AccessGrant) error
-	SecuredAccessChanged(key string, se *skupperv1alpha1.SecuredAccess)
-}
-
-func NewGrantManager(clients internalclient.Clients, config *GrantConfig, generator GrantResponse) GrantManager {
-	if !config.Enabled {
-		return &GrantsDisabled{
-			clients: clients,
-		}
-	}
-	if config.SecuredAccessKey != "" {
-		server := &UrlFromSecuredAccess{
-			key:                  config.SecuredAccessKey,
-			tlsCredentialsPath:   config.TlsCredentialsPath,
-			tlsCredentialsSecret: config.TlsCredentialsSecret,
-		}
-		server.configure(clients, config, generator)
-		return server
-	}
-	server := &UrlFromEnv{}
-	server.configure(clients, config, generator)
-	return server
-}
-
-type UrlFromEnv struct {
-	GrantServer
-}
-
-func (s *UrlFromEnv) SecuredAccessChanged(key string, se *skupperv1alpha1.SecuredAccess) {}
-func (s *UrlFromEnv) Watch(controller *kube.Controller, namespace string)                {}
-
-func (s *UrlFromEnv) Start() {
-	s.start()
-}
-
-type UrlFromSecuredAccess struct {
-	GrantServer
-	key                  string
-	ready                bool
-	started              bool
-	tlsCredentialsPath   string
-	tlsCredentialsSecret string
-}
-
-func (s *UrlFromSecuredAccess) SecuredAccessChanged(key string, se *skupperv1alpha1.SecuredAccess) {
-	log.Printf("Grant Manager handling SecuredAccess event for %s", key)
-	if se != nil && s.key == key && len(se.Status.Endpoints) > 0 && s.grants.getUrl() != se.Status.Endpoints[0].Url() {
-		if s.grants.setUrl(se.Status.Endpoints[0].Url()) {
-			s.grants.recheckUrl()
-		}
-		if s.ready && !s.started {
-			s.started = true
-			log.Print("Starting grant server")
-			s.start()
-		}
-	}
-}
-
-func (s *UrlFromSecuredAccess) Start() {
-	s.ready = true
-	if s.grants.url != "" {
-		s.start()
-	}
-}
-
-func (s *UrlFromSecuredAccess) Watch(controller *kube.Controller, namespace string) {
-	controller.WatchSecrets(kube.ByName(s.tlsCredentialsSecret), namespace, s.tlsCredentialsUpdated)
-}
-
-type GrantsDisabled struct {
-	clients internalclient.Clients
-}
-
-func (s *GrantsDisabled) GrantChanged(key string, grant *skupperv1alpha1.AccessGrant) error {
-	if grant == nil || !grant.Status.SetStatusMessage("AccessGrants are not enabled") {
-		return nil
-	}
-	if _, err := s.clients.GetSkupperClient().SkupperV1alpha1().AccessGrants(grant.ObjectMeta.Namespace).UpdateStatus(context.TODO(), grant, metav1.UpdateOptions{}); err != nil {
-		log.Printf("AccessGrants are not enabled. Error updating status for %s: %s", key, err)
-	}
-	return nil
-}
-
-func (s *GrantsDisabled) SecuredAccessChanged(key string, se *skupperv1alpha1.SecuredAccess) {}
-func (s *GrantsDisabled) Start()                                                             {}
-func (s *GrantsDisabled) Watch(controller *kube.Controller, namespace string)                {}
diff --git a/pkg/kube/claims/grant_server.go b/pkg/kube/claims/grant_server.go
deleted file mode 100644
index 2e3e0afb..00000000
--- a/pkg/kube/claims/grant_server.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package claims
-
-import (
-	"crypto/tls"
-	"log"
-	"net/http"
-	"sync"
-	"time"
-
-	corev1 "k8s.io/api/core/v1"
-
-	internalclient "github.com/skupperproject/skupper/internal/kube/client"
-	skupperv1alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v1alpha1"
-	"github.com/skupperproject/skupper/pkg/utils/tlscfg"
-)
-
-type GrantServer struct {
-	grants   *Grants
-	addr     string
-	keyPath  string
-	certPath string
-	lock     sync.RWMutex
-	cert     *tls.Certificate
-}
-
-func (s *GrantServer) GrantChanged(key string, grant *skupperv1alpha1.AccessGrant) error {
-	return s.grants.checkGrant(key, grant)
-}
-
-func (s *GrantServer) start() {
-	go s.listen()
-}
-
-func (s *GrantServer) configure(clients internalclient.Clients, config *GrantConfig, generator GrantResponse) {
-	s.addr = config.Addr
-	s.keyPath = config.KeyPath
-	s.certPath = config.CertPath
-	s.grants = newGrants(clients, generator, config.scheme(), config.BaseUrl)
-}
-
-func (s *GrantServer) getCertificate(*tls.ClientHelloInfo) (*tls.Certificate, error) {
-	s.lock.RLock()
-	defer s.lock.RUnlock()
-	return s.cert, nil
-}
-
-func (s *GrantServer) setCertificate(cert *tls.Certificate) {
-	s.lock.Lock()
-	defer s.lock.Unlock()
-	s.cert = cert
-}
-
-func (s *GrantServer) tlsCredentialsUpdated(key string, secret *corev1.Secret) error {
-	if secret == nil {
-		return nil
-	}
-	cert, err := tls.X509KeyPair(secret.Data["tls.crt"], secret.Data["tls.key"])
-	if err != nil {
-		log.Printf("Could not get X509 key pair for grant server from %s: %s", key, err)
-		return nil
-	}
-	s.setCertificate(&cert)
-	if s.grants.setCA(string(secret.Data["ca.crt"])) {
-		s.grants.recheckCa()
-	}
-	log.Print("Grant server tls credentials updated")
-	return nil
-}
-
-func (s *GrantServer) listen() {
-	server := &http.Server{
-		Addr:         s.addr,
-		Handler:      s.grants,
-		ReadTimeout:  60 * time.Second,
-		WriteTimeout: 60 * time.Second,
-		TLSConfig:    tlscfg.Modern(),
-	}
-
-	if s.certPath != "" && s.keyPath != "" {
-		server.TLSConfig.GetCertificate = s.getCertificate
-		err := server.ListenAndServeTLS("", "")
-		if err != nil {
-			log.Printf("Grant server failed to start on %s: %s", s.addr, err)
-		} else {
-			log.Printf("Grant server listening on %s (TLS enabled)", s.addr)
-		}
-	} else {
-		err := server.ListenAndServe()
-		if err != nil {
-			log.Printf("Grant server failed to start on %s: %s", s.addr, err)
-		} else {
-			log.Printf("Grant server listening on %s (TLS not enabled)", s.addr)
-		}
-	}
-}
diff --git a/pkg/kube/claims/redeem.go b/pkg/kube/claims/redeem.go
deleted file mode 100644
index 3a5913c4..00000000
--- a/pkg/kube/claims/redeem.go
+++ /dev/null
@@ -1,124 +0,0 @@
-package claims
-
-import (
-	"bytes"
-	"context"
-	"crypto/tls"
-	"crypto/x509"
-	"fmt"
-	"io"
-	"log"
-	"net/http"
-	"strings"
-
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/util/yaml"
-
-	internalclient "github.com/skupperproject/skupper/internal/kube/client"
-	skupperv1alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v1alpha1"
-)
-
-func RedeemAccessToken(claim *skupperv1alpha1.AccessToken, site *skupperv1alpha1.Site, clients internalclient.Clients) error {
-	transport := &http.Transport{}
-	if claim.Spec.Ca != "" {
-		caPool := x509.NewCertPool()
-		caPool.AppendCertsFromPEM([]byte(claim.Spec.Ca))
-		transport.TLSClientConfig = &tls.Config{
-			RootCAs: caPool,
-		}
-	}
-	client := &http.Client{
-		Transport: transport,
-	}
-	request, err := http.NewRequest(http.MethodPost, claim.Spec.Url, bytes.NewReader([]byte(claim.Spec.Code)))
-	if err != nil {
-		return err
-	}
-	request.Header.Add("name", claim.Name)
-	request.Header.Add("subject", string(site.ObjectMeta.UID))
-	response, err := client.Do(request)
-	if err != nil {
-		return updateAccessTokenStatus(claim, err, clients)
-	}
-	if response.StatusCode != http.StatusOK {
-		body, err := io.ReadAll(response.Body)
-		if err == nil {
-			err = fmt.Errorf("Received HTTP Response %d: %s", response.StatusCode, strings.TrimSpace(string(body)))
-		} else {
-			err = fmt.Errorf("Received HTTP Response %d. Could not read body: %s", response.StatusCode, err)
-		}
-		return updateAccessTokenStatus(claim, err, clients)
-	}
-	log.Printf("HTTP Post to %s for %s/%s was sucessful, decoding response body", claim.Spec.Url, claim.Namespace, claim.Name)
-
-	decoder := newLinkDecoder(response.Body)
-	if err := decoder.decodeAll(); err != nil {
-		return updateAccessTokenStatus(claim, err, clients)
-	}
-	refs := []metav1.OwnerReference{
-		{
-			Kind:       "Site",
-			APIVersion: "skupper.io/v1alpha1",
-			Name:       site.Name,
-			UID:        site.ObjectMeta.UID,
-		},
-	}
-	decoder.secret.ObjectMeta.OwnerReferences = refs
-	if _, err := clients.GetKubeClient().CoreV1().Secrets(claim.ObjectMeta.Namespace).Create(context.TODO(), &decoder.secret, metav1.CreateOptions{}); err != nil {
-		return err
-	}
-	for _, link := range decoder.links {
-		link.ObjectMeta.OwnerReferences = refs
-		if _, err := clients.GetSkupperClient().SkupperV1alpha1().Links(claim.ObjectMeta.Namespace).Create(context.TODO(), &link, metav1.CreateOptions{}); err != nil {
-			return err
-		}
-	}
-
-	return updateAccessTokenStatus(claim, nil, clients)
-}
-
-func updateAccessTokenStatus(claim *skupperv1alpha1.AccessToken, err error, clients internalclient.Clients) error {
-	if claim.SetRedeemed(err) {
-		_, err = clients.GetSkupperClient().SkupperV1alpha1().AccessTokens(claim.ObjectMeta.Namespace).UpdateStatus(context.TODO(), claim, metav1.UpdateOptions{})
-		return err
-	}
-	return nil
-}
-
-type LinkDecoder struct {
-	decoder *yaml.YAMLOrJSONDecoder
-	secret  corev1.Secret
-	links   []skupperv1alpha1.Link
-}
-
-func newLinkDecoder(r io.Reader) *LinkDecoder {
-	return &LinkDecoder{
-		decoder: yaml.NewYAMLOrJSONDecoder(r, 1024),
-	}
-}
-
-func (d *LinkDecoder) decodeSecret() error {
-	return d.decoder.Decode(&d.secret)
-}
-
-func (d *LinkDecoder) decodeLink() error {
-	var link skupperv1alpha1.Link
-	if err := d.decoder.Decode(&link); err != nil {
-		return err
-	}
-	d.links = append(d.links, link)
-	return nil
-}
-
-func (d *LinkDecoder) decodeAll() error {
-	if err := d.decodeSecret(); err != nil {
-		return err
-	}
-	for err := d.decodeLink(); err != io.EOF; err = d.decodeLink() {
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
diff --git a/pkg/kube/controller.go b/pkg/kube/controller.go
index 313cfe0a..f873111e 100644
--- a/pkg/kube/controller.go
+++ b/pkg/kube/controller.go
@@ -46,6 +46,7 @@ import (
 
 	skupperv1alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v1alpha1"
 	skupperclient "github.com/skupperproject/skupper/pkg/generated/client/clientset/versioned"
+	skupperv1alpha1interfaces "github.com/skupperproject/skupper/pkg/generated/client/informers/externalversions/internalinterfaces"
 	skupperv1alpha1informer "github.com/skupperproject/skupper/pkg/generated/client/informers/externalversions/skupper/v1alpha1"
 )
 
@@ -160,6 +161,10 @@ func (c *Controller) run() {
 	}
 }
 
+func (c *Controller) TestProcess() bool {
+	return c.process()
+}
+
 func (c *Controller) process() bool {
 	obj, shutdown := c.queue.Get()
 
@@ -1241,6 +1246,22 @@ func (c *Controller) WatchSecuredAccesses(namespace string, handler SecuredAcces
 	return watcher
 }
 
+func (c *Controller) WatchSecuredAccessesWithOptions(options skupperv1alpha1interfaces.TweakListOptionsFunc, namespace string, handler SecuredAccessHandler) *SecuredAccessWatcher {
+	watcher := &SecuredAccessWatcher{
+		handler: handler,
+		informer: skupperv1alpha1informer.NewFilteredSecuredAccessInformer(
+			c.skupperClient,
+			namespace,
+			time.Second*30,
+			cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc},
+			options),
+		namespace: namespace,
+	}
+	watcher.informer.AddEventHandler(c.newEventHandler(watcher))
+	c.addWatcher(watcher)
+	return watcher
+}
+
 type SecuredAccessHandler func(string, *skupperv1alpha1.SecuredAccess) error
 
 type SecuredAccessWatcher struct {
@@ -1574,6 +1595,12 @@ func ByName(name string) internalinterfaces.TweakListOptionsFunc {
 	}
 }
 
+func SkupperResourceByName(name string) skupperv1alpha1interfaces.TweakListOptionsFunc {
+	return func(options *metav1.ListOptions) {
+		options.FieldSelector = "metadata.name=" + name
+	}
+}
+
 func (c *Controller) WatchAttachedConnectorAnchors(namespace string, handler AttachedConnectorAnchorHandler) *AttachedConnectorAnchorWatcher {
 	watcher := &AttachedConnectorAnchorWatcher{
 		handler: handler,
diff --git a/pkg/kube/flow/process.go b/pkg/kube/flow/process.go
index 5f05f053..7bdad39c 100644
--- a/pkg/kube/flow/process.go
+++ b/pkg/kube/flow/process.go
@@ -26,7 +26,7 @@ func asProcessRecord(pod *corev1.Pod) vanflow.ProcessRecord {
 	process.Hostname = &pod.Spec.NodeName
 	if labelName, ok := pod.ObjectMeta.Labels["app.kubernetes.io/part-of"]; ok {
 		process.Group = &labelName
-		if labelName == "skupper" {
+		if labelName == "skupper" || labelName == "skupper-network-console" {
 			process.Mode = &modeInternal
 		}
 	} else if labelComponent, ok := pod.ObjectMeta.Labels["app.kubernetes.io/name"]; ok {
diff --git a/pkg/kube/grants/autoconfigure.go b/pkg/kube/grants/autoconfigure.go
new file mode 100644
index 00000000..b3f92b5a
--- /dev/null
+++ b/pkg/kube/grants/autoconfigure.go
@@ -0,0 +1,150 @@
+package grants
+
+import (
+	"context"
+	"fmt"
+	"reflect"
+
+	"k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	internalclient "github.com/skupperproject/skupper/internal/kube/client"
+	skupperv1alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v1alpha1"
+	"github.com/skupperproject/skupper/pkg/kube"
+)
+
+type AutoConfigure struct {
+	port                 int
+	podname              string
+	tlsCredentialsSecret string
+	ownerRefs            []metav1.OwnerReference
+	selector             map[string]string
+}
+
+func (s *AutoConfigure) getConfigurationFromPod(clients internalclient.Clients, namespace string) error {
+	pod, err := clients.GetKubeClient().CoreV1().Pods(namespace).Get(context.TODO(), s.podname, metav1.GetOptions{})
+	if err != nil {
+		return err
+	}
+	s.ownerRefs = pod.ObjectMeta.OwnerReferences
+	s.selector = pod.ObjectMeta.Labels
+	return nil
+}
+
+func (s *AutoConfigure) ensureCert(clients internalclient.Clients, namespace string, desired *skupperv1alpha1.Certificate) error {
+	existing, err := clients.GetSkupperClient().SkupperV1alpha1().Certificates(namespace).Get(context.Background(), desired.Name, metav1.GetOptions{})
+	if errors.IsNotFound(err) {
+		_, err = clients.GetSkupperClient().SkupperV1alpha1().Certificates(namespace).Create(context.Background(), desired, metav1.CreateOptions{})
+		return err
+	} else if err != nil {
+		return err
+	}
+	changed := false
+	if !reflect.DeepEqual(existing.ObjectMeta.OwnerReferences, desired.ObjectMeta.OwnerReferences) {
+		changed = true
+		existing.ObjectMeta.OwnerReferences = desired.ObjectMeta.OwnerReferences
+	}
+	if !reflect.DeepEqual(existing.Spec, desired.Spec) {
+		changed = true
+		existing.Spec = desired.Spec
+	}
+	if !changed {
+		return nil
+	}
+	_, err = clients.GetSkupperClient().SkupperV1alpha1().Certificates(namespace).Update(context.Background(), existing, metav1.UpdateOptions{})
+	return err
+}
+
+func (s *AutoConfigure) ensureSecuredAccess(clients internalclient.Clients, namespace string, desired *skupperv1alpha1.SecuredAccess) error {
+	existing, err := clients.GetSkupperClient().SkupperV1alpha1().SecuredAccesses(namespace).Get(context.Background(), desired.Name, metav1.GetOptions{})
+	if errors.IsNotFound(err) {
+		_, err = clients.GetSkupperClient().SkupperV1alpha1().SecuredAccesses(namespace).Create(context.Background(), desired, metav1.CreateOptions{})
+		return err
+	} else if err != nil {
+		return err
+	}
+	changed := false
+	if !reflect.DeepEqual(existing.ObjectMeta.OwnerReferences, desired.ObjectMeta.OwnerReferences) {
+		changed = true
+		existing.ObjectMeta.OwnerReferences = desired.ObjectMeta.OwnerReferences
+	}
+	if !reflect.DeepEqual(existing.Spec, desired.Spec) {
+		changed = true
+		existing.Spec = desired.Spec
+	}
+	if !changed {
+		return nil
+	}
+	_, err = clients.GetSkupperClient().SkupperV1alpha1().SecuredAccesses(namespace).Update(context.Background(), existing, metav1.UpdateOptions{})
+	return err
+}
+
+func (s *AutoConfigure) configure(clients internalclient.Clients, namespace string) error {
+	if err := s.getConfigurationFromPod(clients, namespace); err != nil {
+		return err
+	}
+
+	cert := &skupperv1alpha1.Certificate{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "skupper.io/v1alpha1",
+			Kind:       "Certificate",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:            "skupper-grant-server-ca",
+			OwnerReferences: s.ownerRefs,
+		},
+		Spec: skupperv1alpha1.CertificateSpec{
+			Ca:      "",
+			Subject: "SkupperGrantServerCA",
+			Signing: true,
+			Client:  false,
+			Server:  false,
+		},
+	}
+	if err := s.ensureCert(clients, namespace, cert); err != nil {
+		return err
+	}
+
+	sa := &skupperv1alpha1.SecuredAccess{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "skupper.io/v1alpha1",
+			Kind:       "SecuredAccess",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:            "skupper-grant-server",
+			OwnerReferences: s.ownerRefs,
+		},
+		Spec: skupperv1alpha1.SecuredAccessSpec{
+			Selector: s.selector,
+			Ports: []skupperv1alpha1.SecuredAccessPort{
+				{
+					Name: "https",
+					Port: s.port,
+				},
+			},
+			Issuer:      "skupper-grant-server-ca",
+			Certificate: s.tlsCredentialsSecret,
+		},
+	}
+	if err := s.ensureSecuredAccess(clients, namespace, sa); err != nil {
+		return err
+	}
+	return nil
+}
+
+func newAutoConfigure(handler kube.SecuredAccessHandler, controller *kube.Controller, currentNamespace string, config *GrantConfig) (*AutoConfigure, error) {
+	ac := &AutoConfigure{
+		port:                 config.Port,
+		tlsCredentialsSecret: config.TlsCredentialsSecret,
+		podname:              config.Hostname,
+	}
+	if ac.tlsCredentialsSecret == "" {
+		//TODO: should setting TlsCredentialsSecret be allowed when auto configure is enabled?
+		ac.tlsCredentialsSecret = "skupper-grant-server"
+	}
+	if err := ac.configure(controller, currentNamespace); err != nil {
+		return nil, fmt.Errorf("Error creating resources for grant server: %s", err)
+	}
+	controller.WatchSecuredAccessesWithOptions(kube.SkupperResourceByName("skupper-grant-server"), currentNamespace, handler)
+	return ac, nil
+}
diff --git a/pkg/kube/grants/config.go b/pkg/kube/grants/config.go
new file mode 100644
index 00000000..660b0d77
--- /dev/null
+++ b/pkg/kube/grants/config.go
@@ -0,0 +1,55 @@
+package grants
+
+import (
+	"flag"
+	"fmt"
+	"strings"
+
+	iflag "github.com/skupperproject/skupper/internal/flag"
+)
+
+type GrantConfig struct {
+	Enabled              bool
+	AutoConfigure        bool
+	BaseUrl              string
+	Port                 int
+	TlsCredentialsSecret string
+	Hostname             string
+}
+
+func BoundGrantConfig(flags *flag.FlagSet) (*GrantConfig, error) {
+	c := &GrantConfig{}
+	var errors []string
+	if err := iflag.BoolVar(flags, &c.Enabled, "enable-grants", "SKUPPER_ENABLE_GRANTS", false, "Enable use of AccessGrants."); err != nil {
+		errors = append(errors, err.Error())
+	}
+	if err := iflag.BoolVar(flags, &c.AutoConfigure, "grant-server-autoconfigure", "SKUPPER_GRANT_SERVER_AUTOCONFIGURE", false, "Automatically configure the URL and TLS credentials for the AccessGrant Server."); err != nil {
+		errors = append(errors, err.Error())
+	}
+	iflag.StringVar(flags, &c.BaseUrl, "grant-server-base-url", "SKUPPER_GRANT_SERVER_BASE_URL", "", "The base url through which the AccessGrant server can be reached.")
+	if err := iflag.IntVar(flags, &c.Port, "grant-server-port", "SKUPPER_GRANT_SERVER_PORT", 9090, "The port on which the AccessGrant server should listen."); err != nil {
+		errors = append(errors, err.Error())
+	}
+	iflag.StringVar(flags, &c.TlsCredentialsSecret, "grant-server-tls-credentials", "SKUPPER_GRANT_SERVER_TLS_CREDENTIALS", "skupper-grant-server", "The name of a secret in which TLS credentials for the AccessGrant server are found.")
+	iflag.StringVar(flags, &c.Hostname, "grant-server-podname", "HOSTNAME", "", "The name of the pod in which the AccessGrant server is running (defaults to $HOSTNAME).")
+	if len(errors) > 0 {
+		return c, fmt.Errorf("Invalid environment variable(s): %s", strings.Join(errors, ", "))
+	}
+	return c, nil
+}
+
+func (c *GrantConfig) addr() string {
+	return fmt.Sprintf(":%d", c.Port)
+}
+
+func (c *GrantConfig) scheme() string {
+	if c.tlsEnabled() {
+		return "https"
+	} else {
+		return "http"
+	}
+}
+
+func (c *GrantConfig) tlsEnabled() bool {
+	return c.TlsCredentialsSecret != ""
+}
diff --git a/pkg/kube/grants/disabled.go b/pkg/kube/grants/disabled.go
new file mode 100644
index 00000000..4f7ff233
--- /dev/null
+++ b/pkg/kube/grants/disabled.go
@@ -0,0 +1,34 @@
+package grants
+
+import (
+	"context"
+	"log"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	internalclient "github.com/skupperproject/skupper/internal/kube/client"
+	skupperv1alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v1alpha1"
+	"github.com/skupperproject/skupper/pkg/kube"
+)
+
+type GrantsDisabled struct {
+	clients internalclient.Clients
+}
+
+func (s *GrantsDisabled) markGrantNotEnabled(key string, grant *skupperv1alpha1.AccessGrant) error {
+	if grant == nil || !grant.Status.SetStatusMessage("AccessGrants are not enabled") {
+		return nil
+	}
+	if _, err := s.clients.GetSkupperClient().SkupperV1alpha1().AccessGrants(grant.ObjectMeta.Namespace).UpdateStatus(context.TODO(), grant, metav1.UpdateOptions{}); err != nil {
+		log.Printf("AccessGrants are not enabled. Error updating status for %s: %s", key, err)
+	}
+	return nil
+}
+
+func disabled(controller *kube.Controller, watchNamespace string) *GrantsDisabled {
+	mgr := &GrantsDisabled{
+		clients: controller,
+	}
+	controller.WatchAccessGrants(watchNamespace, mgr.markGrantNotEnabled)
+	return mgr
+}
diff --git a/pkg/kube/grants/enabled.go b/pkg/kube/grants/enabled.go
new file mode 100644
index 00000000..9f0beaf8
--- /dev/null
+++ b/pkg/kube/grants/enabled.go
@@ -0,0 +1,88 @@
+package grants
+
+import (
+	"fmt"
+	"log"
+
+	corev1 "k8s.io/api/core/v1"
+
+	skupperv1alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v1alpha1"
+	"github.com/skupperproject/skupper/pkg/kube"
+)
+
+func enabled(controller *kube.Controller, currentNamespace string, watchNamespace string, config *GrantConfig, generator GrantResponse) *GrantsEnabled {
+	gc := &GrantsEnabled{
+		grants: newGrants(controller, generator, config.scheme(), config.BaseUrl),
+	}
+	gc.server = newServer(config.addr(), config.tlsEnabled(), gc.grants)
+
+	gc.grantWatcher = controller.WatchAccessGrants(watchNamespace, gc.grants.checkGrant)
+	gc.secretWatcher = controller.WatchSecrets(kube.ByName(config.TlsCredentialsSecret), watchNamespace, gc.tlsCredentialsUpdated)
+
+	if config.AutoConfigure {
+		ac, err := newAutoConfigure(gc.securedAccessChanged, controller, currentNamespace, config)
+		if err != nil {
+			log.Printf("Auto configuration of grant server failed: %s", err)
+		}
+		gc.autoConfigure = ac
+	}
+	return gc
+}
+
+type GrantsEnabled struct {
+	grants        *Grants
+	server        *Server
+	grantWatcher  *kube.AccessGrantWatcher
+	secretWatcher *kube.SecretWatcher
+	autoConfigure *AutoConfigure
+	started       bool
+}
+
+func (c *GrantsEnabled) Start() {
+	c.recoverGrants()
+	c.recoverSecrets()
+	if c.autoConfigure == nil {
+		c.server.start()
+	}
+}
+
+func (c *GrantsEnabled) recoverGrants() {
+	for _, grant := range c.grantWatcher.List() {
+		c.grants.checkGrant(fmt.Sprintf("%s/%s", grant.Namespace, grant.Name), grant)
+	}
+}
+
+func (c *GrantsEnabled) recoverSecrets() {
+	for _, secret := range c.secretWatcher.List() {
+		c.tlsCredentialsUpdated(fmt.Sprintf("%s/%s", secret.Namespace, secret.Name), secret)
+	}
+}
+
+func (s *GrantsEnabled) securedAccessChanged(key string, se *skupperv1alpha1.SecuredAccess) error {
+	if se != nil && len(se.Status.Endpoints) > 0 {
+		if s.grants.setUrl(se.Status.Endpoints[0].Url()) {
+			s.grants.recheckUrl()
+		}
+		if !s.started {
+			s.started = true
+			log.Print("Starting grant server")
+			s.server.start()
+		}
+	}
+	return nil
+}
+
+func (s *GrantsEnabled) tlsCredentialsUpdated(key string, secret *corev1.Secret) error {
+	if secret == nil {
+		return nil
+	}
+	if err := s.server.setCertificateFromSecret(secret); err != nil {
+		log.Printf("Could not set certificate from grant server from %s: %s", key, err)
+		return nil
+	}
+	if s.grants.setCA(string(secret.Data["ca.crt"])) {
+		s.grants.recheckCa()
+	}
+	log.Print("Grant server tls credentials updated")
+	return nil
+}
diff --git a/pkg/kube/claims/grants.go b/pkg/kube/grants/grants.go
similarity index 90%
rename from pkg/kube/claims/grants.go
rename to pkg/kube/grants/grants.go
index 4caee2b8..c9a9646d 100644
--- a/pkg/kube/claims/grants.go
+++ b/pkg/kube/grants/grants.go
@@ -1,4 +1,4 @@
-package claims
+package grants
 
 import (
 	"context"
@@ -123,15 +123,10 @@ func (g *Grants) getUrl() string {
 func (g *Grants) recheckUrl() {
 	for _, grant := range g.getAll() {
 		key := fmt.Sprintf("%s/%s", grant.Namespace, grant.Name)
-		if changed, message := g.checkUrl(key, grant); changed {
-			if message == "" {
-				message = skupperv1alpha1.STATUS_OK
-			}
+		if g.checkUrl(key, grant) {
 			grant.SetResolved()
-			if grant.Status.SetStatusMessage(message) {
-				if err := g.updateGrantStatus(grant); err != nil {
-					log.Printf("Error updating grant %s after setting url: %s", key, err)
-				}
+			if err := g.updateGrantStatus(grant); err != nil {
+				log.Printf("Error updating grant %s after setting url: %s", key, err)
 			}
 		}
 	}
@@ -156,18 +151,14 @@ func (g *Grants) claimUrl(grant *skupperv1alpha1.AccessGrant) string {
 	return ""
 }
 
-func (g *Grants) checkUrl(key string, grant *skupperv1alpha1.AccessGrant) (bool, string) {
+func (g *Grants) checkUrl(key string, grant *skupperv1alpha1.AccessGrant) bool {
 	url := g.claimUrl(grant)
-	if url == "" {
-		log.Printf("URL pending for AccessGrant %s", key)
-		return true, "Url pending"
-	} else if grant.Status.Url != url {
-		log.Printf("Setting URL for AccessGrant %s to %s", key, url)
-		grant.Status.Url = url
-		return true, ""
-	} else {
-		return false, ""
+	if grant.Status.Url == url {
+		return false
 	}
+	log.Printf("Setting URL for AccessGrant %s to %s", key, url)
+	grant.Status.Url = url
+	return true
 }
 
 func (g *Grants) checkCa(key string, grant *skupperv1alpha1.AccessGrant) bool {
@@ -187,11 +178,8 @@ func (g *Grants) checkGrant(key string, grant *skupperv1alpha1.AccessGrant) erro
 	g.record(key, grant)
 	changed := false
 	var status []string
-	if updated, message := g.checkUrl(key, grant); updated {
+	if g.checkUrl(key, grant) {
 		changed = true
-		if message != "" {
-			status = append(status, message)
-		}
 	}
 	if g.checkCa(key, grant) {
 		changed = true
@@ -237,7 +225,6 @@ func (g *Grants) checkGrant(key string, grant *skupperv1alpha1.AccessGrant) erro
 	if !changed {
 		return nil
 	}
-	log.Printf("Updating status for AccessGrant %s", key)
 	return g.updateGrantStatus(grant)
 }
 
diff --git a/pkg/kube/grants/init.go b/pkg/kube/grants/init.go
new file mode 100644
index 00000000..ee800756
--- /dev/null
+++ b/pkg/kube/grants/init.go
@@ -0,0 +1,14 @@
+package grants
+
+import (
+	"github.com/skupperproject/skupper/pkg/kube"
+)
+
+func Initialise(controller *kube.Controller, currentNamespace string, watchNamespace string, config *GrantConfig, generator GrantResponse) func() {
+	if !config.Enabled {
+		disabled(controller, watchNamespace)
+		return nil
+	}
+	ge := enabled(controller, currentNamespace, watchNamespace, config, generator)
+	return ge.Start
+}
diff --git a/pkg/kube/grants/redeem.go b/pkg/kube/grants/redeem.go
new file mode 100644
index 00000000..03a6465d
--- /dev/null
+++ b/pkg/kube/grants/redeem.go
@@ -0,0 +1,135 @@
+package grants
+
+import (
+	"bytes"
+	"context"
+	"crypto/tls"
+	"crypto/x509"
+	"errors"
+	"fmt"
+	"io"
+	"log"
+	"net/http"
+	"strings"
+
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/yaml"
+
+	internalclient "github.com/skupperproject/skupper/internal/kube/client"
+	skupperv1alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v1alpha1"
+)
+
+func RedeemAccessToken(token *skupperv1alpha1.AccessToken, site *skupperv1alpha1.Site, clients internalclient.Clients) error {
+	transport := &http.Transport{
+		TLSClientConfig: tlsConfig(token),
+	}
+	body, err := postTokenRequest(token, site, transport)
+	if err != nil {
+		return updateAccessTokenStatus(token, err, clients)
+	}
+	log.Printf("HTTP Post to %s for %s/%s was sucessful, decoding response body", token.Spec.Url, token.Namespace, token.Name)
+	return handleTokenResponse(body, token, site, clients)
+}
+
+func tlsConfig(token *skupperv1alpha1.AccessToken) *tls.Config {
+	if token.Spec.Ca == "" {
+		return nil
+	}
+	caPool := x509.NewCertPool()
+	caPool.AppendCertsFromPEM([]byte(token.Spec.Ca))
+	return &tls.Config{
+		RootCAs: caPool,
+	}
+}
+
+func postTokenRequest(token *skupperv1alpha1.AccessToken, site *skupperv1alpha1.Site, transport http.RoundTripper) (io.Reader, error) {
+	client := &http.Client{
+		Transport: transport,
+	}
+	request, err := http.NewRequest(http.MethodPost, token.Spec.Url, bytes.NewReader([]byte(token.Spec.Code)))
+	if err != nil {
+		return nil, err
+	}
+	request.Header.Add("name", token.Name)
+	request.Header.Add("subject", string(site.ObjectMeta.UID))
+	response, err := client.Do(request)
+	if err != nil {
+		return nil, err
+	}
+	if response.StatusCode != http.StatusOK {
+		body, _ := io.ReadAll(response.Body)
+		return nil, fmt.Errorf("%d (%s) %s", response.StatusCode, http.StatusText(response.StatusCode), strings.TrimSpace(string(body)))
+	}
+	return response.Body, nil
+}
+
+func handleTokenResponse(body io.Reader, token *skupperv1alpha1.AccessToken, site *skupperv1alpha1.Site, clients internalclient.Clients) error {
+	decoder := newLinkDecoder(body)
+	if err := decoder.decodeAll(); err != nil {
+		log.Printf("Could not decode response for AccessToken %s/%s: %s", token.Namespace, token.Name, err)
+		return updateAccessTokenStatus(token, errors.New("Could not decode response"), clients)
+	}
+	refs := []metav1.OwnerReference{
+		{
+			Kind:       "Site",
+			APIVersion: "skupper.io/v1alpha1",
+			Name:       site.Name,
+			UID:        site.ObjectMeta.UID,
+		},
+	}
+	decoder.secret.ObjectMeta.OwnerReferences = refs
+	if _, err := clients.GetKubeClient().CoreV1().Secrets(token.ObjectMeta.Namespace).Create(context.TODO(), &decoder.secret, metav1.CreateOptions{}); err != nil {
+		return updateAccessTokenStatus(token, fmt.Errorf("Could not create received secret: %s", err), clients)
+	}
+	for _, link := range decoder.links {
+		link.ObjectMeta.OwnerReferences = refs
+		if _, err := clients.GetSkupperClient().SkupperV1alpha1().Links(token.ObjectMeta.Namespace).Create(context.TODO(), &link, metav1.CreateOptions{}); err != nil {
+			return updateAccessTokenStatus(token, fmt.Errorf("Could not create received link: %s", err), clients)
+		}
+	}
+
+	return updateAccessTokenStatus(token, nil, clients)
+}
+
+func updateAccessTokenStatus(token *skupperv1alpha1.AccessToken, err error, clients internalclient.Clients) error {
+	if token.SetRedeemed(err) {
+		_, err = clients.GetSkupperClient().SkupperV1alpha1().AccessTokens(token.ObjectMeta.Namespace).UpdateStatus(context.TODO(), token, metav1.UpdateOptions{})
+		return err
+	}
+	return nil
+}
+
+type LinkDecoder struct {
+	decoder *yaml.YAMLOrJSONDecoder
+	secret  corev1.Secret
+	links   []skupperv1alpha1.Link
+}
+
+func newLinkDecoder(r io.Reader) *LinkDecoder {
+	return &LinkDecoder{
+		decoder: yaml.NewYAMLOrJSONDecoder(r, 1024),
+	}
+}
+
+func (d *LinkDecoder) decodeSecret() error {
+	return d.decoder.Decode(&d.secret)
+}
+
+func (d *LinkDecoder) decodeLink() error {
+	var link skupperv1alpha1.Link
+	if err := d.decoder.Decode(&link); err != nil {
+		return err
+	}
+	d.links = append(d.links, link)
+	return nil
+}
+
+func (d *LinkDecoder) decodeAll() error {
+	if err := d.decodeSecret(); err != nil {
+		return err
+	}
+	for err := d.decodeLink(); err == nil; err = d.decodeLink() {
+	}
+	return nil
+}
diff --git a/pkg/kube/grants/server.go b/pkg/kube/grants/server.go
new file mode 100644
index 00000000..6d8565a3
--- /dev/null
+++ b/pkg/kube/grants/server.go
@@ -0,0 +1,106 @@
+package grants
+
+import (
+	"crypto/tls"
+	"fmt"
+	"log"
+	"net"
+	"net/http"
+	"sync"
+	"time"
+
+	corev1 "k8s.io/api/core/v1"
+
+	"github.com/skupperproject/skupper/pkg/utils/tlscfg"
+)
+
+type Server struct {
+	tlsEnabled bool
+	lock       sync.RWMutex
+	cert       *tls.Certificate
+	server     *http.Server
+	listener   net.Listener
+}
+
+func newServer(addr string, tlsEnabled bool, handler http.Handler) *Server {
+	return &Server{
+		server: &http.Server{
+			Addr:         addr,
+			Handler:      handler,
+			ReadTimeout:  60 * time.Second,
+			WriteTimeout: 60 * time.Second,
+			TLSConfig:    tlscfg.Modern(),
+		},
+		tlsEnabled: tlsEnabled,
+	}
+}
+
+func (s *Server) start() {
+	go s.listenAndServe()
+}
+
+func (s *Server) getCertificate(*tls.ClientHelloInfo) (*tls.Certificate, error) {
+	s.lock.RLock()
+	defer s.lock.RUnlock()
+	return s.cert, nil
+}
+
+func (s *Server) setCertificate(cert *tls.Certificate) {
+	s.lock.Lock()
+	defer s.lock.Unlock()
+	s.cert = cert
+}
+
+func (s *Server) setCertificateFromSecret(secret *corev1.Secret) error {
+	cert, err := tls.X509KeyPair(secret.Data["tls.crt"], secret.Data["tls.key"])
+	if err != nil {
+		return err
+	}
+	s.setCertificate(&cert)
+	return nil
+}
+
+func (s *Server) listen() error {
+	listener, err := net.Listen("tcp", s.server.Addr)
+	if err != nil {
+		return err
+	}
+	log.Printf("Grant server listening on %s", listener.Addr())
+	s.listener = listener
+	return nil
+}
+
+func (s *Server) serve() error {
+	if s.listener == nil {
+		return fmt.Errorf("Cannot serve before listen() is called")
+	}
+	if s.tlsEnabled {
+		s.server.TLSConfig.GetCertificate = s.getCertificate
+		return s.server.ServeTLS(s.listener, "", "")
+	} else {
+		return s.server.Serve(s.listener)
+	}
+}
+
+func (s *Server) listenAndServe() error {
+	if err := s.listen(); err != nil {
+		log.Printf("Grant server failed to listen on %s: %s", s.server.Addr, err)
+		return err
+	}
+	defer s.listener.Close()
+	return s.serve()
+}
+
+func (s *Server) stop() error {
+	err := s.server.Close()
+	s.listener.Close()
+	s.listener = nil
+	return err
+}
+
+func (s *Server) port() int {
+	if s.listener == nil {
+		return 0
+	}
+	return s.listener.Addr().(*net.TCPAddr).Port
+}
diff --git a/pkg/kube/tokens/tokens.go b/pkg/kube/grants/tokens.go
similarity index 72%
rename from pkg/kube/tokens/tokens.go
rename to pkg/kube/grants/tokens.go
index 6a2cdffc..dce1aae9 100644
--- a/pkg/kube/tokens/tokens.go
+++ b/pkg/kube/grants/tokens.go
@@ -1,7 +1,8 @@
-package tokens
+package grants
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"log"
@@ -15,7 +16,6 @@ import (
 	internalclient "github.com/skupperproject/skupper/internal/kube/client"
 	skupperv1alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v1alpha1"
 	"github.com/skupperproject/skupper/pkg/certs"
-	sitepkg "github.com/skupperproject/skupper/pkg/site"
 )
 
 type CertToken struct {
@@ -38,24 +38,18 @@ type TokenGenerator struct {
 	hosts     []string
 }
 
-func NewTokenGenerator(namespace string, clients internalclient.Clients) (*TokenGenerator, error) {
-	site, err := getActiveSite(namespace, clients)
-	if err != nil {
-		return nil, err
-	}
-	return NewTokenGeneratorForSite(site, clients)
-}
-
-func NewTokenGeneratorForSite(site *skupperv1alpha1.Site, clients internalclient.Clients) (*TokenGenerator, error) {
+func NewTokenGenerator(site *skupperv1alpha1.Site, clients internalclient.Clients) (*TokenGenerator, error) {
 	generator := &TokenGenerator{
 		namespace: site.Namespace,
 		clients:   clients,
 	}
-	if err := generator.loadCA(sitepkg.DefaultIssuer(site)); err != nil {
-		return nil, err
+	if err := generator.loadCA(site.DefaultIssuer()); err != nil {
+		log.Printf("Error retrieving default issuer %s for site %s in %s: %s", site.DefaultIssuer(), site.Name, site.Namespace, err)
+		return nil, errors.New("Could not get issuer for requested certficate")
 	}
-	if err := generator.setValidHostsFromSite(site); err != nil {
-		return nil, err
+	if ok := generator.setValidHostsFromSite(site); !ok {
+		log.Printf("Could not resolve any target endpoints for site %s in %s", site.Name, site.Namespace)
+		return nil, errors.New("Could not resolve any endpoints for requested link")
 	}
 	return generator, nil
 }
@@ -69,20 +63,7 @@ func (g *TokenGenerator) loadCA(name string) error {
 	return nil
 }
 
-func getActiveSite(namespace string, clients internalclient.Clients) (*skupperv1alpha1.Site, error) {
-	sites, err := clients.GetSkupperClient().SkupperV1alpha1().Sites(namespace).List(context.TODO(), metav1.ListOptions{})
-	if err != nil {
-		return nil, err
-	}
-	for _, site := range sites.Items {
-		if site.IsConfigured() {
-			return &site, nil
-		}
-	}
-	return nil, fmt.Errorf("No active site in %s", namespace)
-}
-
-func (g *TokenGenerator) setValidHostsFromSite(site *skupperv1alpha1.Site) error {
+func (g *TokenGenerator) setValidHostsFromSite(site *skupperv1alpha1.Site) bool {
 	//TODO: if site is edge site, then return an error as it
 	//cannot issue certificates
 	var hosts []string
@@ -90,7 +71,7 @@ func (g *TokenGenerator) setValidHostsFromSite(site *skupperv1alpha1.Site) error
 		hosts = append(hosts, endpoint.Host)
 	}
 	if len(hosts) == 0 {
-		return fmt.Errorf("Endpoints for site in %s not yet resolved", g.namespace)
+		return false
 	}
 	byGroup := map[string][]skupperv1alpha1.Endpoint{}
 	//TODO: should only include groups that are valid for the defined issuer
@@ -104,7 +85,7 @@ func (g *TokenGenerator) setValidHostsFromSite(site *skupperv1alpha1.Site) error
 	}
 	log.Printf("Endpoints for grant: %v (by group: %v)", g.endpoints, byGroup)
 	g.hosts = hosts
-	return nil
+	return true
 }
 
 func (g *TokenGenerator) NewCertToken(name string, subject string) Token {
diff --git a/pkg/kube/site/site.go b/pkg/kube/site/site.go
index 43f3daa6..59b644a1 100644
--- a/pkg/kube/site/site.go
+++ b/pkg/kube/site/site.go
@@ -728,7 +728,7 @@ func (s *Site) Deleted() {
 }
 
 func (s *Site) setDefaultIssuerInStatus() bool {
-	if issuer := s.defaultIssuer(); s.site.Status.DefaultIssuer != issuer {
+	if issuer := s.site.DefaultIssuer(); s.site.Status.DefaultIssuer != issuer {
 		s.site.Status.DefaultIssuer = issuer
 		return true
 	}
@@ -861,10 +861,6 @@ func (s *Site) updateRouterAccessStatus(la *skupperv1alpha1.RouterAccess) {
 	}
 }
 
-func (s *Site) defaultIssuer() string {
-	return site.DefaultIssuer(s.site)
-}
-
 func asSecuredAccessSpec(la *skupperv1alpha1.RouterAccess, group string, defaultIssuer string) skupperv1alpha1.SecuredAccessSpec {
 	issuer := la.Spec.Issuer
 	if issuer == "" {
@@ -906,7 +902,7 @@ func (s *Site) checkSecuredAccess() error {
 				"internal.skupper.io/controlled":   "true",
 				"internal.skupper.io/routeraccess": la.Name,
 			}
-			if err := s.access.Ensure(s.namespace, name, asSecuredAccessSpec(la, group, s.defaultIssuer()), annotations, s.ownerReferences()); err != nil {
+			if err := s.access.Ensure(s.namespace, name, asSecuredAccessSpec(la, group, s.site.DefaultIssuer()), annotations, s.ownerReferences()); err != nil {
 				//TODO: add message to site status
 				log.Printf("Error ensuring SecuredAccess for RouterAccess %s: %s", la.Key(), err)
 			}
@@ -947,7 +943,7 @@ func (s *Site) CheckRouterAccess(name string, la *skupperv1alpha1.RouterAccess)
 					"internal.skupper.io/controlled":   "true",
 					"internal.skupper.io/routeraccess": la.Name,
 				}
-				if err := s.access.Ensure(s.namespace, name, asSecuredAccessSpec(la, group, s.defaultIssuer()), annotations, s.ownerReferences()); err != nil {
+				if err := s.access.Ensure(s.namespace, name, asSecuredAccessSpec(la, group, s.site.DefaultIssuer()), annotations, s.ownerReferences()); err != nil {
 					log.Printf("Error ensuring SecuredAccess for RouterAccess %s: %s", la.Key(), err)
 					errors = append(errors, err.Error())
 				}
diff --git a/pkg/site/bindings.go b/pkg/site/bindings.go
index 02fbb083..600b110b 100644
--- a/pkg/site/bindings.go
+++ b/pkg/site/bindings.go
@@ -87,6 +87,13 @@ func (b *Bindings) GetConnector(name string) *skupperv1alpha1.Connector {
 	return nil
 }
 
+func (b *Bindings) GetListener(name string) *skupperv1alpha1.Listener {
+	if existing, ok := b.listeners[name]; ok {
+		return existing
+	}
+	return nil
+}
+
 func (b *Bindings) UpdateConnector(name string, connector *skupperv1alpha1.Connector) qdr.ConfigUpdate {
 	if connector == nil {
 		return b.deleteConnector(name)
diff --git a/pkg/site/defaultissuer.go b/pkg/site/defaultissuer.go
deleted file mode 100644
index 10011f53..00000000
--- a/pkg/site/defaultissuer.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package site
-
-import (
-	skupperv1alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v1alpha1"
-)
-
-func DefaultIssuer(site *skupperv1alpha1.Site) string {
-	if site != nil {
-		if site.Spec.DefaultIssuer != "" {
-			return site.Spec.DefaultIssuer
-		}
-		if site.Status.DefaultIssuer != "" {
-			return site.Status.DefaultIssuer
-		}
-	}
-	return "skupper-site-ca"
-}
diff --git a/pkg/utils/spinner.go b/pkg/utils/spinner.go
deleted file mode 100644
index fb46eb4e..00000000
--- a/pkg/utils/spinner.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package utils
-
-import (
-	"github.com/briandowns/spinner"
-	"time"
-)
-
-func NewSpinner(message string, maxRetries int, function func() error) error {
-
-	spin := spinner.New(spinner.CharSets[9], 100*time.Millisecond)
-	spin.Prefix = message
-	spin.FinalMSG = message + "\n"
-
-	spin.Start()
-
-	err := RetryError(time.Second, maxRetries, function)
-
-	spin.Stop()
-
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
diff --git a/pkg/vanflow/eventsource/client.go b/pkg/vanflow/eventsource/client.go
index 39d4743b..990c269b 100644
--- a/pkg/vanflow/eventsource/client.go
+++ b/pkg/vanflow/eventsource/client.go
@@ -48,17 +48,9 @@ func NewClient(container session.Container, cfg ClientOptions) *Client {
 			slog.String("instance", cfg.Source.ID),
 		),
 	}
-	c.start()
 	return c
 }
 
-func (c *Client) start() {
-	c.lock.Lock()
-	defer c.lock.Unlock()
-	done := make(chan struct{})
-	c.cleanup = append(c.cleanup, func() { close(done) })
-}
-
 type HeartbeatMessageHandler func(vanflow.HeartbeatMessage)
 type RecordMessageHandler func(vanflow.RecordMessage)
 


Test patch:
diff --git a/internal/cmd/skupper/connector/kube/connector_create_test.go b/internal/cmd/skupper/connector/kube/connector_create_test.go
index cc6c79fa..6e938567 100644
--- a/internal/cmd/skupper/connector/kube/connector_create_test.go
+++ b/internal/cmd/skupper/connector/kube/connector_create_test.go
@@ -934,6 +934,8 @@ func TestCmdConnectorCreate_WaitUntil(t *testing.T) {
 
 func newCmdConnectorCreateWithMocks(namespace string, k8sObjects []runtime.Object, skupperObjects []runtime.Object, fakeSkupperError string) (*CmdConnectorCreate, error) {
 
+	// We make sure the interval is appropriate
+	utils.SetRetryProfile(utils.TestRetryProfile)
 	client, err := fakeclient.NewFakeClient(namespace, k8sObjects, skupperObjects, fakeSkupperError)
 	if err != nil {
 		return nil, err
diff --git a/internal/cmd/skupper/connector/kube/connector_delete_test.go b/internal/cmd/skupper/connector/kube/connector_delete_test.go
index 5711d823..e2ae040d 100644
--- a/internal/cmd/skupper/connector/kube/connector_delete_test.go
+++ b/internal/cmd/skupper/connector/kube/connector_delete_test.go
@@ -246,6 +246,8 @@ func TestCmdConnectorDelete_WaitUntil(t *testing.T) {
 
 func newCmdConnectorDeleteWithMocks(namespace string, k8sObjects []runtime.Object, skupperObjects []runtime.Object, fakeSkupperError string) (*CmdConnectorDelete, error) {
 
+	// We make sure the interval is appropriate
+	utils.SetRetryProfile(utils.TestRetryProfile)
 	client, err := fakeclient.NewFakeClient(namespace, k8sObjects, skupperObjects, fakeSkupperError)
 	if err != nil {
 		return nil, err
diff --git a/internal/cmd/skupper/connector/kube/connector_update_test.go b/internal/cmd/skupper/connector/kube/connector_update_test.go
index 2e930d2f..ca2affd1 100644
--- a/internal/cmd/skupper/connector/kube/connector_update_test.go
+++ b/internal/cmd/skupper/connector/kube/connector_update_test.go
@@ -601,6 +601,8 @@ func TestCmdConnectorUpdate_WaitUntil(t *testing.T) {
 
 func newCmdConnectorUpdateWithMocks(namespace string, k8sObjects []runtime.Object, skupperObjects []runtime.Object, fakeSkupperError string) (*CmdConnectorUpdate, error) {
 
+	// We make sure the interval is appropriate
+	utils.SetRetryProfile(utils.TestRetryProfile)
 	client, err := fakeclient.NewFakeClient(namespace, k8sObjects, skupperObjects, fakeSkupperError)
 	if err != nil {
 		return nil, err
diff --git a/internal/cmd/skupper/link/kube/link_delete_test.go b/internal/cmd/skupper/link/kube/link_delete_test.go
index 84bfad6f..cf59a085 100644
--- a/internal/cmd/skupper/link/kube/link_delete_test.go
+++ b/internal/cmd/skupper/link/kube/link_delete_test.go
@@ -357,12 +357,12 @@ func TestCmdLinkDelete_WaitUntil(t *testing.T) {
 					},
 				},
 			},
-			timeout:     3,
+			timeout:     1,
 			expectError: true,
 		},
 		{
 			name:        "link is deleted",
-			timeout:     3,
+			timeout:     1,
 			expectError: false,
 		},
 	}
@@ -387,6 +387,8 @@ func TestCmdLinkDelete_WaitUntil(t *testing.T) {
 
 func newCmdLinkDeleteWithMocks(namespace string, k8sObjects []runtime.Object, skupperObjects []runtime.Object, fakeSkupperError string) (*CmdLinkDelete, error) {
 
+	// We make sure the interval is appropriate
+	utils.SetRetryProfile(utils.TestRetryProfile)
 	client, err := fakeclient.NewFakeClient(namespace, k8sObjects, skupperObjects, fakeSkupperError)
 	if err != nil {
 		return nil, err
diff --git a/internal/cmd/skupper/link/kube/link_generate_test.go b/internal/cmd/skupper/link/kube/link_generate_test.go
index b76ae04b..a4921dba 100644
--- a/internal/cmd/skupper/link/kube/link_generate_test.go
+++ b/internal/cmd/skupper/link/kube/link_generate_test.go
@@ -869,7 +869,7 @@ func TestCmdLinkGenerate_WaitUntil(t *testing.T) {
 		{
 			name:               "secret is not returned",
 			outputType:         "yaml",
-			timeout:            3,
+			timeout:            1,
 			tlsSecret:          "linkSecret",
 			generateCredential: true,
 			expectError:        true,
@@ -878,21 +878,21 @@ func TestCmdLinkGenerate_WaitUntil(t *testing.T) {
 			name:               "the output only contains the link",
 			generateCredential: false,
 			outputType:         "yaml",
-			timeout:            3,
+			timeout:            1,
 			expectError:        false,
 		},
 		{
 			name:               "bad format for the output",
 			generateCredential: false,
 			outputType:         "not supported",
-			timeout:            3,
+			timeout:            1,
 			expectError:        true,
 		},
 		{
 			name:               "the output contains the link and the secret",
 			generateCredential: true,
 			outputType:         "yaml",
-			timeout:            3,
+			timeout:            1,
 			tlsSecret:          "link-test",
 			k8sObjects: []runtime.Object{
 				&corev1.Secret{
@@ -926,7 +926,7 @@ func TestCmdLinkGenerate_WaitUntil(t *testing.T) {
 			name:               "the output contains the link and the secret, but it failed while deleting the certificate",
 			generateCredential: true,
 			outputType:         "yaml",
-			timeout:            3,
+			timeout:            1,
 			tlsSecret:          "link-test",
 			k8sObjects: []runtime.Object{
 				&corev1.Secret{
@@ -977,6 +977,9 @@ func TestCmdLinkGenerate_WaitUntil(t *testing.T) {
 
 func newCmdLinkGenerateWithMocks(namespace string, k8sObjects []runtime.Object, skupperObjects []runtime.Object, fakeSkupperError string) (*CmdLinkGenerate, error) {
 
+	// We make sure the interval is appropriate
+	utils.SetRetryProfile(utils.TestRetryProfile)
+
 	client, err := fakeclient.NewFakeClient(namespace, k8sObjects, skupperObjects, fakeSkupperError)
 	if err != nil {
 		return nil, err
diff --git a/internal/cmd/skupper/link/kube/link_update_test.go b/internal/cmd/skupper/link/kube/link_update_test.go
index 1689be24..26db1697 100644
--- a/internal/cmd/skupper/link/kube/link_update_test.go
+++ b/internal/cmd/skupper/link/kube/link_update_test.go
@@ -560,20 +560,20 @@ func TestCmdLinkUpdate_WaitUntil(t *testing.T) {
 				},
 			},
 			linkName:    "my-link",
-			timeout:     3,
+			timeout:     1,
 			expectError: true,
 		},
 		{
 			name:        "link is not returned",
 			linkName:    "my-link",
-			timeout:     3,
+			timeout:     1,
 			expectError: true,
 		},
 		{
 			name:        "there is no need to wait for a link, the user just wanted the output",
 			linkName:    "my-link",
 			output:      "json",
-			timeout:     3,
+			timeout:     1,
 			expectError: false,
 		},
 		{
@@ -601,7 +601,7 @@ func TestCmdLinkUpdate_WaitUntil(t *testing.T) {
 				},
 			},
 			linkName:    "my-link",
-			timeout:     3,
+			timeout:     1,
 			expectError: false,
 		},
 	}
@@ -631,6 +631,9 @@ func TestCmdLinkUpdate_WaitUntil(t *testing.T) {
 
 func newCmdLinkUpdateWithMocks(namespace string, k8sObjects []runtime.Object, skupperObjects []runtime.Object, fakeSkupperError string) (*CmdLinkUpdate, error) {
 
+	// We make sure the interval is appropriate
+	utils.SetRetryProfile(utils.TestRetryProfile)
+
 	client, err := fakeclient.NewFakeClient(namespace, k8sObjects, skupperObjects, fakeSkupperError)
 	if err != nil {
 		return nil, err
diff --git a/internal/cmd/skupper/listener/kube/listener_create_test.go b/internal/cmd/skupper/listener/kube/listener_create_test.go
index 6e611a82..62505108 100644
--- a/internal/cmd/skupper/listener/kube/listener_create_test.go
+++ b/internal/cmd/skupper/listener/kube/listener_create_test.go
@@ -808,6 +808,8 @@ func TestCmdListenerCreate_WaitUntil(t *testing.T) {
 
 func newCmdListenerCreateWithMocks(namespace string, k8sObjects []runtime.Object, skupperObjects []runtime.Object, fakeSkupperError string) (*CmdListenerCreate, error) {
 
+	// We make sure the interval is appropriate
+	utils.SetRetryProfile(utils.TestRetryProfile)
 	client, err := fakeclient.NewFakeClient(namespace, k8sObjects, skupperObjects, fakeSkupperError)
 	if err != nil {
 		return nil, err
diff --git a/internal/cmd/skupper/listener/kube/listener_delete_test.go b/internal/cmd/skupper/listener/kube/listener_delete_test.go
index 8450b731..70d0d9f4 100644
--- a/internal/cmd/skupper/listener/kube/listener_delete_test.go
+++ b/internal/cmd/skupper/listener/kube/listener_delete_test.go
@@ -269,6 +269,9 @@ func TestCmdListenerDelete_WaitUntil(t *testing.T) {
 
 func newCmdListenerDeleteWithMocks(namespace string, k8sObjects []runtime.Object, skupperObjects []runtime.Object, fakeSkupperError string) (*CmdListenerDelete, error) {
 
+	// We make sure the interval is appropriate
+	utils.SetRetryProfile(utils.TestRetryProfile)
+
 	client, err := fakeclient.NewFakeClient(namespace, k8sObjects, skupperObjects, fakeSkupperError)
 	if err != nil {
 		return nil, err
diff --git a/internal/cmd/skupper/listener/kube/listener_update_test.go b/internal/cmd/skupper/listener/kube/listener_update_test.go
index 7f0509fc..cb5b2019 100644
--- a/internal/cmd/skupper/listener/kube/listener_update_test.go
+++ b/internal/cmd/skupper/listener/kube/listener_update_test.go
@@ -533,6 +533,9 @@ func TestCmdListenerUpdate_WaitUntil(t *testing.T) {
 
 func newCmdListenerUpdateWithMocks(namespace string, k8sObjects []runtime.Object, skupperObjects []runtime.Object, fakeSkupperError string) (*CmdListenerUpdate, error) {
 
+	// We make sure the interval is appropriate
+	utils.SetRetryProfile(utils.TestRetryProfile)
+
 	client, err := fakeclient.NewFakeClient(namespace, k8sObjects, skupperObjects, fakeSkupperError)
 	if err != nil {
 		return nil, err
diff --git a/internal/cmd/skupper/site/kube/site_create_test.go b/internal/cmd/skupper/site/kube/site_create_test.go
index 9064b591..17d2a10f 100644
--- a/internal/cmd/skupper/site/kube/site_create_test.go
+++ b/internal/cmd/skupper/site/kube/site_create_test.go
@@ -168,60 +168,44 @@ func TestCmdSiteCreate_InputToOptions(t *testing.T) {
 		name               string
 		args               []string
 		flags              CreateFlags
-		expectedSettings   map[string]string
 		expectedLinkAccess string
 		expectedOutput     string
 	}
 
 	testTable := []test{
 		{
-			name:  "options without link access enabled",
-			args:  []string{"my-site"},
-			flags: CreateFlags{},
-			expectedSettings: map[string]string{
-				"name": "my-site",
-			},
-			expectedLinkAccess: "none",
+			name:               "options without link access enabled",
+			args:               []string{"my-site"},
+			flags:              CreateFlags{},
+			expectedLinkAccess: "",
 			expectedOutput:     "",
 		},
 		{
-			name:  "options with link access enabled but using a type by default and link access host specified",
-			args:  []string{"my-site"},
-			flags: CreateFlags{enableLinkAccess: true},
-			expectedSettings: map[string]string{
-				"name": "my-site",
-			},
+			name:               "options with link access enabled but using a type by default",
+			args:               []string{"my-site"},
+			flags:              CreateFlags{enableLinkAccess: true, linkAccessType: "loadbalancer"},
 			expectedLinkAccess: "loadbalancer",
 			expectedOutput:     "",
 		},
 		{
-			name:  "options with link access enabled using the nodeport type",
-			args:  []string{"my-site"},
-			flags: CreateFlags{enableLinkAccess: true, linkAccessType: "nodeport"},
-			expectedSettings: map[string]string{
-				"name": "my-site",
-			},
+			name:               "options with link access enabled using the nodeport type",
+			args:               []string{"my-site"},
+			flags:              CreateFlags{enableLinkAccess: true, linkAccessType: "nodeport"},
 			expectedLinkAccess: "nodeport",
 			expectedOutput:     "",
 		},
 		{
-			name:  "options with link access options not well specified",
-			args:  []string{"my-site"},
-			flags: CreateFlags{enableLinkAccess: false, linkAccessType: "nodeport"},
-			expectedSettings: map[string]string{
-				"name": "my-site",
-			},
-			expectedLinkAccess: "none",
+			name:               "options with link access options not well specified",
+			args:               []string{"my-site"},
+			flags:              CreateFlags{enableLinkAccess: false, linkAccessType: "nodeport"},
+			expectedLinkAccess: "",
 			expectedOutput:     "",
 		},
 		{
-			name:  "options output type",
-			args:  []string{"my-site"},
-			flags: CreateFlags{enableLinkAccess: false, linkAccessType: "nodeport", output: "yaml"},
-			expectedSettings: map[string]string{
-				"name": "my-site",
-			},
-			expectedLinkAccess: "none",
+			name:               "options output type",
+			args:               []string{"my-site"},
+			flags:              CreateFlags{enableLinkAccess: false, linkAccessType: "nodeport", output: "yaml"},
+			expectedLinkAccess: "",
 			expectedOutput:     "yaml",
 		},
 	}
@@ -235,9 +219,8 @@ func TestCmdSiteCreate_InputToOptions(t *testing.T) {
 
 			cmd.InputToOptions()
 
-			assert.DeepEqual(t, cmd.options, test.expectedSettings)
-
 			assert.Check(t, cmd.output == test.expectedOutput)
+			assert.Check(t, cmd.linkAccessType == test.expectedLinkAccess)
 		})
 	}
 }
@@ -321,7 +304,6 @@ func TestCmdSiteCreate_Run(t *testing.T) {
 
 		command.siteName = test.siteName
 		command.serviceAccountName = test.serviceAccountName
-		command.options = test.options
 		command.output = test.output
 
 		t.Run(test.name, func(t *testing.T) {
diff --git a/internal/cmd/skupper/site/kube/site_update_test.go b/internal/cmd/skupper/site/kube/site_update_test.go
index 68ba1dd3..c15e2923 100644
--- a/internal/cmd/skupper/site/kube/site_update_test.go
+++ b/internal/cmd/skupper/site/kube/site_update_test.go
@@ -590,7 +590,7 @@ func TestCmdSiteUpdate_WaitUntil(t *testing.T) {
 			},
 			siteName:     "my-site",
 			skupperError: "",
-			errorMessage: "Site \"my-site\" not ready yet, check the logs for more information\n",
+			errorMessage: "Site \"my-site\" not ready yet, check the status for more information\n",
 			expectError:  true,
 		},
 	}
diff --git a/internal/cmd/skupper/token/kube/token_issue_test.go b/internal/cmd/skupper/token/kube/token_issue_test.go
index f69b69b0..29a69507 100644
--- a/internal/cmd/skupper/token/kube/token_issue_test.go
+++ b/internal/cmd/skupper/token/kube/token_issue_test.go
@@ -101,6 +101,10 @@ func TestCmdTokenIssue_ValidateInput(t *testing.T) {
 											Type:   "Configured",
 											Status: "True",
 										},
+										{
+											Type:   "Running",
+											Status: "True",
+										},
 									},
 								},
 							},
@@ -212,6 +216,10 @@ func TestCmdTokenIssue_ValidateInput(t *testing.T) {
 											Type:   "Configured",
 											Status: "True",
 										},
+										{
+											Type:   "Running",
+											Status: "True",
+										},
 									},
 								},
 							},
@@ -244,6 +252,10 @@ func TestCmdTokenIssue_ValidateInput(t *testing.T) {
 											Type:   "Configured",
 											Status: "True",
 										},
+										{
+											Type:   "Running",
+											Status: "True",
+										},
 									},
 								},
 							},
@@ -276,6 +288,10 @@ func TestCmdTokenIssue_ValidateInput(t *testing.T) {
 											Type:   "Configured",
 											Status: "True",
 										},
+										{
+											Type:   "Running",
+											Status: "True",
+										},
 									},
 								},
 							},
@@ -308,6 +324,10 @@ func TestCmdTokenIssue_ValidateInput(t *testing.T) {
 											Type:   "Configured",
 											Status: "True",
 										},
+										{
+											Type:   "Running",
+											Status: "True",
+										},
 									},
 								},
 							},
@@ -340,6 +360,10 @@ func TestCmdTokenIssue_ValidateInput(t *testing.T) {
 											Type:   "Configured",
 											Status: "True",
 										},
+										{
+											Type:   "Running",
+											Status: "True",
+										},
 									},
 								},
 							},
@@ -372,6 +396,10 @@ func TestCmdTokenIssue_ValidateInput(t *testing.T) {
 											Type:   "Configured",
 											Status: "True",
 										},
+										{
+											Type:   "Running",
+											Status: "True",
+										},
 									},
 								},
 							},
@@ -404,6 +432,10 @@ func TestCmdTokenIssue_ValidateInput(t *testing.T) {
 											Type:   "Configured",
 											Status: "True",
 										},
+										{
+											Type:   "Running",
+											Status: "True",
+										},
 									},
 								},
 							},
@@ -436,6 +468,10 @@ func TestCmdTokenIssue_ValidateInput(t *testing.T) {
 											Type:   "Configured",
 											Status: "True",
 										},
+										{
+											Type:   "Running",
+											Status: "True",
+										},
 									},
 								},
 							},
@@ -469,6 +505,10 @@ func TestCmdTokenIssue_ValidateInput(t *testing.T) {
 											Type:   "Configured",
 											Status: "True",
 										},
+										{
+											Type:   "Running",
+											Status: "True",
+										},
 									},
 								},
 							},
@@ -501,6 +541,10 @@ func TestCmdTokenIssue_ValidateInput(t *testing.T) {
 											Type:   "Configured",
 											Status: "True",
 										},
+										{
+											Type:   "Running",
+											Status: "True",
+										},
 									},
 								},
 							},
@@ -533,6 +577,10 @@ func TestCmdTokenIssue_ValidateInput(t *testing.T) {
 											Type:   "Configured",
 											Status: "True",
 										},
+										{
+											Type:   "Running",
+											Status: "True",
+										},
 									},
 								},
 							},
@@ -739,6 +787,9 @@ func TestCmdTokenIssue_WaitUntil(t *testing.T) {
 
 func newCmdTokenIssueWithMocks(namespace string, k8sObjects []runtime.Object, skupperObjects []runtime.Object, fakeSkupperError string) (*CmdTokenIssue, error) {
 
+	// We make sure the interval is appropriate
+	utils.SetRetryProfile(utils.TestRetryProfile)
+
 	client, err := fakeclient.NewFakeClient(namespace, k8sObjects, skupperObjects, fakeSkupperError)
 	if err != nil {
 		return nil, err
diff --git a/internal/cmd/skupper/token/kube/token_redeem_test.go b/internal/cmd/skupper/token/kube/token_redeem_test.go
index 1f1d9e31..a00ddbb5 100644
--- a/internal/cmd/skupper/token/kube/token_redeem_test.go
+++ b/internal/cmd/skupper/token/kube/token_redeem_test.go
@@ -134,6 +134,10 @@ func TestCmdTokenRedeem_ValidateInput(t *testing.T) {
 											Type:   "Configured",
 											Status: "True",
 										},
+										{
+											Type:   "Running",
+											Status: "True",
+										},
 									},
 								},
 							},
@@ -162,6 +166,10 @@ func TestCmdTokenRedeem_ValidateInput(t *testing.T) {
 											Type:   "Configured",
 											Status: "True",
 										},
+										{
+											Type:   "Running",
+											Status: "True",
+										},
 									},
 								},
 							},
@@ -190,6 +198,10 @@ func TestCmdTokenRedeem_ValidateInput(t *testing.T) {
 											Type:   "Configured",
 											Status: "True",
 										},
+										{
+											Type:   "Running",
+											Status: "True",
+										},
 									},
 								},
 							},
@@ -218,6 +230,10 @@ func TestCmdTokenRedeem_ValidateInput(t *testing.T) {
 											Type:   "Configured",
 											Status: "True",
 										},
+										{
+											Type:   "Running",
+											Status: "True",
+										},
 									},
 								},
 							},
@@ -246,6 +262,10 @@ func TestCmdTokenRedeem_ValidateInput(t *testing.T) {
 											Type:   "Configured",
 											Status: "True",
 										},
+										{
+											Type:   "Running",
+											Status: "True",
+										},
 									},
 								},
 							},
@@ -276,6 +296,10 @@ func TestCmdTokenRedeem_ValidateInput(t *testing.T) {
 											Type:   "Configured",
 											Status: "True",
 										},
+										{
+											Type:   "Running",
+											Status: "True",
+										},
 									},
 								},
 							},
@@ -316,7 +340,7 @@ func TestCmdTokenRedeem_Run(t *testing.T) {
 
 	defer os.Remove("/tmp/tokenR.yaml") // clean up
 
-	err := newCmdCreateAccessGrantFile("/tmp/tokenR.yaml")
+	err := newCmdCreateAccessTokenFile("/tmp/tokenR.yaml")
 	assert.Check(t, err == nil)
 
 	testTable := []test{
@@ -438,17 +462,17 @@ func TestCmdTokenRedeem_WaitUntil(t *testing.T) {
 
 // --- helper methods
 
-func newCmdCreateAccessGrantFile(fileName string) error {
+func newCmdCreateAccessTokenFile(fileName string) error {
 
-	resource := v1alpha1.AccessGrant{
+	resource := v1alpha1.AccessToken{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "skupper.io/v1alpha1",
-			Kind:       "AccessGrant",
+			Kind:       "AccessToken",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name: "grant",
+			Name: "token",
 		},
-		Status: v1alpha1.AccessGrantStatus{
+		Spec: v1alpha1.AccessTokenSpec{
 			Url:  "AAA",
 			Ca:   "BBB",
 			Code: "CCC",
@@ -471,6 +495,8 @@ func newCmdCreateAccessGrantFile(fileName string) error {
 
 func newCmdTokenRedeemWithMocks(namespace string, k8sObjects []runtime.Object, skupperObjects []runtime.Object, fakeSkupperError string) (*CmdTokenRedeem, error) {
 
+	// We make sure the interval is appropriate
+	utils.SetRetryProfile(utils.TestRetryProfile)
 	client, err := fakeclient.NewFakeClient(namespace, k8sObjects, skupperObjects, fakeSkupperError)
 	if err != nil {
 		return nil, err
diff --git a/internal/cmd/skupper/utils/encode_test.go b/internal/cmd/skupper/utils/encode_test.go
index 0d6291a3..e85ee290 100644
--- a/internal/cmd/skupper/utils/encode_test.go
+++ b/internal/cmd/skupper/utils/encode_test.go
@@ -27,17 +27,15 @@ func Test_Marshal(t *testing.T) {
 			},
 		},
 			`{
-  "kind": "Site",
   "apiVersion": "skupper.io/v1alpha1",
+  "kind": "Site",
   "metadata": {
     "name": "my-site",
-    "namespace": "test",
-    "creationTimestamp": null
+    "namespace": "test"
   },
   "spec": {
     "linkAccess": "default"
-  },
-  "status": {}
+  }
 }`, false},
 		{"yaml", v1alpha1.Site{
 			TypeMeta: v1.TypeMeta{
@@ -55,12 +53,10 @@ func Test_Marshal(t *testing.T) {
 			`apiVersion: skupper.io/v1alpha1
 kind: Site
 metadata:
-  creationTimestamp: null
   name: my-site
   namespace: test
 spec:
   linkAccess: default
-status: {}
 `,
 			false},
 		{"unsupported", v1alpha1.Site{
diff --git a/internal/flag/flag_test.go b/internal/flag/flag_test.go
new file mode 100644
index 00000000..afb55e56
--- /dev/null
+++ b/internal/flag/flag_test.go
@@ -0,0 +1,231 @@
+package flag
+
+import (
+	"flag"
+	"testing"
+
+	"gotest.tools/assert"
+)
+
+func Test_StringVar(t *testing.T) {
+	tests := []struct {
+		name          string
+		defaultValue  string
+		args          []string
+		env           map[string]string
+		expectedValue string
+		expectedError string
+	}{
+		{
+			name:          "default value returned",
+			defaultValue:  "foo",
+			expectedValue: "foo",
+		},
+		{
+			name:          "flag specified as two args",
+			defaultValue:  "foo",
+			args:          []string{"-dummy", "bar"},
+			expectedValue: "bar",
+		},
+		{
+			name:          "flag specified as one arg",
+			defaultValue:  "foo",
+			args:          []string{"-dummy=bar"},
+			expectedValue: "bar",
+		},
+		{
+			name:         "env var returned",
+			defaultValue: "foo",
+			env: map[string]string{
+				"SKUPPER_DUMMY": "bar",
+			},
+			expectedValue: "bar",
+		},
+		{
+			name:          "invalid arg",
+			defaultValue:  "foo",
+			args:          []string{"-xyz=bar"},
+			expectedError: "flag provided but not defined: -xyz",
+			expectedValue: "foo",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			flags := &flag.FlagSet{}
+			var value string
+			for k, v := range tt.env {
+				t.Setenv(k, v)
+			}
+			StringVar(flags, &value, "dummy", "SKUPPER_DUMMY", tt.defaultValue, "Test of dummy config option")
+			err := flags.Parse(tt.args)
+			if tt.expectedError != "" {
+				assert.ErrorContains(t, err, tt.expectedError)
+			} else if err != nil {
+				t.Error(err)
+			}
+			assert.Equal(t, value, tt.expectedValue)
+		})
+	}
+}
+
+func Test_BoolVar(t *testing.T) {
+	tests := []struct {
+		name          string
+		defaultValue  bool
+		args          []string
+		env           map[string]string
+		expectedValue bool
+		expectedError string
+	}{
+		{
+			name:          "default value returned",
+			defaultValue:  true,
+			expectedValue: true,
+		},
+		{
+			name:          "flag specified as two args",
+			args:          []string{"-dummy", "true"},
+			expectedValue: true,
+		},
+		{
+			name:          "flag specified as one arg",
+			args:          []string{"-dummy=true"},
+			expectedValue: true,
+		},
+		{
+			name:          "flag overrides default",
+			defaultValue:  true,
+			args:          []string{"-dummy=false"},
+			expectedValue: false,
+		},
+		{
+			name: "env var returned",
+			env: map[string]string{
+				"SKUPPER_DUMMY": "true",
+			},
+			expectedValue: true,
+		},
+		{
+			name:         "env var overrides default",
+			defaultValue: true,
+			env: map[string]string{
+				"SKUPPER_DUMMY": "false",
+			},
+			expectedValue: false,
+		},
+		{
+			name:         "invalid env var",
+			defaultValue: true,
+			env: map[string]string{
+				"SKUPPER_DUMMY": "i am a bad value!",
+			},
+			expectedError: "i am a bad value",
+			expectedValue: true,
+		},
+		{
+			name: "error references env var name",
+			env: map[string]string{
+				"SKUPPER_DUMMY": "i am a bad value!",
+			},
+			expectedError: "SKUPPER_DUMMY",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			flags := &flag.FlagSet{}
+			var value bool
+			for k, v := range tt.env {
+				t.Setenv(k, v)
+			}
+			err := BoolVar(flags, &value, "dummy", "SKUPPER_DUMMY", tt.defaultValue, "Test of dummy config option")
+			flags.Parse(tt.args)
+			if tt.expectedError != "" {
+				assert.ErrorContains(t, err, tt.expectedError)
+			} else if err != nil {
+				t.Error(err)
+			}
+			assert.Equal(t, value, tt.expectedValue)
+		})
+	}
+}
+
+func Test_IntVar(t *testing.T) {
+	tests := []struct {
+		name          string
+		defaultValue  int
+		args          []string
+		env           map[string]string
+		expectedValue int
+		expectedError string
+	}{
+		{
+			name:          "default value returned",
+			defaultValue:  123,
+			expectedValue: 123,
+		},
+		{
+			name:          "flag specified as two args",
+			args:          []string{"-dummy", "123"},
+			expectedValue: 123,
+		},
+		{
+			name:          "flag specified as one arg",
+			args:          []string{"-dummy=456"},
+			expectedValue: 456,
+		},
+		{
+			name:          "flag overrides default",
+			defaultValue:  123,
+			args:          []string{"-dummy=321"},
+			expectedValue: 321,
+		},
+		{
+			name: "env var returned",
+			env: map[string]string{
+				"SKUPPER_DUMMY": "999",
+			},
+			expectedValue: 999,
+		},
+		{
+			name:         "env var overrides default",
+			defaultValue: 123,
+			env: map[string]string{
+				"SKUPPER_DUMMY": "789",
+			},
+			expectedValue: 789,
+		},
+		{
+			name:         "invalid env var",
+			defaultValue: 555,
+			env: map[string]string{
+				"SKUPPER_DUMMY": "i am a bad value!",
+			},
+			expectedError: "i am a bad value",
+			expectedValue: 555,
+		},
+		{
+			name: "error references env var name",
+			env: map[string]string{
+				"SKUPPER_DUMMY": "i am a bad value!",
+			},
+			expectedError: "SKUPPER_DUMMY",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			flags := &flag.FlagSet{}
+			var value int
+			for k, v := range tt.env {
+				t.Setenv(k, v)
+			}
+			err := IntVar(flags, &value, "dummy", "SKUPPER_DUMMY", tt.defaultValue, "Test of dummy config option")
+			flags.Parse(tt.args)
+			if tt.expectedError != "" {
+				assert.ErrorContains(t, err, tt.expectedError)
+			} else if err != nil {
+				t.Error(err)
+			}
+			assert.Equal(t, value, tt.expectedValue)
+		})
+	}
+}
diff --git a/pkg/kube/grants/autoconfigure_test.go b/pkg/kube/grants/autoconfigure_test.go
new file mode 100644
index 00000000..474b096e
--- /dev/null
+++ b/pkg/kube/grants/autoconfigure_test.go
@@ -0,0 +1,270 @@
+package grants
+
+import (
+	"context"
+	"errors"
+	"testing"
+
+	"gotest.tools/assert"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	k8stesting "k8s.io/client-go/testing"
+
+	internalclient "github.com/skupperproject/skupper/internal/kube/client"
+	"github.com/skupperproject/skupper/internal/kube/client/fake"
+	"github.com/skupperproject/skupper/pkg/apis/skupper/v1alpha1"
+	fakev1alpha1 "github.com/skupperproject/skupper/pkg/generated/client/clientset/versioned/typed/skupper/v1alpha1/fake"
+	"github.com/skupperproject/skupper/pkg/kube"
+)
+
+func Test_configure(t *testing.T) {
+	var tests = []struct {
+		name              string
+		namespace         string
+		podname           string
+		port              int
+		k8sObjects        []runtime.Object
+		skupperObjects    []runtime.Object
+		prepends          []SkupperClientError
+		expectedSelector  map[string]string
+		expectedOwnerRefs []metav1.OwnerReference
+		expectedError     string
+	}{
+		{
+			name:              "simple",
+			podname:           "my-pod",
+			port:              1234,
+			namespace:         "test",
+			k8sObjects:        []runtime.Object{tf.pod("my-pod", "test", map[string]string{"foo": "bar"}, ref1)},
+			expectedSelector:  map[string]string{"foo": "bar"},
+			expectedOwnerRefs: ref1,
+		},
+		{
+			name:              "cert already exists",
+			podname:           "my-pod",
+			port:              1234,
+			namespace:         "test",
+			k8sObjects:        []runtime.Object{tf.pod("my-pod", "test", map[string]string{"foo": "bar"}, ref1)},
+			skupperObjects:    []runtime.Object{tf.cert("skupper-grant-server-ca", "test", "SkupperGrantServerCA", "", true, false, false, ref1)},
+			expectedSelector:  map[string]string{"foo": "bar"},
+			expectedOwnerRefs: ref1,
+		},
+		{
+			name:              "cert has wrong owner refs",
+			podname:           "my-pod",
+			port:              1234,
+			namespace:         "test",
+			k8sObjects:        []runtime.Object{tf.pod("my-pod", "test", map[string]string{"foo": "bar"}, ref1)},
+			skupperObjects:    []runtime.Object{tf.cert("skupper-grant-server-ca", "test", "SkupperGrantServerCA", "", true, false, false, ref2)},
+			expectedSelector:  map[string]string{"foo": "bar"},
+			expectedOwnerRefs: ref1,
+		},
+		{
+			name:              "cert has wrong spec",
+			podname:           "my-pod",
+			port:              1234,
+			namespace:         "test",
+			k8sObjects:        []runtime.Object{tf.pod("my-pod", "test", map[string]string{"foo": "bar"}, ref1)},
+			skupperObjects:    []runtime.Object{tf.cert("skupper-grant-server-ca", "test", "ajkfhakjfh", "", false, true, true, ref1)},
+			expectedSelector:  map[string]string{"foo": "bar"},
+			expectedOwnerRefs: ref1,
+		},
+		{
+			name:              "securedaccess already exists",
+			podname:           "my-pod",
+			port:              1234,
+			namespace:         "test",
+			k8sObjects:        []runtime.Object{tf.pod("my-pod", "test", map[string]string{"foo": "bar"}, ref1)},
+			skupperObjects:    []runtime.Object{tf.securedAccess("skupper-grant-server", "test", map[string]string{"foo": "bar"}, 1234, ref1)},
+			expectedSelector:  map[string]string{"foo": "bar"},
+			expectedOwnerRefs: ref1,
+		},
+		{
+			name:              "securedaccess has wrong refs",
+			podname:           "my-pod",
+			port:              1234,
+			namespace:         "test",
+			k8sObjects:        []runtime.Object{tf.pod("my-pod", "test", map[string]string{"foo": "bar"}, ref1)},
+			skupperObjects:    []runtime.Object{tf.securedAccess("skupper-grant-server", "test", map[string]string{"foo": "bar"}, 1234, ref2)},
+			expectedSelector:  map[string]string{"foo": "bar"},
+			expectedOwnerRefs: ref1,
+		},
+		{
+			name:              "securedaccess has wrong port",
+			podname:           "my-pod",
+			port:              1234,
+			namespace:         "test",
+			k8sObjects:        []runtime.Object{tf.pod("my-pod", "test", map[string]string{"foo": "bar"}, ref1)},
+			skupperObjects:    []runtime.Object{tf.securedAccess("skupper-grant-server", "test", map[string]string{"foo": "bar"}, 9090, ref1)},
+			expectedSelector:  map[string]string{"foo": "bar"},
+			expectedOwnerRefs: ref1,
+		},
+		{
+			name:              "securedaccess has wrong selector",
+			podname:           "my-pod",
+			port:              1234,
+			namespace:         "test",
+			k8sObjects:        []runtime.Object{tf.pod("my-pod", "test", map[string]string{"foo": "bar"}, ref1)},
+			skupperObjects:    []runtime.Object{tf.securedAccess("skupper-grant-server", "test", map[string]string{"x": "y"}, 1234, ref1)},
+			expectedSelector:  map[string]string{"foo": "bar"},
+			expectedOwnerRefs: ref1,
+		},
+		{
+			name:          "pod not found",
+			podname:       "idontexist",
+			namespace:     "other",
+			expectedError: "not found",
+		},
+		{
+			name:          "error on cert get",
+			podname:       "my-pod",
+			port:          1234,
+			namespace:     "test",
+			k8sObjects:    []runtime.Object{tf.pod("my-pod", "test", map[string]string{"foo": "bar"}, ref1)},
+			prepends:      []SkupperClientError{skupperClientError("get", "certificates", "Can't get certificate")},
+			expectedError: "Can't get certificate",
+		},
+		{
+			name:          "error on securedaccess get",
+			podname:       "my-pod",
+			port:          1234,
+			namespace:     "test",
+			k8sObjects:    []runtime.Object{tf.pod("my-pod", "test", map[string]string{"foo": "bar"}, ref1)},
+			prepends:      []SkupperClientError{skupperClientError("get", "securedaccesses", "Can't get securedaccess")},
+			expectedError: "Can't get securedaccess",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			client, err := fake.NewFakeClient("test", tt.k8sObjects, tt.skupperObjects, "")
+			if err != nil {
+				t.Error(err)
+			}
+			for _, p := range tt.prepends {
+				p.prepend(client)
+			}
+			ac := &AutoConfigure{
+				podname:              tt.podname,
+				port:                 tt.port,
+				tlsCredentialsSecret: "skupper-grant-server",
+			}
+			err = ac.configure(client, tt.namespace)
+			if tt.expectedError != "" {
+				assert.ErrorContains(t, err, tt.expectedError)
+			} else if err != nil {
+				t.Error(err)
+			} else {
+				// verify that Certificate & SecuredAccess exist and match expectations
+				cert, err := client.GetSkupperClient().SkupperV1alpha1().Certificates(tt.namespace).Get(context.Background(), "skupper-grant-server-ca", metav1.GetOptions{})
+				if err != nil {
+					t.Error(err)
+				}
+				assert.Equal(t, cert.Spec.Ca, "")
+				assert.Equal(t, cert.Spec.Subject, "SkupperGrantServerCA")
+				assert.Equal(t, cert.Spec.Signing, true)
+				assert.Equal(t, cert.Spec.Client, false)
+				assert.Equal(t, cert.Spec.Server, false)
+				assert.DeepEqual(t, cert.ObjectMeta.OwnerReferences, tt.expectedOwnerRefs)
+
+				sa, err := client.GetSkupperClient().SkupperV1alpha1().SecuredAccesses(tt.namespace).Get(context.Background(), "skupper-grant-server", metav1.GetOptions{})
+				if err != nil {
+					t.Error(err)
+				}
+				assert.DeepEqual(t, sa.Spec.Selector, tt.expectedSelector)
+				assert.DeepEqual(t, sa.Spec.Ports[0].Port, tt.port)
+				assert.DeepEqual(t, sa.Spec.Issuer, "skupper-grant-server-ca")
+				assert.DeepEqual(t, sa.Spec.Certificate, "skupper-grant-server")
+				assert.DeepEqual(t, sa.ObjectMeta.OwnerReferences, tt.expectedOwnerRefs)
+			}
+		})
+	}
+}
+
+func Test_newAutoconfigure(t *testing.T) {
+	var tests = []struct {
+		name          string
+		podname       string
+		expectedError string
+	}{
+		{
+			name:    "simple",
+			podname: "my-pod",
+		},
+		{
+			name:          "failed",
+			podname:       "I don't exist",
+			expectedError: "not found",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			client, err := fake.NewFakeClient("test", []runtime.Object{tf.pod(tt.podname, "test", map[string]string{"foo": "bar"}, ref1)}, nil, "")
+			if err != nil {
+				t.Error(err)
+			}
+			controller := kube.NewController("Controller", client)
+
+			config := &GrantConfig{
+				Port:     9090,
+				Hostname: "my-pod",
+			}
+			var found *v1alpha1.SecuredAccess
+			handler := func(key string, sa *v1alpha1.SecuredAccess) error {
+				found = sa
+				return nil
+			}
+			_, err = newAutoConfigure(handler, controller, "test", config)
+			if tt.expectedError != "" {
+				assert.ErrorContains(t, err, tt.expectedError)
+			} else if err != nil {
+				t.Error(err)
+			} else {
+				stopCh := make(chan struct{})
+				defer close(stopCh)
+				controller.StartWatchers(stopCh)
+				assert.Assert(t, controller.WaitForCacheSync(stopCh))
+				assert.Assert(t, controller.TestProcess())
+				assert.Assert(t, found != nil)
+				assert.Equal(t, found.Name, "skupper-grant-server")
+				assert.Equal(t, found.Spec.Ports[0].Port, 9090)
+			}
+		})
+	}
+}
+
+var ref1 = []metav1.OwnerReference{
+	{
+		Kind:       "ReplicaSet",
+		APIVersion: "v1",
+		Name:       "parent1",
+		UID:        "0bde3bc8-a4a2-404a-bfbe-44fdf7bf3231",
+	},
+}
+var ref2 = []metav1.OwnerReference{
+	{
+		Kind:       "ReplicaSet",
+		APIVersion: "v1",
+		Name:       "parent2",
+		UID:        "a40fbe84-f276-4755-bf22-5ba980ab1661",
+	},
+}
+
+type SkupperClientError struct {
+	verb     string
+	resource string
+	err      string
+}
+
+func (e *SkupperClientError) prepend(client internalclient.Clients) {
+	client.GetSkupperClient().SkupperV1alpha1().(*fakev1alpha1.FakeSkupperV1alpha1).PrependReactor(e.verb, e.resource, func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) {
+		return true, nil, errors.New(e.err)
+	})
+}
+
+func skupperClientError(verb string, resource string, err string) SkupperClientError {
+	return SkupperClientError{
+		verb:     verb,
+		resource: resource,
+		err:      err,
+	}
+}
diff --git a/pkg/kube/grants/common_test.go b/pkg/kube/grants/common_test.go
new file mode 100644
index 00000000..c8b8c2fc
--- /dev/null
+++ b/pkg/kube/grants/common_test.go
@@ -0,0 +1,207 @@
+package grants
+
+import (
+	"errors"
+	"io"
+	"strings"
+
+	"github.com/google/uuid"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
+
+	"github.com/skupperproject/skupper/pkg/apis/skupper/v1alpha1"
+	"github.com/skupperproject/skupper/pkg/certs"
+)
+
+type FailingReader struct {
+	reader io.Reader
+	read   int
+	fail   int
+}
+
+func (r *FailingReader) Read(p []byte) (int, error) {
+	if r.reader == nil {
+		return 0, errors.New("Failed Read")
+	}
+	n, err := r.reader.Read(p)
+	if r.read+n > r.fail {
+		return 0, errors.New("Failed Read")
+	}
+	r.read += n
+	return n, err
+}
+
+type FailingWriter struct {
+	writer io.Writer
+	calls  int
+	fail   int
+}
+
+func (r *FailingWriter) Write(p []byte) (int, error) {
+	if r.writer == nil {
+		return 0, errors.New("Failed Write")
+	}
+	n, err := r.writer.Write(p)
+	r.calls = r.calls + 1
+	if r.calls > r.fail {
+		return 0, errors.New("Failed Write")
+	}
+	return n, err
+}
+
+func (*factory) pod(name string, namespace string, labels map[string]string, ownerRefs []metav1.OwnerReference) *corev1.Pod {
+	return &corev1.Pod{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "v1",
+			Kind:       "Pod",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:            name,
+			Namespace:       namespace,
+			Labels:          labels,
+			OwnerReferences: ownerRefs,
+		},
+	}
+}
+
+func (*factory) cert(name string, namespace string, subject string, ca string, signing bool, client bool, server bool, ownerRefs []metav1.OwnerReference) *v1alpha1.Certificate {
+	return &v1alpha1.Certificate{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "skupper.io/v1alpha1",
+			Kind:       "Certificate",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:            name,
+			Namespace:       namespace,
+			OwnerReferences: ownerRefs,
+		},
+		Spec: v1alpha1.CertificateSpec{
+			Ca:      ca,
+			Subject: subject,
+			Signing: signing,
+			Client:  client,
+			Server:  server,
+		},
+	}
+}
+
+func (*factory) securedAccess(name string, namespace string, selector map[string]string, port int, ownerRefs []metav1.OwnerReference) *v1alpha1.SecuredAccess {
+	return &v1alpha1.SecuredAccess{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "skupper.io/v1alpha1",
+			Kind:       "SecuredAccess",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:            name,
+			Namespace:       namespace,
+			OwnerReferences: ownerRefs,
+		},
+		Spec: v1alpha1.SecuredAccessSpec{
+			Selector: selector,
+			Ports: []v1alpha1.SecuredAccessPort{
+				{
+					Name: "https",
+					Port: port,
+				},
+			},
+			Issuer:      "skupper-grant-server-ca",
+			Certificate: "skupper-grant-server",
+		},
+	}
+}
+
+func (*factory) grant(name string, namespace string, uid string) *v1alpha1.AccessGrant {
+	if uid == "" {
+		uid = uuid.NewString()
+	}
+	return &v1alpha1.AccessGrant{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "skupper.io/v1alpha1",
+			Kind:       "AccessGrant",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      name,
+			Namespace: namespace,
+			UID:       types.UID(uid),
+		},
+		Spec: v1alpha1.AccessGrantSpec{
+			RedemptionsAllowed: 1,
+		},
+	}
+
+}
+
+func (*factory) secret(name string, namespace string, subject string, hosts []string) *corev1.Secret {
+	secret := certs.GenerateSecret(name, subject, strings.Join(hosts, ","), nil)
+	secret.ObjectMeta.Namespace = namespace
+	return &secret
+}
+
+func (*factory) genericSecret(name string, namespace string) *corev1.Secret {
+	return &corev1.Secret{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "v1",
+			Kind:       "Secret",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      name,
+			Namespace: namespace,
+			UID:       types.UID(uuid.NewString()),
+		},
+	}
+}
+
+func (*factory) site(name string, namespace string) *v1alpha1.Site {
+	return &v1alpha1.Site{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "skupper.io/v1alpha1",
+			Kind:       "Site",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      name,
+			Namespace: namespace,
+			UID:       types.UID(uuid.NewString()),
+		},
+	}
+}
+
+func (*factory) link(name string, namespace string, endpoints []v1alpha1.Endpoint, tlsCredentials string) *v1alpha1.Link {
+	return &v1alpha1.Link{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "skupper.io/v1alpha1",
+			Kind:       "Link",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      name,
+			Namespace: namespace,
+			UID:       types.UID(uuid.NewString()),
+		},
+		Spec: v1alpha1.LinkSpec{
+			Endpoints:      endpoints,
+			TlsCredentials: tlsCredentials,
+		},
+	}
+}
+
+func (*factory) token(name string, namespace string, url string, code string, ca string) *v1alpha1.AccessToken {
+	return &v1alpha1.AccessToken{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "skupper.io/v1alpha1",
+			Kind:       "AccessToken",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      name,
+			Namespace: namespace,
+		},
+		Spec: v1alpha1.AccessTokenSpec{
+			Url:  url,
+			Code: code,
+			Ca:   ca,
+		},
+	}
+}
+
+type factory struct{}
+
+var tf = &factory{}
diff --git a/pkg/kube/grants/config_test.go b/pkg/kube/grants/config_test.go
new file mode 100644
index 00000000..e3891ff9
--- /dev/null
+++ b/pkg/kube/grants/config_test.go
@@ -0,0 +1,216 @@
+package grants
+
+import (
+	"flag"
+	"os"
+	"testing"
+
+	"gotest.tools/assert"
+)
+
+func Test_BoundGrantConfig(t *testing.T) {
+	tests := []struct {
+		name           string
+		args           []string
+		env            map[string]string
+		expectedValue  *GrantConfig
+		expectedErrors []string
+	}{
+		{
+			name: "defaults",
+			expectedValue: &GrantConfig{
+				Port:                 9090,
+				TlsCredentialsSecret: "skupper-grant-server",
+				Hostname:             os.Getenv("HOSTNAME"),
+			},
+		},
+		{
+			name: "env vars",
+			env: map[string]string{
+				"SKUPPER_ENABLE_GRANTS":                "true",
+				"SKUPPER_GRANT_SERVER_AUTOCONFIGURE":   "true",
+				"SKUPPER_GRANT_SERVER_BASE_URL":        "https://acme.org:8888/grants",
+				"SKUPPER_GRANT_SERVER_PORT":            "1234",
+				"SKUPPER_GRANT_SERVER_TLS_CREDENTIALS": "my-secret",
+				"HOSTNAME":                             "my-host",
+			},
+			expectedValue: &GrantConfig{
+				Enabled:              true,
+				AutoConfigure:        true,
+				BaseUrl:              "https://acme.org:8888/grants",
+				Port:                 1234,
+				TlsCredentialsSecret: "my-secret",
+				Hostname:             "my-host",
+			},
+		},
+		{
+			name: "args",
+			env: map[string]string{
+				"SKUPPER_ENABLE_GRANTS":                "true",
+				"SKUPPER_GRANT_SERVER_AUTOCONFIGURE":   "true",
+				"SKUPPER_GRANT_SERVER_BASE_URL":        "https://acme.org:8888/grants",
+				"SKUPPER_GRANT_SERVER_PORT":            "1234",
+				"SKUPPER_GRANT_SERVER_TLS_CREDENTIALS": "my-secret",
+				"HOSTNAME":                             "my-host",
+			},
+			args: []string{
+				"--enable-grants=false",
+				"--grant-server-autoconfigure=false",
+				"--grant-server-base-url=https://anotherhost:8080/blah",
+				"--grant-server-port=9876",
+				"--grant-server-tls-credentials=a-different-secret",
+				"--grant-server-podname=a-different-host",
+			},
+			expectedValue: &GrantConfig{
+				Enabled:              false,
+				AutoConfigure:        false,
+				BaseUrl:              "https://anotherhost:8080/blah",
+				Port:                 9876,
+				TlsCredentialsSecret: "a-different-secret",
+				Hostname:             "a-different-host",
+			},
+		},
+		{
+			name: "args override env vars",
+			args: []string{
+				"--enable-grants",
+				"--grant-server-autoconfigure",
+				"--grant-server-base-url=https://acme.org:8888/grants",
+				"--grant-server-port=1234",
+				"--grant-server-tls-credentials=my-secret",
+				"--grant-server-podname=my-host",
+			},
+			expectedValue: &GrantConfig{
+				Enabled:              true,
+				AutoConfigure:        true,
+				BaseUrl:              "https://acme.org:8888/grants",
+				Port:                 1234,
+				TlsCredentialsSecret: "my-secret",
+				Hostname:             "my-host",
+			},
+		},
+		{
+			name: "invalid env var for enabled",
+			env: map[string]string{
+				"SKUPPER_ENABLE_GRANTS":                "this is not a bool",
+				"SKUPPER_GRANT_SERVER_AUTOCONFIGURE":   "true",
+				"SKUPPER_GRANT_SERVER_BASE_URL":        "https://acme.org:8888/grants",
+				"SKUPPER_GRANT_SERVER_PORT":            "1234",
+				"SKUPPER_GRANT_SERVER_TLS_CREDENTIALS": "my-secret",
+				"HOSTNAME":                             "my-host",
+			},
+			expectedErrors: []string{
+				"Invalid environment variable(s)",
+				"SKUPPER_ENABLE_GRANTS",
+				"this is not a bool",
+			},
+			expectedValue: &GrantConfig{
+				Enabled:              false,
+				AutoConfigure:        true,
+				BaseUrl:              "https://acme.org:8888/grants",
+				Port:                 1234,
+				TlsCredentialsSecret: "my-secret",
+				Hostname:             "my-host",
+			},
+		},
+		{
+			name: "invalid env var for autoconfigure",
+			env: map[string]string{
+				"SKUPPER_ENABLE_GRANTS":                "true",
+				"SKUPPER_GRANT_SERVER_AUTOCONFIGURE":   "this is not a bool",
+				"SKUPPER_GRANT_SERVER_BASE_URL":        "https://acme.org:8888/grants",
+				"SKUPPER_GRANT_SERVER_PORT":            "1234",
+				"SKUPPER_GRANT_SERVER_TLS_CREDENTIALS": "my-secret",
+				"HOSTNAME":                             "my-host",
+			},
+			expectedErrors: []string{
+				"Invalid environment variable(s)",
+				"SKUPPER_GRANT_SERVER_AUTOCONFIGURE",
+				"this is not a bool",
+			},
+			expectedValue: &GrantConfig{
+				Enabled:              true,
+				AutoConfigure:        false,
+				BaseUrl:              "https://acme.org:8888/grants",
+				Port:                 1234,
+				TlsCredentialsSecret: "my-secret",
+				Hostname:             "my-host",
+			},
+		},
+		{
+			name: "invalid env var for port",
+			env: map[string]string{
+				"SKUPPER_ENABLE_GRANTS":                "true",
+				"SKUPPER_GRANT_SERVER_AUTOCONFIGURE":   "true",
+				"SKUPPER_GRANT_SERVER_BASE_URL":        "https://acme.org:8888/grants",
+				"SKUPPER_GRANT_SERVER_PORT":            "foo/bar/baz",
+				"SKUPPER_GRANT_SERVER_TLS_CREDENTIALS": "my-secret",
+				"HOSTNAME":                             "my-host",
+			},
+			expectedErrors: []string{
+				"Invalid environment variable(s)",
+				"SKUPPER_GRANT_SERVER_PORT",
+				"foo/bar/baz",
+			},
+			expectedValue: &GrantConfig{
+				Enabled:              true,
+				AutoConfigure:        true,
+				BaseUrl:              "https://acme.org:8888/grants",
+				Port:                 9090,
+				TlsCredentialsSecret: "my-secret",
+				Hostname:             "my-host",
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			for k, v := range tt.env {
+				t.Setenv(k, v)
+			}
+			flags := &flag.FlagSet{}
+			config, err := BoundGrantConfig(flags)
+			flags.Parse(tt.args)
+			if len(tt.expectedErrors) > 0 {
+				for _, text := range tt.expectedErrors {
+					assert.ErrorContains(t, err, text)
+				}
+			} else if err != nil {
+				t.Error(err)
+			}
+			assert.DeepEqual(t, config, tt.expectedValue)
+		})
+	}
+}
+
+func Test_GrantConfigMethods(t *testing.T) {
+	tests := []struct {
+		name           string
+		input          *GrantConfig
+		expectedAddr   string
+		expectedScheme string
+	}{
+		{
+			name: "case 1",
+			input: &GrantConfig{
+				Port: 1234,
+			},
+			expectedAddr:   ":1234",
+			expectedScheme: "http",
+		},
+		{
+			name: "case 2",
+			input: &GrantConfig{
+				Port:                 9090,
+				TlsCredentialsSecret: "foo",
+			},
+			expectedAddr:   ":9090",
+			expectedScheme: "https",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			assert.Equal(t, tt.input.addr(), tt.expectedAddr)
+			assert.Equal(t, tt.input.scheme(), tt.expectedScheme)
+		})
+	}
+}
diff --git a/pkg/kube/grants/disabled_test.go b/pkg/kube/grants/disabled_test.go
new file mode 100644
index 00000000..44e0b9a1
--- /dev/null
+++ b/pkg/kube/grants/disabled_test.go
@@ -0,0 +1,93 @@
+package grants
+
+import (
+	"context"
+	"testing"
+
+	"gotest.tools/assert"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+
+	"github.com/skupperproject/skupper/internal/kube/client/fake"
+	"github.com/skupperproject/skupper/pkg/apis/skupper/v1alpha1"
+	"github.com/skupperproject/skupper/pkg/kube"
+)
+
+func Test_markGrantNotEnabled(t *testing.T) {
+	grant := &v1alpha1.AccessGrant{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "my-grant",
+			Namespace: "test",
+		},
+		Spec: v1alpha1.AccessGrantSpec{},
+		Status: v1alpha1.AccessGrantStatus{
+			Status: v1alpha1.Status{
+				StatusMessage: "",
+			},
+		},
+	}
+	badGrant := &v1alpha1.AccessGrant{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "i-do-not-exist-in-api-server",
+			Namespace: "test",
+		},
+	}
+	skupperObjects := []runtime.Object{
+		grant,
+	}
+	client, err := fake.NewFakeClient("test", nil, skupperObjects, "")
+	if err != nil {
+		t.Error(err)
+	}
+	disabled := &GrantsDisabled{
+		clients: client,
+	}
+
+	err = disabled.markGrantNotEnabled("", grant)
+	if err != nil {
+		t.Error(err)
+	}
+	assert.Equal(t, grant.Status.StatusMessage, "AccessGrants are not enabled")
+	err = disabled.markGrantNotEnabled("", nil)
+	if err != nil {
+		t.Error(err)
+	}
+	err = disabled.markGrantNotEnabled("", badGrant)
+	if err != nil {
+		t.Error(err)
+	}
+}
+
+func Test_disabled(t *testing.T) {
+	grant := &v1alpha1.AccessGrant{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "my-grant",
+			Namespace: "test",
+		},
+		Spec: v1alpha1.AccessGrantSpec{},
+		Status: v1alpha1.AccessGrantStatus{
+			Status: v1alpha1.Status{
+				StatusMessage: "",
+			},
+		},
+	}
+	skupperObjects := []runtime.Object{
+		grant,
+	}
+	client, err := fake.NewFakeClient("test", nil, skupperObjects, "")
+	if err != nil {
+		t.Error(err)
+	}
+	controller := kube.NewController("Controller", client)
+	disabled(controller, "test")
+	stopCh := make(chan struct{})
+	defer close(stopCh)
+	controller.StartWatchers(stopCh)
+	assert.Assert(t, controller.WaitForCacheSync(stopCh))
+	assert.Assert(t, controller.TestProcess())
+	latest, err := client.GetSkupperClient().SkupperV1alpha1().AccessGrants(grant.Namespace).Get(context.TODO(), grant.Name, metav1.GetOptions{})
+	if err != nil {
+		t.Error(err)
+	}
+	assert.Equal(t, latest.Status.StatusMessage, "AccessGrants are not enabled")
+}
diff --git a/pkg/kube/grants/enabled_test.go b/pkg/kube/grants/enabled_test.go
new file mode 100644
index 00000000..85a950d7
--- /dev/null
+++ b/pkg/kube/grants/enabled_test.go
@@ -0,0 +1,42 @@
+package grants
+
+import (
+	"testing"
+
+	corev1 "k8s.io/api/core/v1"
+)
+
+func Test_tlsCredentialsUpdated(t *testing.T) {
+	var tests = []struct {
+		name   string
+		key    string
+		secret *corev1.Secret
+	}{
+		{
+			name:   "simple",
+			key:    "test/simple",
+			secret: tf.secret("simple", "test", "My Subject", []string{"foo.com", "bar.org"}),
+		},
+		{
+			name:   "non tls secret",
+			key:    "test/simple",
+			secret: tf.genericSecret("simple", "test"),
+		},
+		{
+			name: "nil secret",
+			key:  "test/simple",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gc := &GrantsEnabled{
+				grants: newGrants(nil, nil, "https", ""),
+			}
+			gc.server = newServer(":0", true, gc.grants)
+			err := gc.tlsCredentialsUpdated(tt.key, tt.secret)
+			if err != nil {
+				t.Error(err)
+			}
+		})
+	}
+}
diff --git a/pkg/kube/grants/grant_test.go b/pkg/kube/grants/grant_test.go
new file mode 100644
index 00000000..432be914
--- /dev/null
+++ b/pkg/kube/grants/grant_test.go
@@ -0,0 +1,519 @@
+package grants
+
+import (
+	"bytes"
+	"context"
+	"errors"
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+	"time"
+
+	"gotest.tools/assert"
+	meta "k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+
+	"github.com/skupperproject/skupper/internal/kube/client/fake"
+	"github.com/skupperproject/skupper/pkg/apis/skupper/v1alpha1"
+)
+
+func dummyGenerator(namespace string, name string, subject string, writer io.Writer) error {
+	io.WriteString(writer, namespace+",")
+	io.WriteString(writer, name+",")
+	io.WriteString(writer, subject)
+	return nil
+}
+
+func dummyGeneratorWithError(namespace string, name string, subject string, writer io.Writer) error {
+	return errors.New("Failed")
+}
+
+func TestGrantRegistryGeneral(t *testing.T) {
+	grants := []*v1alpha1.AccessGrant{
+		&v1alpha1.AccessGrant{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "one",
+				Namespace: "test",
+				UID:       "0bde3bc8-a4a2-404a-bfbe-44fdf7bf3231",
+			},
+			Spec: v1alpha1.AccessGrantSpec{
+				Code:               "supersecret",
+				RedemptionsAllowed: 1,
+			},
+		},
+		&v1alpha1.AccessGrant{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "two",
+				Namespace: "test",
+				UID:       "a40fbe84-f276-4755-bf22-5ba980ab1661",
+			},
+			Spec: v1alpha1.AccessGrantSpec{
+				ExpirationWindow:   "30m",
+				RedemptionsAllowed: 3,
+			},
+		},
+	}
+	var skupperObjects []runtime.Object
+	for _, grant := range grants {
+		skupperObjects = append(skupperObjects, grant)
+	}
+	client, err := fake.NewFakeClient("test", nil, skupperObjects, "")
+	if err != nil {
+		t.Error(err)
+	}
+	registry := newGrants(client, dummyGenerator, "https", "")
+	for _, grant := range grants {
+		key := grant.Namespace + "/" + grant.Name
+		err = registry.checkGrant(key, grant)
+		if err != nil {
+			t.Error(err)
+		}
+		latest, err := client.GetSkupperClient().SkupperV1alpha1().AccessGrants(grant.Namespace).Get(context.TODO(), grant.Name, metav1.GetOptions{})
+		if err != nil {
+			t.Error(err)
+		}
+		if grant.Spec.Code != "" {
+			assert.Equal(t, latest.Status.Code, latest.Spec.Code)
+		} else {
+			assert.Assert(t, latest.Status.Code != "")
+			assert.Assert(t, len(latest.Status.Code) == 24)
+		}
+		assert.Assert(t, latest.Status.Expiration != "")
+		_, err = time.Parse(time.RFC3339, grant.Status.Expiration)
+		if err != nil {
+			t.Error(err)
+		}
+		assert.Assert(t, meta.IsStatusConditionTrue(latest.Status.Conditions, v1alpha1.CONDITION_TYPE_PROCESSED))
+	}
+	for _, ca := range []string{"dummydataformyCA", "dummydataformyCA", "changedCAdata"} {
+		if registry.setCA(ca) {
+			registry.recheckCa()
+		}
+		for _, grant := range grants {
+			latest, err := client.GetSkupperClient().SkupperV1alpha1().AccessGrants(grant.Namespace).Get(context.TODO(), grant.Name, metav1.GetOptions{})
+			if err != nil {
+				t.Error(err)
+			}
+			assert.Equal(t, latest.Status.Ca, ca)
+		}
+	}
+	for _, url := range []string{"my-host:8080", "my-host:8080", "new-host:1234"} {
+		if registry.setUrl(url) {
+			registry.recheckUrl()
+		}
+		for _, grant := range grants {
+			latest, err := client.GetSkupperClient().SkupperV1alpha1().AccessGrants(grant.Namespace).Get(context.TODO(), grant.Name, metav1.GetOptions{})
+			if err != nil {
+				t.Error(err)
+			}
+			expectedUrl := "https://" + url + "/" + string(latest.ObjectMeta.UID)
+			assert.Equal(t, latest.Status.Url, expectedUrl)
+			assert.Assert(t, meta.IsStatusConditionTrue(latest.Status.Conditions, v1alpha1.CONDITION_TYPE_RESOLVED))
+			assert.Assert(t, meta.IsStatusConditionTrue(latest.Status.Conditions, v1alpha1.CONDITION_TYPE_READY))
+		}
+	}
+
+	for _, grant := range grants {
+		req := httptest.NewRequest(http.MethodPost, "/"+string(grant.ObjectMeta.UID), bytes.NewBufferString(grant.Status.Code))
+		res := httptest.NewRecorder()
+		registry.ServeHTTP(res, req)
+		assert.Equal(t, res.Code, http.StatusOK)
+		latest, err := client.GetSkupperClient().SkupperV1alpha1().AccessGrants(grant.Namespace).Get(context.TODO(), grant.Name, metav1.GetOptions{})
+		if err != nil {
+			t.Error(err)
+		}
+		assert.Equal(t, latest.Status.Redeemed, 1)
+	}
+	//TODO: test bad input values in spec
+}
+
+func Test_ServeHttp(t *testing.T) {
+	good := &v1alpha1.AccessGrant{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "good",
+			Namespace: "test",
+			UID:       "0bde3bc8-a4a2-404a-bfbe-44fdf7bf3231",
+		},
+		Spec: v1alpha1.AccessGrantSpec{
+			RedemptionsAllowed: 4,
+		},
+		Status: v1alpha1.AccessGrantStatus{
+			Code:       "supersecret",
+			Expiration: time.Date(2124, time.January, 0, 0, 0, 0, 0, time.UTC).Format(time.RFC3339),
+		},
+	}
+	expired := &v1alpha1.AccessGrant{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "expired",
+			Namespace: "test",
+			UID:       "a40fbe84-f276-4755-bf22-5ba980ab1661",
+		},
+		Spec: v1alpha1.AccessGrantSpec{
+			RedemptionsAllowed: 1,
+		},
+		Status: v1alpha1.AccessGrantStatus{
+			Code:       "supersecret",
+			Expiration: time.Date(2024, time.January, 0, 0, 0, 0, 0, time.UTC).Format(time.RFC3339),
+		},
+	}
+	used := &v1alpha1.AccessGrant{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "used-up",
+			Namespace: "test",
+			UID:       "cec708de-b907-48a0-b6e2-6ee64ca11f08",
+		},
+		Spec: v1alpha1.AccessGrantSpec{
+			RedemptionsAllowed: 1,
+		},
+		Status: v1alpha1.AccessGrantStatus{
+			Code:       "supersecret",
+			Redeemed:   1,
+			Expiration: time.Date(2124, time.January, 0, 0, 0, 0, 0, time.UTC).Format(time.RFC3339),
+		},
+	}
+	badExpiration := &v1alpha1.AccessGrant{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "bad-expiration",
+			Namespace: "test",
+			UID:       "6904f3e1-6802-4428-9b49-1b006114c496",
+		},
+		Spec: v1alpha1.AccessGrantSpec{
+			RedemptionsAllowed: 1,
+		},
+		Status: v1alpha1.AccessGrantStatus{
+			Code:       "supersecret",
+			Redeemed:   1,
+			Expiration: "iamnotadate",
+		},
+	}
+	deleted := &v1alpha1.AccessGrant{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "deleted",
+			Namespace: "test",
+			UID:       "cd125f09-d14a-4bef-b53b-fe7edd80908b",
+		},
+		Spec: v1alpha1.AccessGrantSpec{
+			RedemptionsAllowed: 1,
+		},
+		Status: v1alpha1.AccessGrantStatus{
+			Code:       "supersecret",
+			Expiration: time.Date(2124, time.January, 0, 0, 0, 0, 0, time.UTC).Format(time.RFC3339),
+		},
+	}
+
+	skupperObjects := []runtime.Object{
+		good,
+		expired,
+		used,
+		badExpiration,
+		deleted,
+	}
+
+	var tests = []struct {
+		name         string
+		method       string
+		path         string
+		body         io.Reader
+		expectedCode int
+		generator    GrantResponse
+	}{
+		{
+			name:         "bad method",
+			method:       http.MethodGet,
+			path:         "/",
+			expectedCode: http.StatusMethodNotAllowed,
+		},
+		{
+			name:         "successful redeem",
+			method:       http.MethodPost,
+			path:         "/" + string(good.ObjectMeta.UID),
+			body:         bytes.NewBufferString(good.Status.Code),
+			expectedCode: http.StatusOK,
+		},
+		{
+			name:         "expired grant",
+			method:       http.MethodPost,
+			path:         "/" + string(expired.ObjectMeta.UID),
+			body:         bytes.NewBufferString(expired.Status.Code),
+			expectedCode: http.StatusNotFound,
+		},
+		{
+			name:         "used grant",
+			method:       http.MethodPost,
+			path:         "/" + string(used.ObjectMeta.UID),
+			body:         bytes.NewBufferString(used.Status.Code),
+			expectedCode: http.StatusNotFound,
+		},
+		{
+			name:         "wrong code",
+			method:       http.MethodPost,
+			path:         "/" + string(good.ObjectMeta.UID),
+			body:         bytes.NewBufferString("opensesame"),
+			expectedCode: http.StatusForbidden,
+		},
+		{
+			name:         "invalid path",
+			method:       http.MethodPost,
+			path:         "/Idonotexist",
+			body:         bytes.NewBufferString("opensesame"),
+			expectedCode: http.StatusNotFound,
+		},
+		{
+			name:         "generator error",
+			method:       http.MethodPost,
+			path:         "/" + string(good.ObjectMeta.UID),
+			body:         bytes.NewBufferString(good.Status.Code),
+			expectedCode: http.StatusInternalServerError,
+			generator:    dummyGeneratorWithError,
+		},
+		{
+			name:         "bad body",
+			method:       http.MethodPost,
+			path:         "/" + string(good.ObjectMeta.UID),
+			body:         &FailingReader{},
+			expectedCode: http.StatusBadRequest,
+		},
+		{
+			name:         "bad expiration",
+			method:       http.MethodPost,
+			path:         "/" + string(badExpiration.ObjectMeta.UID),
+			body:         bytes.NewBufferString(badExpiration.Status.Code),
+			expectedCode: http.StatusInternalServerError,
+		},
+		{
+			name:         "error updating status",
+			method:       http.MethodPost,
+			path:         "/" + string(deleted.ObjectMeta.UID),
+			body:         bytes.NewBufferString(deleted.Status.Code),
+			expectedCode: http.StatusServiceUnavailable,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			client, err := fake.NewFakeClient("test", nil, skupperObjects, "")
+			if err != nil {
+				t.Error(err)
+			}
+			generator := tt.generator
+			if generator == nil {
+				generator = dummyGenerator
+			}
+			registry := newGrants(client, generator, "https", "")
+			for _, grant := range []*v1alpha1.AccessGrant{good, expired, used, badExpiration, deleted} {
+				err = registry.checkGrant(grant.Namespace+"/"+grant.Name, grant)
+				if err != nil {
+					t.Error(err)
+				}
+			}
+			err = client.GetSkupperClient().SkupperV1alpha1().AccessGrants(deleted.Namespace).Delete(context.TODO(), deleted.Name, metav1.DeleteOptions{})
+			if err != nil {
+				t.Error(err)
+			}
+			req := httptest.NewRequest(tt.method, tt.path, tt.body)
+			res := httptest.NewRecorder()
+			registry.ServeHTTP(res, req)
+			assert.Equal(t, res.Code, tt.expectedCode)
+		})
+	}
+
+}
+
+type CheckGrantTestInvocation struct {
+	key           string
+	grant         *v1alpha1.AccessGrant
+	expectedError string
+	url           string //set url before invocation
+	ca            string //set ca before invocation
+	recheckUrl    string //set and recheck url after invocation
+	recheckCa     string //set and recheck ca after invocation
+}
+
+func Test_checkGrant(t *testing.T) {
+	good := &v1alpha1.AccessGrant{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "good",
+			Namespace: "test",
+			UID:       "0bde3bc8-a4a2-404a-bfbe-44fdf7bf3231",
+		},
+	}
+	badExpirationWindow := &v1alpha1.AccessGrant{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "bad-expiration",
+			Namespace: "test",
+			UID:       "6904f3e1-6802-4428-9b49-1b006114c496",
+		},
+		Spec: v1alpha1.AccessGrantSpec{
+			ExpirationWindow: "iamnotaduration",
+		},
+	}
+
+	skupperObjects := []runtime.Object{
+		good,
+		badExpirationWindow,
+	}
+	var tests = []struct {
+		name  string
+		calls []CheckGrantTestInvocation
+	}{
+		{
+			name: "simple",
+			calls: []CheckGrantTestInvocation{
+				{
+					key:   good.Namespace + "/" + good.Name,
+					grant: good,
+				},
+			},
+		},
+		{
+			name: "simple repeat",
+			calls: []CheckGrantTestInvocation{
+				{
+					key:   good.Namespace + "/" + good.Name,
+					grant: good,
+				},
+				{
+					key:   good.Namespace + "/" + good.Name,
+					grant: good,
+				},
+			},
+		},
+		{
+			name: "bad expiration",
+			calls: []CheckGrantTestInvocation{
+				{
+					key:   badExpirationWindow.Namespace + "/" + badExpirationWindow.Name,
+					grant: badExpirationWindow,
+				},
+			},
+		},
+		{
+			name: "delete good",
+			calls: []CheckGrantTestInvocation{
+				{
+					key:   good.Namespace + "/" + good.Name,
+					grant: good,
+				},
+				{
+					key: good.Namespace + "/" + good.Name,
+				},
+			},
+		},
+		{
+			name: "url changed",
+			calls: []CheckGrantTestInvocation{
+				{
+					key:   good.Namespace + "/" + good.Name,
+					grant: good,
+					url:   "foo",
+				},
+				{
+					key:   good.Namespace + "/" + good.Name,
+					grant: good,
+					url:   "foo",
+				},
+			},
+		},
+		{
+			name: "ca changed",
+			calls: []CheckGrantTestInvocation{
+				{
+					key:   good.Namespace + "/" + good.Name,
+					grant: good,
+					ca:    "foo",
+				},
+				{
+					key:   good.Namespace + "/" + good.Name,
+					grant: good,
+					ca:    "foo",
+				},
+			},
+		},
+		{
+			name: "failed update",
+			calls: []CheckGrantTestInvocation{
+				{
+					key: "test/failedUpdate",
+					grant: &v1alpha1.AccessGrant{
+						ObjectMeta: metav1.ObjectMeta{
+							Name:      "failedUpdate",
+							Namespace: "test",
+							UID:       "a40fbe84-f276-4755-bf22-5ba980ab1661",
+						},
+					},
+					expectedError: "failedUpdate",
+				},
+			},
+		},
+		{
+			name: "name reused with different UID",
+			calls: []CheckGrantTestInvocation{
+				{
+					key: "test/good",
+					grant: &v1alpha1.AccessGrant{
+						ObjectMeta: metav1.ObjectMeta{
+							Name:      "good",
+							Namespace: "test",
+							UID:       "a40fbe84-f276-4755-bf22-5ba980ab1661",
+						},
+					},
+				},
+				{
+					key:   "test/good",
+					grant: good,
+					ca:    "foo",
+				},
+			},
+		},
+		{
+			name: "failed update on rechecking ca and url",
+			calls: []CheckGrantTestInvocation{
+				{
+					key: "test/failedUpdate",
+					grant: &v1alpha1.AccessGrant{
+						ObjectMeta: metav1.ObjectMeta{
+							Name:      "failedUpdate",
+							Namespace: "test",
+							UID:       "a40fbe84-f276-4755-bf22-5ba980ab1661",
+						},
+					},
+					expectedError: "failedUpdate",
+					recheckUrl:    "foo",
+					recheckCa:     "bar",
+				},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			client, err := fake.NewFakeClient("test", nil, skupperObjects, "")
+			if err != nil {
+				t.Error(err)
+			}
+			registry := newGrants(client, nil, "https", "")
+			for _, call := range tt.calls {
+				if call.url != "" {
+					registry.setUrl(call.url)
+				}
+				if call.ca != "" {
+					registry.setCA(call.ca)
+				}
+				err = registry.checkGrant(call.key, call.grant)
+				if call.expectedError != "" {
+					assert.ErrorContains(t, err, call.expectedError)
+				} else if err != nil {
+					t.Error(err)
+				}
+				if call.recheckUrl != "" {
+					registry.setUrl(call.recheckUrl)
+					registry.recheckUrl()
+				}
+				if call.recheckCa != "" {
+					registry.setCA(call.recheckCa)
+					registry.recheckCa()
+				}
+			}
+		})
+	}
+}
diff --git a/pkg/kube/grants/init_test.go b/pkg/kube/grants/init_test.go
new file mode 100644
index 00000000..a9db2888
--- /dev/null
+++ b/pkg/kube/grants/init_test.go
@@ -0,0 +1,124 @@
+package grants
+
+import (
+	"context"
+	"testing"
+
+	"gotest.tools/assert"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+
+	"github.com/skupperproject/skupper/internal/kube/client/fake"
+	"github.com/skupperproject/skupper/pkg/apis/skupper/v1alpha1"
+	"github.com/skupperproject/skupper/pkg/kube"
+)
+
+func Test_Initialise(t *testing.T) {
+	grantUid := "0bde3bc8-a4a2-404a-bfbe-44fdf7bf3231"
+	var tests = []struct {
+		name           string
+		config         GrantConfig
+		k8sObjects     []runtime.Object
+		extraSteps     int
+		expectedStatus string
+		expectedUrl    string
+		endpoint       *v1alpha1.Endpoint
+	}{
+		{
+			name:           "disabled",
+			expectedStatus: "AccessGrants are not enabled",
+		},
+		{
+			name: "manual",
+			config: GrantConfig{
+				Enabled:              true,
+				BaseUrl:              "foo:5432",
+				TlsCredentialsSecret: "my-creds",
+			},
+			k8sObjects:     []runtime.Object{tf.secret("my-creds", "test", "grant server", nil)},
+			expectedStatus: "OK",
+			expectedUrl:    "https://foo:5432/" + grantUid,
+		},
+		{
+			name: "auto",
+			config: GrantConfig{
+				Enabled:              true,
+				AutoConfigure:        true,
+				Hostname:             "my-pod",
+				TlsCredentialsSecret: "skupper-grant-server",
+			},
+			//add pregenerated secret as the certificate controller is not in action in this test
+			k8sObjects: []runtime.Object{tf.pod("my-pod", "test", map[string]string{"foo": "bar"}, ref1), tf.secret("skupper-grant-server", "test", "grant server", nil)},
+			endpoint: &v1alpha1.Endpoint{
+				Host: "my-host",
+				Port: "1234",
+			},
+			expectedStatus: "OK",
+			expectedUrl:    "https://my-host:1234/" + grantUid,
+		},
+		{
+			name: "failed auto",
+			config: GrantConfig{
+				Enabled:              true,
+				AutoConfigure:        true,
+				Hostname:             "my-pod",
+				TlsCredentialsSecret: "skupper-grant-server",
+			},
+			//add pregenerated secret as the certificate controller is not in action in this test
+			k8sObjects:     []runtime.Object{tf.secret("skupper-grant-server", "test", "grant server", nil)},
+			expectedStatus: "Pending",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			client, err := fake.NewFakeClient("test", tt.k8sObjects, []runtime.Object{tf.grant("my-grant", "test", grantUid)}, "")
+			if err != nil {
+				t.Error(err)
+			}
+			controller := kube.NewController("Controller", client)
+
+			start := Initialise(controller, "test", metav1.NamespaceAll, &tt.config, nil)
+			if tt.endpoint != nil {
+				err = updateSecuredAccessEndpoint(controller, "skupper-grant-server", "test", tt.endpoint)
+				if err != nil {
+					t.Error(err)
+				}
+			}
+			stopCh := make(chan struct{})
+			defer close(stopCh)
+			controller.StartWatchers(stopCh)
+			assert.Assert(t, controller.WaitForCacheSync(stopCh))
+			if tt.config.Enabled {
+				assert.Assert(t, start != nil)
+				start()
+			}
+			for range tt.k8sObjects {
+				assert.Assert(t, controller.TestProcess())
+			}
+			assert.Assert(t, controller.TestProcess())
+
+			latest, err := client.GetSkupperClient().SkupperV1alpha1().AccessGrants("test").Get(context.TODO(), "my-grant", metav1.GetOptions{})
+			if err != nil {
+				t.Error(err)
+			}
+			assert.Equal(t, latest.Status.StatusMessage, tt.expectedStatus)
+			if tt.expectedUrl != "" {
+				assert.Equal(t, latest.Status.Url, tt.expectedUrl)
+			}
+
+		})
+	}
+
+}
+
+func updateSecuredAccessEndpoint(controller *kube.Controller, name string, namespace string, endpoint *v1alpha1.Endpoint) error {
+	sa, err := controller.GetSkupperClient().SkupperV1alpha1().SecuredAccesses(namespace).Get(context.TODO(), name, metav1.GetOptions{})
+	if err != nil {
+		return err
+	}
+	if sa.Status.UpdateEndpoint(endpoint) {
+		_, err = controller.GetSkupperClient().SkupperV1alpha1().SecuredAccesses(sa.Namespace).UpdateStatus(context.TODO(), sa, metav1.UpdateOptions{})
+		return err
+	}
+	return nil
+}
diff --git a/pkg/kube/grants/redeem_test.go b/pkg/kube/grants/redeem_test.go
new file mode 100644
index 00000000..6eb33c2a
--- /dev/null
+++ b/pkg/kube/grants/redeem_test.go
@@ -0,0 +1,518 @@
+package grants
+
+import (
+	"bytes"
+	"context"
+	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"testing"
+
+	"gotest.tools/assert"
+	meta "k8s.io/apimachinery/pkg/api/meta"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+
+	internalclient "github.com/skupperproject/skupper/internal/kube/client"
+	"github.com/skupperproject/skupper/internal/kube/client/fake"
+	"github.com/skupperproject/skupper/pkg/apis/skupper/v1alpha1"
+)
+
+func Test_postTokenRequest(t *testing.T) {
+	var tests = []struct {
+		name          string
+		token         *v1alpha1.AccessToken
+		site          *v1alpha1.Site
+		code          int
+		body          string
+		err           string
+		expectedError string
+	}{
+		{
+			name:  "simple",
+			token: tf.token("my-token", "x", "http://foo/xyz", "mycode", ""),
+			site:  tf.site("my-site", "x"),
+			code:  200,
+			body:  "OK",
+		},
+		{
+			name:          "not found",
+			token:         tf.token("my-token", "x", "http://foo/xyz", "mycode", ""),
+			site:          tf.site("my-site", "x"),
+			code:          404,
+			body:          "no such grant",
+			expectedError: "404 (Not Found) no such grant",
+		},
+		{
+			name:          "bad url",
+			token:         tf.token("my-token", "x", "foo://a:b", "mycode", ""),
+			site:          tf.site("my-site", "x"),
+			expectedError: "foo://a:b",
+		},
+		{
+			name:          "bad url",
+			token:         tf.token("my-token", "x", "http://foo", "mycode", ""),
+			site:          tf.site("my-site", "x"),
+			err:           "some kind of failure",
+			expectedError: "some kind of failure",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			reader, err := postTokenRequest(tt.token, tt.site, tripper(tt.code, tt.body, tt.err))
+			if tt.expectedError != "" {
+				assert.ErrorContains(t, err, tt.expectedError)
+			} else if err != nil {
+				t.Error(err)
+			} else {
+				body, _ := io.ReadAll(reader)
+				assert.Equal(t, string(body), tt.body)
+			}
+		})
+	}
+}
+
+type TestTripper struct {
+	code int
+	body string
+	err  string
+}
+
+func tripper(code int, body string, err string) http.RoundTripper {
+	return &TestTripper{
+		code: code,
+		body: body,
+		err:  err,
+	}
+}
+
+func (t *TestTripper) RoundTrip(request *http.Request) (*http.Response, error) {
+	if t.err != "" {
+		return nil, errors.New(t.err)
+	}
+	return &http.Response{
+		StatusCode: t.code,
+		Body:       ioutil.NopCloser(bytes.NewBufferString(t.body)),
+		Header:     make(http.Header),
+	}, nil
+}
+
+func Test_handleTokenResponse(t *testing.T) {
+	var tests = []struct {
+		name                 string
+		token                *v1alpha1.AccessToken
+		site                 *v1alpha1.Site
+		body                 *CertToken
+		failReadAt           int
+		expectedStatus       string
+		expectStatusContains string
+		expectedError        string
+		expectedLinks        []string
+		expectedSecret       string
+		extraK8sObjects      []runtime.Object
+		extraSkupperObjects  []runtime.Object
+	}{
+		{
+			name:  "simple",
+			token: tf.token("my-token", "test", "http://foo/xyz", "mycode", ""),
+			site:  tf.site("my-site", "test"),
+			body: &CertToken{
+				tlsCredentials: tf.secret("my-token", "", "My Subject", nil),
+				links: []*v1alpha1.Link{
+					tf.link("my-token", "", []v1alpha1.Endpoint{
+						{
+							Host: "foo",
+							Port: "1234",
+						},
+					}, "my-token"),
+				},
+			},
+			expectedStatus: "OK",
+			expectedLinks:  []string{"my-token"},
+			expectedSecret: "my-token",
+		},
+		{
+			name:           "no data",
+			token:          tf.token("my-token", "test", "http://foo/xyz", "mycode", ""),
+			site:           tf.site("my-site", "test"),
+			expectedStatus: "Could not decode response",
+		},
+		{
+			name:  "failed read",
+			token: tf.token("my-token", "test", "http://foo/xyz", "mycode", ""),
+			site:  tf.site("my-site", "test"),
+			body: &CertToken{
+				tlsCredentials: tf.secret("my-token", "", "My Subject", nil),
+				links: []*v1alpha1.Link{
+					tf.link("my-token", "", []v1alpha1.Endpoint{
+						{
+							Host: "foo",
+							Port: "1234",
+						},
+					}, "my-token"),
+				},
+			},
+			failReadAt:     1025,
+			expectedStatus: "Could not decode response",
+		},
+		{
+			name:  "secret collision",
+			token: tf.token("my-token", "test", "http://foo/xyz", "mycode", ""),
+			site:  tf.site("my-site", "test"),
+			body: &CertToken{
+				tlsCredentials: tf.secret("my-token", "", "My Subject", nil),
+				links: []*v1alpha1.Link{
+					tf.link("my-token", "", []v1alpha1.Endpoint{
+						{
+							Host: "foo",
+							Port: "1234",
+						},
+					}, "my-token"),
+				},
+			},
+			expectedStatus:  "Could not create received secret: secrets \"my-token\" already exists",
+			extraK8sObjects: []runtime.Object{tf.secret("my-token", "test", "Another Subject", nil)},
+		},
+		{
+			name:  "link collision",
+			token: tf.token("my-token", "test", "http://foo/xyz", "mycode", ""),
+			site:  tf.site("my-site", "test"),
+			body: &CertToken{
+				tlsCredentials: tf.secret("my-token", "", "My Subject", nil),
+				links: []*v1alpha1.Link{
+					tf.link("my-token", "", []v1alpha1.Endpoint{
+						{
+							Host: "foo",
+							Port: "1234",
+						},
+					}, "my-token"),
+				},
+			},
+			expectedStatus:      "Could not create received link: links.skupper.io \"my-token\" already exists",
+			extraSkupperObjects: []runtime.Object{tf.link("my-token", "test", nil, "")},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			skupperObjects := []runtime.Object{tt.site, tt.token}
+			if tt.extraSkupperObjects != nil {
+				skupperObjects = append(skupperObjects, tt.extraSkupperObjects...)
+			}
+			client, _ := fake.NewFakeClient("test", tt.extraK8sObjects, skupperObjects, "")
+			var buffer bytes.Buffer
+			if tt.body != nil {
+				tt.body.Write(&buffer)
+			}
+			var reader io.Reader
+			reader = &buffer
+			if tt.failReadAt != 0 {
+				reader = &FailingReader{
+					reader: reader,
+					fail:   tt.failReadAt,
+				}
+			}
+			err := handleTokenResponse(reader, tt.token, tt.site, client)
+			if tt.expectedError != "" {
+				assert.ErrorContains(t, err, tt.expectedError)
+			} else if err != nil {
+				t.Error(err)
+			} else {
+				token, err := client.GetSkupperClient().SkupperV1alpha1().AccessTokens("test").Get(context.TODO(), tt.token.Name, metav1.GetOptions{})
+				if err != nil {
+					t.Error(err)
+				} else {
+					assert.Equal(t, token.Status.StatusMessage, tt.expectedStatus)
+					if tt.expectedSecret != "" {
+						secret, err := client.GetKubeClient().CoreV1().Secrets("test").Get(context.TODO(), tt.expectedSecret, metav1.GetOptions{})
+						if err != nil {
+							t.Error(err)
+						}
+						assert.Assert(t, secret.Data["tls.crt"] != nil)
+					}
+					for _, name := range tt.expectedLinks {
+						link, err := client.GetSkupperClient().SkupperV1alpha1().Links("test").Get(context.TODO(), name, metav1.GetOptions{})
+						if err != nil {
+							t.Error(err)
+						} else {
+							assert.Assert(t, len(link.Spec.Endpoints) > 0)
+						}
+					}
+				}
+			}
+		})
+	}
+}
+
+func Test_RedeemAccessToken(t *testing.T) {
+	var tests = []struct {
+		name           string
+		scheme         string
+		tokenName      string
+		grantUID       string
+		defaultIssuer  string
+		endpoints      []v1alpha1.Endpoint
+		expectedError  string
+		expectedStatus string
+		expectedLinks  []string
+		expectedSecret string
+		expectRedeemed bool
+	}{
+		{
+			name:      "simple",
+			scheme:    "https",
+			tokenName: "my-token",
+			endpoints: []v1alpha1.Endpoint{
+				{
+					Name: "inter-router",
+					Host: "my-link-host",
+					Port: "1111",
+				},
+				{
+					Name: "edge",
+					Host: "my-link-host",
+					Port: "2222",
+				},
+			},
+			expectedStatus: "OK",
+			expectRedeemed: true,
+			expectedLinks:  []string{"my-token"},
+			expectedSecret: "my-token",
+		},
+		{
+			name:      "ha",
+			scheme:    "https",
+			tokenName: "my-token",
+			endpoints: []v1alpha1.Endpoint{
+				{
+					Name:  "inter-router",
+					Host:  "my-link-host-1",
+					Port:  "1111",
+					Group: "one",
+				},
+				{
+					Name:  "edge",
+					Host:  "my-link-host-1",
+					Port:  "2222",
+					Group: "one",
+				},
+				{
+					Name:  "inter-router",
+					Host:  "my-link-host-2",
+					Port:  "1111",
+					Group: "two",
+				},
+				{
+					Name:  "edge",
+					Host:  "my-link-host-2",
+					Port:  "2222",
+					Group: "two",
+				},
+			},
+			expectedStatus: "OK",
+			expectRedeemed: true,
+			expectedLinks:  []string{"my-token-1", "my-token-2"},
+			expectedSecret: "my-token",
+		},
+		{
+			name:      "tls disabled",
+			scheme:    "http",
+			tokenName: "my-token",
+			endpoints: []v1alpha1.Endpoint{
+				{
+					Name: "inter-router",
+					Host: "my-link-host",
+					Port: "1111",
+				},
+				{
+					Name: "edge",
+					Host: "my-link-host",
+					Port: "2222",
+				},
+			},
+			expectedStatus: "OK",
+			expectRedeemed: true,
+			expectedLinks:  []string{"my-token"},
+			expectedSecret: "my-token",
+		},
+		{
+			name:           "not known",
+			scheme:         "https",
+			tokenName:      "my-token",
+			grantUID:       "a40fbe84-f276-4755-bf22-5ba980ab1661",
+			expectedStatus: "404 (Not Found) No such claim",
+			expectRedeemed: false,
+		},
+		{
+			name:           "no resolved endpoints",
+			scheme:         "https",
+			tokenName:      "my-token",
+			expectedStatus: "500 (Internal Server Error) Could not resolve any endpoints for requested link",
+		},
+		{
+			name:           "bad default issuer",
+			scheme:         "https",
+			tokenName:      "my-token",
+			defaultIssuer:  "i-dont-exist",
+			expectedStatus: "500 (Internal Server Error) Could not get issuer for requested certficate",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			client, err := fake.NewFakeClient("test", []runtime.Object{tf.secret("skupper-site-ca", "test", "Test Site CA", nil)}, []runtime.Object{tf.site("my-site", "test"), tf.grant("my-grant", "test", "")}, "")
+			site, err := client.GetSkupperClient().SkupperV1alpha1().Sites("test").Get(context.TODO(), "my-site", metav1.GetOptions{})
+			if err != nil {
+				t.Error(err)
+			}
+			if tt.defaultIssuer != "" {
+				site.Status.DefaultIssuer = tt.defaultIssuer
+			} else {
+				site.Status.DefaultIssuer = "skupper-site-ca"
+			}
+			site.Status.Endpoints = tt.endpoints
+			site, err = client.GetSkupperClient().SkupperV1alpha1().Sites("test").UpdateStatus(context.TODO(), site, metav1.UpdateOptions{})
+			if err != nil {
+				t.Error(err)
+			}
+
+			grants := newGrants(client, generator(site, client), tt.scheme, "")
+			server := newServer(":0", tt.scheme == "https", grants)
+			server.listen()
+			grants.setUrl(fmt.Sprintf("localhost:%d", server.port()))
+			go server.serve()
+			defer server.stop()
+			if tt.scheme == "https" {
+				secret := tf.secret("my-creds", "test", "grant server", []string{"localhost"})
+				err = server.setCertificateFromSecret(secret)
+				if err != nil {
+					t.Error(err)
+				}
+				if grants.setCA(string(secret.Data["ca.crt"])) {
+					grants.recheckCa()
+				}
+			}
+			grant, err := client.GetSkupperClient().SkupperV1alpha1().AccessGrants("test").Get(context.TODO(), "my-grant", metav1.GetOptions{})
+			if err != nil {
+				t.Error(err)
+			}
+			err = grants.checkGrant(grant.Namespace+"/"+grant.Name, grant)
+			if err != nil {
+				t.Error(err)
+			}
+
+			token := tf.token(tt.tokenName, "test", grant.Status.Url, grant.Status.Code, grant.Status.Ca)
+			if tt.grantUID != "" {
+				token.Spec.Url = fmt.Sprintf("%s://localhost:%d/%s", tt.scheme, server.port(), tt.grantUID)
+			}
+			token, err = client.GetSkupperClient().SkupperV1alpha1().AccessTokens("test").Create(context.TODO(), token, metav1.CreateOptions{})
+			if err != nil {
+				t.Error(err)
+			}
+			err = RedeemAccessToken(token, site, client)
+			if tt.expectedError != "" {
+				assert.ErrorContains(t, err, tt.expectedError)
+			} else if err != nil {
+				t.Error(err)
+			} else {
+				// verify the access token status is redeemed
+				token, err = client.GetSkupperClient().SkupperV1alpha1().AccessTokens("test").Get(context.TODO(), tt.tokenName, metav1.GetOptions{})
+				if err != nil {
+					t.Error(err)
+				} else {
+					assert.Equal(t, token.Status.StatusMessage, tt.expectedStatus)
+					if tt.expectRedeemed {
+						assert.Assert(t, meta.IsStatusConditionTrue(token.Status.Conditions, v1alpha1.CONDITION_TYPE_REDEEMED))
+						// verify we have link(s) and secret as expected
+						for _, name := range tt.expectedLinks {
+							link, err := client.GetSkupperClient().SkupperV1alpha1().Links("test").Get(context.TODO(), name, metav1.GetOptions{})
+							if err != nil {
+								t.Error(err)
+							} else {
+								assert.Assert(t, len(link.Spec.Endpoints) > 0)
+							}
+						}
+						secret, err := client.GetKubeClient().CoreV1().Secrets("test").Get(context.TODO(), tt.expectedSecret, metav1.GetOptions{})
+						if err != nil {
+							t.Error(err)
+						}
+						assert.Assert(t, secret.Data["tls.crt"] != nil)
+					}
+				}
+			}
+		})
+	}
+}
+
+type TestTokenGenerator struct {
+	site    *v1alpha1.Site
+	clients internalclient.Clients
+}
+
+func (g *TestTokenGenerator) generate(namespace string, name string, subject string, writer io.Writer) error {
+	generator, err := NewTokenGenerator(g.site, g.clients)
+	if err != nil {
+		return err
+	}
+	token := generator.NewCertToken(name, subject)
+	return token.Write(writer)
+}
+
+func newTestTokenGenerator(site *v1alpha1.Site, clients internalclient.Clients) *TestTokenGenerator {
+	return &TestTokenGenerator{
+		site:    site,
+		clients: clients,
+	}
+}
+
+func generator(site *v1alpha1.Site, clients internalclient.Clients) GrantResponse {
+	return newTestTokenGenerator(site, clients).generate
+}
+
+func Test_updateAccessTokenStatus(t *testing.T) {
+	var tests = []struct {
+		name           string
+		errs           []error
+		expectedStatus string
+	}{
+		{
+			name:           "simple",
+			errs:           []error{nil},
+			expectedStatus: "OK",
+		},
+		{
+			name:           "failure",
+			errs:           []error{errors.New("something bad happened")},
+			expectedStatus: "something bad happened",
+		},
+		{
+			name:           "repeated failure",
+			errs:           []error{errors.New("something bad happened"), errors.New("it happened again"), errors.New("it happened again")},
+			expectedStatus: "it happened again",
+		},
+		{
+			name:           "recovered sequence",
+			errs:           []error{errors.New("something bad happened"), nil, nil},
+			expectedStatus: "OK",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			client, _ := fake.NewFakeClient("test", nil, []runtime.Object{tf.token("my-token", "test", "", "", "")}, "")
+			for _, err := range tt.errs {
+				token, apiError := client.GetSkupperClient().SkupperV1alpha1().AccessTokens("test").Get(context.TODO(), "my-token", metav1.GetOptions{})
+				if apiError != nil {
+					t.Error(apiError)
+				} else {
+					updateAccessTokenStatus(token, err, client)
+				}
+			}
+			token, apiError := client.GetSkupperClient().SkupperV1alpha1().AccessTokens("test").Get(context.TODO(), "my-token", metav1.GetOptions{})
+			if apiError != nil {
+				t.Error(apiError)
+			} else {
+				assert.Equal(t, token.Status.StatusMessage, tt.expectedStatus)
+			}
+		})
+	}
+}
diff --git a/pkg/kube/grants/server_test.go b/pkg/kube/grants/server_test.go
new file mode 100644
index 00000000..5181e011
--- /dev/null
+++ b/pkg/kube/grants/server_test.go
@@ -0,0 +1,82 @@
+package grants
+
+import (
+	"crypto/x509"
+	"fmt"
+	"net/http"
+	"testing"
+
+	"gotest.tools/assert"
+	corev1 "k8s.io/api/core/v1"
+)
+
+func Test_setCertificateFromSecret(t *testing.T) {
+	var tests = []struct {
+		name             string
+		secret           *corev1.Secret
+		expectedError    string
+		expectedSubject  string
+		expectedDNSNames []string
+	}{
+		{
+			name:             "simple",
+			secret:           tf.secret("simple", "", "My Subject", []string{"foo.com", "bar.org"}),
+			expectedSubject:  "My Subject",
+			expectedDNSNames: []string{"foo.com", "bar.org"},
+		},
+		{
+			name:          "non tls secret",
+			secret:        tf.genericSecret("simple", ""),
+			expectedError: "failed to find any PEM data",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			server := newServer(":0", true, &TestHandler{})
+			err := server.setCertificateFromSecret(tt.secret)
+			if tt.expectedError != "" {
+				assert.ErrorContains(t, err, tt.expectedError)
+			} else if err != nil {
+				t.Error(err)
+			} else {
+				cert, _ := server.getCertificate(nil)
+				assert.Assert(t, cert != nil)
+				cert.Leaf, err = x509.ParseCertificate(cert.Certificate[0])
+				if err != nil {
+					t.Error(err)
+				}
+				assert.Equal(t, cert.Leaf.Subject.CommonName, tt.expectedSubject)
+				if tt.expectedDNSNames != nil {
+					assert.DeepEqual(t, cert.Leaf.DNSNames, tt.expectedDNSNames)
+				}
+			}
+		})
+	}
+}
+
+func Test_handlesErrorOnListen(t *testing.T) {
+	server1 := newServer(":0", true, &TestHandler{})
+	err := server1.listen()
+	if err != nil {
+		t.Error(err)
+	}
+	defer server1.stop()
+	server2 := newServer(fmt.Sprintf(":%d", server1.port()), true, &TestHandler{})
+	err = server2.listenAndServe()
+	assert.ErrorContains(t, err, server2.server.Addr)
+}
+
+func Test_handlesServeBeforeListen(t *testing.T) {
+	server := newServer(":0", true, &TestHandler{})
+	err := server.serve()
+	assert.ErrorContains(t, err, "Cannot serve before listen() is called")
+}
+
+func Test_handlesPortBeforeListen(t *testing.T) {
+	server := newServer(":1234", true, &TestHandler{})
+	assert.Equal(t, 0, server.port())
+}
+
+type TestHandler struct{}
+
+func (h *TestHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {}
diff --git a/pkg/kube/grants/tokens_test.go b/pkg/kube/grants/tokens_test.go
new file mode 100644
index 00000000..14db531f
--- /dev/null
+++ b/pkg/kube/grants/tokens_test.go
@@ -0,0 +1,89 @@
+package grants
+
+import (
+	"bytes"
+	"io"
+	"testing"
+
+	"gotest.tools/assert"
+
+	"github.com/skupperproject/skupper/pkg/apis/skupper/v1alpha1"
+)
+
+func Test_CertTokenWrite(t *testing.T) {
+	var tests = []struct {
+		name          string
+		cert          *CertToken
+		failWrite     int
+		expectedError string
+	}{
+		{
+			name: "good",
+			cert: &CertToken{
+				tlsCredentials: tf.secret("my-token", "", "My Subject", nil),
+				links: []*v1alpha1.Link{
+					tf.link("my-token", "", []v1alpha1.Endpoint{
+						{
+							Host: "foo",
+							Port: "1234",
+						},
+					}, "my-token"),
+				},
+			},
+		},
+		{
+			name: "bad",
+			cert: &CertToken{
+				tlsCredentials: tf.secret("my-token", "", "My Subject", nil),
+				links: []*v1alpha1.Link{
+					tf.link("my-token", "", []v1alpha1.Endpoint{
+						{
+							Host: "foo",
+							Port: "1234",
+						},
+					}, "my-token"),
+				},
+			},
+			failWrite:     1,
+			expectedError: "Failed Write",
+		},
+		{
+			name: "later bad",
+			cert: &CertToken{
+				tlsCredentials: tf.secret("my-token", "", "My Subject", nil),
+				links: []*v1alpha1.Link{
+					tf.link("my-token", "", []v1alpha1.Endpoint{
+						{
+							Host: "foo",
+							Port: "1234",
+						},
+					}, "my-token"),
+				},
+			},
+			failWrite:     2,
+			expectedError: "Failed Write",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			var buffer bytes.Buffer
+			var writer io.Writer
+			writer = &buffer
+			if tt.failWrite != 0 {
+				writer = &FailingWriter{
+					writer: writer,
+					fail:   tt.failWrite,
+				}
+			}
+
+			err := tt.cert.Write(writer)
+			if tt.expectedError != "" {
+				assert.ErrorContains(t, err, tt.expectedError)
+			} else if err != nil {
+				t.Error(err)
+			} else {
+
+			}
+		})
+	}
+}
diff --git a/pkg/kube/securedaccess/access_test.go b/pkg/kube/securedaccess/access_test.go
new file mode 100644
index 00000000..1b129588
--- /dev/null
+++ b/pkg/kube/securedaccess/access_test.go
@@ -0,0 +1,766 @@
+package securedaccess
+
+import (
+	"reflect"
+	"testing"
+
+	routev1 "github.com/openshift/api/route/v1"
+	fakeclient "github.com/skupperproject/skupper/internal/kube/client/fake"
+	skupperv1alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v1alpha1"
+	"gotest.tools/assert"
+	corev1 "k8s.io/api/core/v1"
+	networkingv1 "k8s.io/api/networking/v1beta1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/util/intstr"
+)
+
+func TestSecuredAccessManagerEnsure(t *testing.T) {
+	type args struct {
+		namespace   string
+		name        string
+		spec        *skupperv1alpha1.SecuredAccessSpec
+		annotations *map[string]string
+		refs        *[]metav1.OwnerReference
+	}
+
+	testTable := []struct {
+		name                string
+		args                args
+		k8sObjects          []runtime.Object
+		skupperObjects      []runtime.Object
+		skupperErrorMessage string
+	}{
+		{
+			name: "no existing secureAccess",
+			args: args{
+				namespace: "test",
+				name:      "skupper",
+				spec: &skupperv1alpha1.SecuredAccessSpec{
+					AccessType: ACCESS_TYPE_LOADBALANCER,
+					Ports: []skupperv1alpha1.SecuredAccessPort{
+						{
+							Name:       "port1",
+							Port:       8080,
+							TargetPort: 8081,
+							Protocol:   "TCP",
+						},
+					},
+					Certificate: "skupper",
+					Issuer:      "skupper-site-ca",
+				},
+				annotations: &map[string]string{
+					"internal.skupper.io/controlled":   "true",
+					"internal.skupper.io/routeraccess": "name",
+				},
+				refs: &[]metav1.OwnerReference{
+					{
+						Kind:       "SecuredAccess",
+						APIVersion: "skupper.io/v1alpha1",
+						Name:       "ownerRef",
+						UID:        "8a96ffdf-403b-4e4a-83a8-97d3d459adb6",
+					},
+				},
+			},
+		},
+	}
+	for _, tt := range testTable {
+		t.Run(tt.name, func(t *testing.T) {
+			m, err := newSecureAccessManagerMocks("test", tt.k8sObjects, tt.skupperObjects, tt.skupperErrorMessage)
+			assert.Assert(t, err)
+
+			if len(m.definitions) != 0 {
+				t.Errorf("SecuredAccessManager.Ensure() expected no definitons")
+			}
+			if err := m.Ensure(tt.args.namespace, tt.args.name, *tt.args.spec, *tt.args.annotations, *tt.args.refs); err != nil {
+				t.Errorf("SecuredAccessManager.Ensure() error = %v", err)
+			}
+			if m.definitions["test/skupper"].Annotations == nil {
+				t.Errorf("Annotations not as expected")
+			}
+			if m.definitions["test/skupper"].OwnerReferences == nil {
+				t.Errorf("OwnerReferences not as expected")
+			}
+			// issue with same values expect return with no changes
+			if err := m.Ensure(tt.args.namespace, tt.args.name, *tt.args.spec, *tt.args.annotations, *tt.args.refs); err != nil {
+				t.Errorf("SecuredAccessManager.Ensure() issue same, definiton error = %v", err)
+			}
+			// change key expect two definitions
+			if err := m.Ensure(tt.args.namespace, "skupper2", *tt.args.spec, *tt.args.annotations, *tt.args.refs); err != nil {
+				t.Errorf("SecuredAccessManager.Ensure() changing key, error = %v", err)
+			}
+			if len(m.definitions) != 2 {
+				t.Errorf("SecuredAccessManager.Ensure() expected two definitions")
+			}
+			// change existing entry expect two definitions
+			tt.args.spec.Ports[0].Name = "Port2"
+			if err := m.Ensure(tt.args.namespace, tt.args.name, *tt.args.spec, *tt.args.annotations, *tt.args.refs); err != nil {
+				t.Errorf("SecuredAccessManager.Ensure() modifying existing, error = %v", err)
+			}
+			// still two definitons
+			if len(m.definitions) != 2 {
+				t.Errorf("SecuredAccessManager.Ensure() expected two entries")
+			}
+		})
+	}
+}
+
+func TestSecuredAccessManagerChangeDelete(t *testing.T) {
+	type args struct {
+		namespace   string
+		name        string
+		spec        *skupperv1alpha1.SecuredAccessSpec
+		annotations *map[string]string
+		refs        *[]metav1.OwnerReference
+	}
+
+	testTable := []struct {
+		name                string
+		args                args
+		k8sObjects          []runtime.Object
+		skupperObjects      []runtime.Object
+		skupperErrorMessage string
+		current             *skupperv1alpha1.SecuredAccess
+	}{
+		{
+			name: "no existing secureAccess",
+			args: args{
+				namespace: "test",
+				name:      "skupper",
+				spec: &skupperv1alpha1.SecuredAccessSpec{
+					AccessType: ACCESS_TYPE_LOADBALANCER,
+					Ports: []skupperv1alpha1.SecuredAccessPort{
+						{
+							Name:       "port1",
+							Port:       8080,
+							TargetPort: 8081,
+							Protocol:   "TCP",
+						},
+					},
+					Certificate: "skupper",
+					Issuer:      "skupper-site-ca",
+				},
+				annotations: &map[string]string{
+					"internal.skupper.io/controlled":   "true",
+					"internal.skupper.io/routeraccess": "name",
+				},
+				refs: &[]metav1.OwnerReference{
+					{
+						Kind:       "SecuredAccess",
+						APIVersion: "skupper.io/v1alpha1",
+						Name:       "ownerRef",
+						UID:        "8a96ffdf-403b-4e4a-83a8-97d3d459adb6",
+					},
+				},
+			},
+			current: &skupperv1alpha1.SecuredAccess{
+				TypeMeta: metav1.TypeMeta{
+					APIVersion: "skupper.io/v1alpha1",
+					Kind:       "SecuredAccess",
+				},
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "skupper",
+					Namespace: "test",
+					OwnerReferences: []metav1.OwnerReference{
+						{
+							Kind:       "SecuredAccess",
+							APIVersion: "skupper.io/v1alpha1",
+							Name:       "ownerRef",
+							UID:        "8a96ffdf-403b-4e4a-83a8-97d3d459adb6",
+						},
+					},
+					Annotations: map[string]string{
+						"internal.skupper.io/controlled":   "true",
+						"internal.skupper.io/routeraccess": "name",
+					},
+				},
+				Spec: skupperv1alpha1.SecuredAccessSpec{
+					AccessType: ACCESS_TYPE_LOCAL,
+					Ports: []skupperv1alpha1.SecuredAccessPort{
+						{
+							Name:       "port1",
+							Port:       8080,
+							TargetPort: 8081,
+							Protocol:   "TCP",
+						},
+					},
+					Certificate: "skupper",
+					Issuer:      "",
+				},
+			},
+		},
+	}
+
+	for _, tt := range testTable {
+		t.Run(tt.name, func(t *testing.T) {
+			m, err := newSecureAccessManagerMocks("test", tt.k8sObjects, tt.skupperObjects, tt.skupperErrorMessage)
+			assert.Assert(t, err)
+
+			if err := m.Ensure(tt.args.namespace, tt.args.name, *tt.args.spec, *tt.args.annotations, *tt.args.refs); err != nil {
+				t.Errorf("SecuredAccessManager.Ensure() error = %v", err)
+			}
+			// change Access Type
+			if err = m.SecuredAccessChanged("test/skupper", tt.current); err != nil {
+				t.Errorf("SecuredAccessManager.SecuredAccessChanged error = %v", err)
+			}
+			// expect one service and one definition
+			if len(m.definitions) != 1 {
+				t.Errorf("SecuredAccessManager.Ensure() expected one definition")
+			}
+			if len(m.services) != 1 {
+				t.Errorf("SecuredAccessManager.Ensure() expected one service")
+			}
+			// delete secured access
+			if err = m.SecuredAccessDeleted("test/skupper"); err != nil {
+				t.Errorf("SecuredAccessManager.SecuredAccessDeleted() failed delete error= %v", err)
+			}
+			// expect no services or definitions
+			if len(m.definitions) != 0 {
+				t.Errorf("SecuredAccessManager.SecuredAccessDeleted() expected no definition")
+			}
+			if len(m.services) != 0 {
+				t.Errorf("SecuredAccessManager.SecuredAccessDeleted() expected no service")
+			}
+			hosts := getHosts(tt.current)
+			if len(hosts) != 2 {
+				t.Errorf("SecuredAccessManager.getHosts() expected %d", len(hosts))
+			}
+		})
+	}
+}
+
+func TestSecuredAccessManagerCheckService(t *testing.T) {
+	type args struct {
+		namespace   string
+		name        string
+		spec        *skupperv1alpha1.SecuredAccessSpec
+		annotations *map[string]string
+		refs        *[]metav1.OwnerReference
+	}
+
+	testTable := []struct {
+		name                string
+		args                args
+		k8sObjects          []runtime.Object
+		skupperObjects      []runtime.Object
+		skupperErrorMessage string
+		svc                 *corev1.Service
+		expectErr           bool
+	}{
+		{
+			name: "no existing service",
+			args: args{
+				namespace: "test",
+				name:      "skupper",
+				spec: &skupperv1alpha1.SecuredAccessSpec{
+					AccessType: ACCESS_TYPE_LOADBALANCER,
+					Ports: []skupperv1alpha1.SecuredAccessPort{
+						{
+							Name:       "port1",
+							Port:       8080,
+							TargetPort: 8081,
+							Protocol:   "TCP",
+						},
+					},
+					Certificate: "skupper",
+					Issuer:      "skupper-site-ca",
+				},
+				annotations: &map[string]string{
+					"internal.skupper.io/controlled":   "true",
+					"internal.skupper.io/routeraccess": "name",
+				},
+				refs: &[]metav1.OwnerReference{
+					{
+						Kind:       "SecuredAccess",
+						APIVersion: "skupper.io/v1alpha1",
+						Name:       "ownerRef",
+						UID:        "8a96ffdf-403b-4e4a-83a8-97d3d459adb6",
+					},
+				},
+			},
+			expectErr: false,
+		},
+		{
+			name: "existing service",
+			args: args{
+				namespace: "test",
+				name:      "skupper",
+				spec: &skupperv1alpha1.SecuredAccessSpec{
+					AccessType: ACCESS_TYPE_LOADBALANCER,
+					Selector: map[string]string{
+						"skupper.io/component": "router",
+					},
+					Ports: []skupperv1alpha1.SecuredAccessPort{
+						{
+							Name:       "port1",
+							Port:       8080,
+							TargetPort: 8081,
+							Protocol:   "TCP",
+						},
+					},
+					Certificate: "skupper",
+					Issuer:      "skupper-site-ca",
+				},
+				annotations: &map[string]string{
+					"internal.skupper.io/controlled": "true",
+				},
+				refs: &[]metav1.OwnerReference{
+					{
+						Kind:       "SecuredAccess",
+						APIVersion: "skupper.io/v1alpha1",
+						Name:       "ownerRef",
+						UID:        "8a96ffdf-403b-4e4a-83a8-97d3d459adb6",
+					},
+				},
+			},
+			svc: &corev1.Service{
+				TypeMeta: metav1.TypeMeta{
+					APIVersion: "v1",
+					Kind:       "Service",
+				},
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "skupper",
+					Namespace: "test",
+					Labels: map[string]string{
+						"internal.skupper.io/secured-access": "true",
+					},
+					Annotations: map[string]string{
+						"internal.skupper.io/controlled": "true",
+					},
+				},
+				Spec: corev1.ServiceSpec{
+					Selector: map[string]string{
+						"skupper.io/component": "router",
+					},
+					Type: corev1.ServiceTypeLoadBalancer, //ACCESS_TYPE_ROUTE,
+					Ports: []corev1.ServicePort{
+						{
+							Name:       "port1",
+							Port:       8080,
+							TargetPort: intstr.IntOrString{IntVal: int32(8081)},
+							Protocol:   "TCP",
+						},
+					},
+				},
+			},
+			expectErr: false,
+		},
+		{
+			name: "service parameter change",
+			args: args{
+				namespace: "test",
+				name:      "skupper",
+				spec: &skupperv1alpha1.SecuredAccessSpec{
+					AccessType: ACCESS_TYPE_LOADBALANCER,
+					Selector: map[string]string{
+						"skupper.io/component": "router",
+					},
+					Ports: []skupperv1alpha1.SecuredAccessPort{
+						{
+							Name:       "port1",
+							Port:       8080,
+							TargetPort: 8081,
+							Protocol:   "TCP",
+						},
+					},
+					Certificate: "skupper",
+					Issuer:      "skupper-site-ca",
+				},
+				annotations: &map[string]string{
+					"internal.skupper.io/controlled": "true",
+				},
+				refs: &[]metav1.OwnerReference{
+					{
+						Kind:       "SecuredAccess",
+						APIVersion: "skupper.io/v1alpha1",
+						Name:       "ownerRef",
+						UID:        "8a96ffdf-403b-4e4a-83a8-97d3d459adb6",
+					},
+				},
+			},
+			svc: &corev1.Service{
+				TypeMeta: metav1.TypeMeta{
+					APIVersion: "v1",
+					Kind:       "Service",
+				},
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "skupper",
+					Namespace: "test",
+					Labels: map[string]string{
+						"internal.skupper.io/secured-access": "true",
+					},
+					Annotations: map[string]string{
+						"internal.skupper.io/controlled": "true",
+					},
+				},
+				Spec: corev1.ServiceSpec{
+					Selector: map[string]string{
+						"skupper.io/component": "controller",
+					},
+					Type: corev1.ServiceTypeClusterIP,
+					Ports: []corev1.ServicePort{
+						{
+							Name:       "port1",
+							Port:       8880,
+							TargetPort: intstr.IntOrString{IntVal: int32(8881)},
+							Protocol:   "TCP",
+						},
+					},
+				},
+			},
+			expectErr: true,
+		},
+	}
+
+	for _, tt := range testTable {
+		t.Run(tt.name, func(t *testing.T) {
+			m, err := newSecureAccessManagerMocks("test", tt.k8sObjects, tt.skupperObjects, tt.skupperErrorMessage)
+			assert.Assert(t, err)
+
+			if err := m.Ensure(tt.args.namespace, tt.args.name, *tt.args.spec, *tt.args.annotations, *tt.args.refs); err != nil {
+				t.Errorf("SecuredAccessManager.CheckServic() error = %v", err)
+			}
+
+			// check service
+			if err = m.CheckService("test/skupper", tt.svc); err != nil {
+				if tt.expectErr {
+					// expected error since service doesn't exist so create one
+					m.RecoverService(tt.svc)
+				} else {
+					t.Errorf("SecuredAccessManager.CheckService error = %v", err)
+				}
+			}
+			// expect one service and one definition
+			if len(m.definitions) != 1 {
+				t.Errorf("SecuredAccessManager.CheckService() expected one definition")
+			}
+			if len(m.services) != 1 {
+				t.Errorf("SecuredAccessManager.CheckService() expected one service")
+			}
+			// check values were modified
+			if tt.svc != nil {
+				skey := serviceKey(tt.svc)
+				if !reflect.DeepEqual(tt.svc.Spec.Selector, m.services[skey].Spec.Selector) {
+					t.Errorf("SecuredAccessManager.updateSelector() expected selector to be updated")
+				}
+				if tt.svc.Spec.Type != m.services[skey].Spec.Type {
+					t.Errorf("SecuredAccessManager.updateType() expected Type to be updated")
+				}
+			}
+		})
+	}
+}
+
+func TestSecuredAccessManagerRecoverRoute(t *testing.T) {
+	type args struct {
+		route *routev1.Route
+	}
+	testTable := []struct {
+		name                string
+		args                args
+		k8sObjects          []runtime.Object
+		skupperObjects      []runtime.Object
+		skupperErrorMessage string
+	}{
+		{
+			name: "good route",
+			args: args{
+				route: &routev1.Route{
+					TypeMeta: metav1.TypeMeta{
+						APIVersion: "v1",
+						Kind:       "Route",
+					},
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "route",
+						Namespace: "test",
+					},
+					Spec: routev1.RouteSpec{
+						Path: "",
+						Host: "test/host",
+						Port: &routev1.RoutePort{
+							TargetPort: intstr.FromString("8080"),
+						},
+					},
+				},
+			},
+		},
+	}
+
+	for _, tt := range testTable {
+		t.Run(tt.name, func(t *testing.T) {
+			m, err := newSecureAccessManagerMocks("test", tt.k8sObjects, tt.skupperObjects, tt.skupperErrorMessage)
+			assert.Assert(t, err)
+
+			m.RecoverRoute(tt.args.route)
+			if len(m.routes) != 1 {
+				t.Errorf("SecuredAccessManager.RecoverRoute() expect one route")
+			}
+		})
+	}
+}
+
+func TestSecuredAccessManagerRecoverIngress(t *testing.T) {
+	type args struct {
+		ingress *networkingv1.Ingress
+	}
+	testTable := []struct {
+		name                string
+		args                args
+		k8sObjects          []runtime.Object
+		skupperObjects      []runtime.Object
+		skupperErrorMessage string
+	}{
+		{
+			name: "ingress",
+			args: args{
+				ingress: &networkingv1.Ingress{
+					TypeMeta: metav1.TypeMeta{
+						APIVersion: "v1",
+						Kind:       "Ingress",
+					},
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "route1",
+						Namespace: "test",
+					},
+				},
+			},
+		},
+	}
+
+	for _, tt := range testTable {
+		t.Run(tt.name, func(t *testing.T) {
+			m, err := newSecureAccessManagerMocks("test", tt.k8sObjects, tt.skupperObjects, tt.skupperErrorMessage)
+			assert.Assert(t, err)
+
+			m.RecoverIngress(tt.args.ingress)
+			if len(m.ingresses) != 1 {
+				t.Errorf("SecuredAccessManager.RecoverIngress() expect one route")
+			}
+		})
+	}
+}
+
+func TestSecuredAccessManagerCheckRoute(t *testing.T) {
+	type args struct {
+		routeKey string
+		route    *routev1.Route
+	}
+	testTable := []struct {
+		name                string
+		args                args
+		k8sObjects          []runtime.Object
+		skupperObjects      []runtime.Object
+		skupperErrorMessage string
+		accessSpec          *skupperv1alpha1.SecuredAccessSpec
+		expectRoutes        int
+		expectErr           bool
+	}{
+		{
+			name: "no route",
+			args: args{
+				routeKey: "test",
+				route:    nil,
+			},
+			expectRoutes: 0,
+			expectErr:    false,
+		},
+		{
+			name: "maliformed route",
+			args: args{
+				routeKey: "test",
+				route: &routev1.Route{
+					TypeMeta: metav1.TypeMeta{
+						APIVersion: "v1",
+						Kind:       "Route",
+					},
+					ObjectMeta: metav1.ObjectMeta{
+						Name: "route",
+					},
+					Spec: routev1.RouteSpec{
+						Path: "",
+						Host: "1.2.3.4-8080.test.host",
+						Port: &routev1.RoutePort{
+							TargetPort: intstr.FromString("8080"),
+						},
+					},
+				},
+			},
+			expectRoutes: 1,
+			expectErr:    false,
+		},
+		{
+			name: "no ServiceAccess found",
+			args: args{
+				routeKey: "test/1.2.3.4-8080",
+				route: &routev1.Route{
+					TypeMeta: metav1.TypeMeta{
+						APIVersion: "v1",
+						Kind:       "Route",
+					},
+					ObjectMeta: metav1.ObjectMeta{
+						Name: "route",
+					},
+					Spec: routev1.RouteSpec{
+						Port: &routev1.RoutePort{
+							TargetPort: intstr.FromString("8080"),
+						},
+					},
+				},
+			},
+			expectRoutes: 1,
+			expectErr:    true,
+		},
+		{
+			name: "good route",
+			args: args{
+				routeKey: "test/1.2.3.4-8080",
+				route: &routev1.Route{
+					TypeMeta: metav1.TypeMeta{
+						APIVersion: "v1",
+						Kind:       "Route",
+					},
+					ObjectMeta: metav1.ObjectMeta{
+						Name: "1.2.3.4",
+						Labels: map[string]string{
+							"internal.skupper.io/secured-access": "true",
+						},
+						Annotations: map[string]string{
+							"internal.skupper.io/controlled": "true",
+						},
+						OwnerReferences: []metav1.OwnerReference{
+							{
+								Kind:       "SecuredAccess",
+								APIVersion: "skupper.io/v1alpha1",
+								Name:       "ownerRef",
+								UID:        "8a96ffdf-403b-4e4a-83a8-97d3d459adb6",
+							},
+						},
+					},
+					Spec: routev1.RouteSpec{
+						Path: "",
+						Host: "1.2.3.4-8080.test.domain",
+						Port: &routev1.RoutePort{
+							TargetPort: intstr.FromString("8080"),
+						},
+						To: routev1.RouteTargetReference{
+							Kind: "Service",
+							Name: "4.4.4.4",
+						},
+						TLS: &routev1.TLSConfig{
+							Termination:                   routev1.TLSTerminationPassthrough,
+							InsecureEdgeTerminationPolicy: routev1.InsecureEdgeTerminationPolicyNone,
+						},
+					},
+				},
+			},
+			accessSpec: &skupperv1alpha1.SecuredAccessSpec{
+				AccessType: ACCESS_TYPE_ROUTE,
+				Ports: []skupperv1alpha1.SecuredAccessPort{
+					{
+						Name:       "8080",
+						Port:       8080,
+						TargetPort: 8081,
+						Protocol:   "TCP",
+					},
+				},
+				Certificate: "skupper",
+				Issuer:      "skupper-site-ca",
+				Options: map[string]string{
+					"domain": "domain",
+				},
+			},
+			expectRoutes: 2,
+			expectErr:    false,
+		},
+	}
+
+	for _, tt := range testTable {
+		t.Run(tt.name, func(t *testing.T) {
+			m, err := newSecureAccessManagerMocks("test", tt.k8sObjects, tt.skupperObjects, tt.skupperErrorMessage)
+			assert.Assert(t, err)
+
+			if tt.accessSpec != nil {
+				// setup so can test update route
+				if err := m.Ensure("test", "1.2.3.4", *tt.accessSpec, nil, nil); err != nil {
+					t.Errorf("SecuredAccessManager.Ensure() error = %v", err)
+				}
+				// add route
+				if err, _ := m.ensureRoute("test", tt.args.route); err != nil {
+					t.Errorf("SecuredAccessManager.ensureRoute() error = %v", err)
+				}
+				// change parameter in route
+				tt.args.route.Spec.To.Name = "4.4.4.5"
+				if err, _ := m.ensureRoute("test", tt.args.route); err != nil {
+					t.Errorf("SecuredAccessManager.ensureRoute() error = %v", err)
+				}
+			}
+			if err := m.CheckRoute(tt.args.routeKey, tt.args.route); err != nil && !tt.expectErr {
+				t.Errorf("SecuredAccessManager.CheckRoute() error = %v", err)
+			}
+
+			numRoutes := len(m.routes)
+			if numRoutes != tt.expectRoutes {
+				t.Errorf("SecuredAccessManager.CheckRoute() incorrect number of routes installed expected %d found %d",
+					tt.expectRoutes, numRoutes)
+			}
+		})
+	}
+}
+
+func TestSecuredAccessTypes(t *testing.T) {
+	var test struct {
+		k8sObjects          []runtime.Object
+		skupperObjects      []runtime.Object
+		skupperErrorMessage string
+	}
+
+	m, err := newSecureAccessManagerMocks("test", test.k8sObjects, test.skupperObjects, test.skupperErrorMessage)
+	assert.Assert(t, err)
+
+	accessType := DefaultAccessType(m.clients)
+	if accessType != ACCESS_TYPE_ROUTE {
+		t.Errorf("SecuredAccessType.DefaultAccessType() error")
+	}
+
+	envAccessType := GetAccessTypeFromEnv()
+	if envAccessType != "" {
+		t.Errorf("SecuredAccessType.GetAccessTypeFromEnv() error")
+	}
+
+	accessType = getAccessType("", m.clients)
+	if accessType != ACCESS_TYPE_ROUTE {
+		t.Errorf("SecuredAccessType.getAccessType() error")
+	}
+
+	accessType = getAccessType(ACCESS_TYPE_LOADBALANCER, m.clients)
+	if accessType != ACCESS_TYPE_LOADBALANCER {
+		t.Errorf("SecuredAccessType.getAccessType() error")
+	}
+
+	serviceType := serviceType(ACCESS_TYPE_NODEPORT)
+	if serviceType != corev1.ServiceTypeNodePort {
+		t.Errorf("SecuredAccessType.serviceType() error")
+	}
+
+}
+
+// --- helper methods
+func newSecureAccessManagerMocks(namespace string, k8sObjects []runtime.Object, skupperObjects []runtime.Object, fakeSkupperError string) (*SecuredAccessManager, error) {
+
+	client, err := fakeclient.NewFakeClient(namespace, k8sObjects, skupperObjects, fakeSkupperError)
+	if err != nil {
+		return nil, err
+	}
+
+	securedAccessManager := &SecuredAccessManager{
+		clients:     client,
+		definitions: make(map[string]*skupperv1alpha1.SecuredAccess),
+		services:    make(map[string]*corev1.Service),
+		routes:      make(map[string]*routev1.Route),
+		ingresses:   make(map[string]*networkingv1.Ingress),
+		//httpProxies: make(map[string]*unstructured.Unstructured),
+		//certMgr:     certificates.CertificateManager,
+	}
+
+	return securedAccessManager, nil
+}
diff --git a/pkg/kube/securedaccess/loadbalancer_test.go b/pkg/kube/securedaccess/loadbalancer_test.go
new file mode 100644
index 00000000..0130f3ed
--- /dev/null
+++ b/pkg/kube/securedaccess/loadbalancer_test.go
@@ -0,0 +1,112 @@
+package securedaccess
+
+import (
+	"testing"
+
+	fakeclient "github.com/skupperproject/skupper/internal/kube/client/fake"
+	skupperv1alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v1alpha1"
+	"gotest.tools/assert"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+)
+
+func TestLoadbalancerAccessTypeResolve(t *testing.T) {
+	type args struct {
+		access *skupperv1alpha1.SecuredAccess
+	}
+	tests := []struct {
+		name                string
+		args                args
+		svc                 *corev1.Service
+		want                bool
+		k8sObjects          []runtime.Object
+		skupperObjects      []runtime.Object
+		skupperErrorMessage string
+	}{
+		{
+			name: "no service",
+			args: args{
+				access: &skupperv1alpha1.SecuredAccess{
+					TypeMeta: metav1.TypeMeta{
+						APIVersion: "v1",
+						Kind:       "Service",
+					},
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "skupper",
+						Namespace: "test",
+					},
+				},
+			},
+			want: false,
+		},
+		{
+			name: "no endpoints",
+			args: args{
+				access: &skupperv1alpha1.SecuredAccess{
+					TypeMeta: metav1.TypeMeta{
+						APIVersion: "v1",
+						Kind:       "Service",
+					},
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "skupper",
+						Namespace: "test",
+					},
+					Spec: skupperv1alpha1.SecuredAccessSpec{
+						AccessType: ACCESS_TYPE_LOADBALANCER,
+						Selector: map[string]string{
+							"skupper.io/component": "router",
+						},
+						Ports: []skupperv1alpha1.SecuredAccessPort{
+							{
+								Name:       "8080",
+								Port:       8080,
+								TargetPort: 8081,
+								Protocol:   "TCP",
+							},
+						},
+					},
+				},
+			},
+			want: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			m, err := newLoadBalanceSecureAccessManagerMocks("test", tt.k8sObjects, tt.skupperObjects, tt.skupperErrorMessage)
+			assert.Assert(t, err)
+			o := &LoadbalancerAccessType{manager: m}
+
+			if tt.name != "no service" {
+				if err = m.createService(tt.args.access); err != nil {
+					t.Errorf("LoadbalancerAccessType.Resolve() failed to create service %s", err)
+				}
+			}
+			if got := o.Resolve(tt.args.access); got != tt.want {
+				t.Errorf("LoadbalancerAccessType.Resolve() = %v, want %v", got, tt.want)
+			}
+
+			if result := o.Realise(tt.args.access); result != true ||
+				tt.args.access.Status.StatusMessage != skupperv1alpha1.STATUS_OK {
+				t.Errorf("LoadbalancerAccessType.Realise(), error setting status")
+			}
+		})
+	}
+}
+
+// --- helper methods
+func newLoadBalanceSecureAccessManagerMocks(namespace string, k8sObjects []runtime.Object, skupperObjects []runtime.Object, fakeSkupperError string) (*SecuredAccessManager, error) {
+
+	client, err := fakeclient.NewFakeClient(namespace, k8sObjects, skupperObjects, fakeSkupperError)
+	if err != nil {
+		return nil, err
+	}
+
+	securedAccessManager := &SecuredAccessManager{
+		clients:  client,
+		services: make(map[string]*corev1.Service),
+	}
+
+	return securedAccessManager, nil
+}
diff --git a/pkg/kube/securedaccess/route_test.go b/pkg/kube/securedaccess/route_test.go
new file mode 100644
index 00000000..0caa7ac1
--- /dev/null
+++ b/pkg/kube/securedaccess/route_test.go
@@ -0,0 +1,290 @@
+package securedaccess
+
+import (
+	"testing"
+
+	routev1 "github.com/openshift/api/route/v1"
+	fakeclient "github.com/skupperproject/skupper/internal/kube/client/fake"
+	skupperv1alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v1alpha1"
+	"gotest.tools/assert"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/util/intstr"
+)
+
+func TestRouteAccessTypeRealise(t *testing.T) {
+	type args struct {
+		access *skupperv1alpha1.SecuredAccess
+	}
+	tests := []struct {
+		name                string
+		args                args
+		route               *routev1.Route
+		want                bool
+		k8sObjects          []runtime.Object
+		skupperObjects      []runtime.Object
+		skupperErrorMessage string
+		numRoutes           int
+	}{
+		{
+			name: "existing route",
+			args: args{
+				access: &skupperv1alpha1.SecuredAccess{
+					TypeMeta: metav1.TypeMeta{
+						APIVersion: "v1",
+						Kind:       "Route",
+					},
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "1.2.3.4",
+						Namespace: "test",
+					},
+					Spec: skupperv1alpha1.SecuredAccessSpec{
+						AccessType: ACCESS_TYPE_ROUTE,
+						Selector: map[string]string{
+							"skupper.io/component": "router",
+						},
+						Ports: []skupperv1alpha1.SecuredAccessPort{
+							{
+								Name:       "8080",
+								Port:       8080,
+								TargetPort: 8081,
+								Protocol:   "TCP",
+							},
+						},
+					},
+				},
+			},
+			route: &routev1.Route{
+				TypeMeta: metav1.TypeMeta{
+					APIVersion: "v1",
+					Kind:       "Route",
+				},
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "1.2.3.4-8080",
+				},
+				Spec: routev1.RouteSpec{
+					Port: &routev1.RoutePort{
+						TargetPort: intstr.FromString("8080"),
+					},
+				},
+			},
+			numRoutes: 1,
+			want:      false,
+		},
+		{
+			name: "new route",
+			args: args{
+				access: &skupperv1alpha1.SecuredAccess{
+					TypeMeta: metav1.TypeMeta{
+						APIVersion: "v1",
+						Kind:       "Route",
+					},
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "1.2.3.4",
+						Namespace: "test",
+					},
+					Spec: skupperv1alpha1.SecuredAccessSpec{
+						AccessType: ACCESS_TYPE_ROUTE,
+						Selector: map[string]string{
+							"skupper.io/component": "router",
+						},
+						Ports: []skupperv1alpha1.SecuredAccessPort{
+							{
+								Name:       "8080",
+								Port:       8080,
+								TargetPort: 8081,
+								Protocol:   "TCP",
+							},
+						},
+					},
+				},
+			},
+			route: &routev1.Route{
+				TypeMeta: metav1.TypeMeta{
+					APIVersion: "v1",
+					Kind:       "Route",
+				},
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "1.2.3.4-9999",
+				},
+				Spec: routev1.RouteSpec{
+					Port: &routev1.RoutePort{
+						TargetPort: intstr.FromString("9999"),
+					},
+				},
+			},
+			want:      false,
+			numRoutes: 2,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			m, err := newRouteSecureAccessManagerMocks("test", tt.k8sObjects, tt.skupperObjects, tt.skupperErrorMessage)
+			assert.Assert(t, err)
+			o := &RouteAccessType{manager: m}
+
+			// add route
+			if err, _ := o.manager.ensureRoute("test", tt.route); err != nil {
+				t.Errorf("SecuredAccessManager.ensureRoute() error = %v", err)
+			}
+			if got := o.Realise(tt.args.access); got != tt.want {
+				t.Errorf("RouteAccessType.Realise() = %v, want %v", got, tt.want)
+			}
+			numRoutes := len(m.routes)
+			if numRoutes != tt.numRoutes {
+				t.Errorf("RouteAccessType incorrect number of routes installed expected %d found %d",
+					tt.numRoutes, numRoutes)
+			}
+		})
+	}
+}
+
+func TestRouteAccessTypeResolve(t *testing.T) {
+	type args struct {
+		access *skupperv1alpha1.SecuredAccess
+	}
+	tests := []struct {
+		name                string
+		args                args
+		route               *routev1.Route
+		want                bool
+		k8sObjects          []runtime.Object
+		skupperObjects      []runtime.Object
+		skupperErrorMessage string
+		numRoutes           int
+	}{
+		{
+			name: "no route",
+			args: args{
+				access: &skupperv1alpha1.SecuredAccess{
+					TypeMeta: metav1.TypeMeta{
+						APIVersion: "v1",
+						Kind:       "Route",
+					},
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "1.2.3.4",
+						Namespace: "test",
+					},
+					Spec: skupperv1alpha1.SecuredAccessSpec{
+						AccessType: ACCESS_TYPE_LOADBALANCER,
+						Selector: map[string]string{
+							"skupper.io/component": "router",
+						},
+						Ports: []skupperv1alpha1.SecuredAccessPort{
+							{
+								Name:       "8080",
+								Port:       8080,
+								TargetPort: 8081,
+								Protocol:   "TCP",
+							},
+						},
+						Certificate: "skupper",
+						Issuer:      "skupper-site-ca",
+					},
+				},
+			},
+			numRoutes: 0,
+			want:      false,
+		},
+		{
+			name: "one route",
+			args: args{
+				access: &skupperv1alpha1.SecuredAccess{
+					TypeMeta: metav1.TypeMeta{
+						APIVersion: "v1",
+						Kind:       "Route",
+					},
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "1.2.3.4",
+						Namespace: "test",
+					},
+					Spec: skupperv1alpha1.SecuredAccessSpec{
+						AccessType: ACCESS_TYPE_LOADBALANCER,
+						Selector: map[string]string{
+							"skupper.io/component": "router",
+						},
+						Ports: []skupperv1alpha1.SecuredAccessPort{
+							{
+								Name:       "8080",
+								Port:       8080,
+								TargetPort: 8081,
+								Protocol:   "TCP",
+							},
+						},
+						Certificate: "skupper",
+						Issuer:      "skupper-site-ca",
+					},
+				},
+			},
+			route: &routev1.Route{
+				TypeMeta: metav1.TypeMeta{
+					APIVersion: "v1",
+					Kind:       "Route",
+				},
+				ObjectMeta: metav1.ObjectMeta{
+					Name: "1.2.3.4-8080",
+				},
+				Spec: routev1.RouteSpec{
+					Host: "1.2.3.4-8080.test.host",
+					Port: &routev1.RoutePort{
+						TargetPort: intstr.FromString("9999"),
+					},
+				},
+			},
+			want:      true,
+			numRoutes: 1,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			m, err := newRouteSecureAccessManagerMocks("test", tt.k8sObjects, tt.skupperObjects, tt.skupperErrorMessage)
+			assert.Assert(t, err)
+			o := &RouteAccessType{manager: m}
+
+			if tt.want == true {
+				// add route
+				if err, _ := o.manager.ensureRoute("test", tt.route); err != nil {
+					t.Errorf("SecuredAccessManager.ensureRoute() error = %v", err)
+				}
+			}
+			if got := o.Resolve(tt.args.access); got != tt.want {
+				t.Errorf("RouteAccessType.Realise() = %v, want %v", got, tt.want)
+			}
+			numRoutes := len(m.routes)
+			if numRoutes != tt.numRoutes {
+				t.Errorf("RouteAccessType.Realise() incorrect number of routes installed expected %d found %d",
+					tt.numRoutes, numRoutes)
+			}
+			// check endpoints
+			if tt.want == true {
+				if len(tt.args.access.Status.Endpoints) != 1 &&
+					tt.args.access.Status.Endpoints[0].Host != "1.2.3.4-8080.test.host" {
+					t.Errorf("RouteAccessType.Realise() failure initializing endpoints")
+				}
+			} else {
+				if len(tt.args.access.Status.Endpoints) != 0 {
+					t.Errorf("RouteAccessType.Realise() unexpected endpoints")
+				}
+			}
+		})
+	}
+}
+
+// --- helper methods
+
+func newRouteSecureAccessManagerMocks(namespace string, k8sObjects []runtime.Object, skupperObjects []runtime.Object, fakeSkupperError string) (*SecuredAccessManager, error) {
+
+	client, err := fakeclient.NewFakeClient(namespace, k8sObjects, skupperObjects, fakeSkupperError)
+	if err != nil {
+		return nil, err
+	}
+
+	securedAccessManager := &SecuredAccessManager{
+		clients: client,
+		routes:  make(map[string]*routev1.Route),
+	}
+
+	return securedAccessManager, nil
+}
diff --git a/pkg/kube/site/site_test.go b/pkg/kube/site/site_test.go
new file mode 100644
index 00000000..72ceab3d
--- /dev/null
+++ b/pkg/kube/site/site_test.go
@@ -0,0 +1,1076 @@
+package site
+
+import (
+	"context"
+	"testing"
+
+	fakeclient "github.com/skupperproject/skupper/internal/kube/client/fake"
+	"github.com/skupperproject/skupper/pkg/apis/skupper/v1alpha1"
+	skupperv1alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v1alpha1"
+	"github.com/skupperproject/skupper/pkg/kube"
+	"github.com/skupperproject/skupper/pkg/kube/certificates"
+	"github.com/skupperproject/skupper/pkg/kube/securedaccess"
+	"github.com/skupperproject/skupper/pkg/qdr"
+	site1 "github.com/skupperproject/skupper/pkg/site"
+	"github.com/skupperproject/skupper/pkg/version"
+	"gotest.tools/assert"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+)
+
+func TestSite_Recover(t *testing.T) {
+	type args struct {
+		site *skupperv1alpha1.Site
+	}
+	tests := []struct {
+		name                string
+		args                args
+		wantErr             bool
+		k8sObjects          []runtime.Object
+		skupperObjects      []runtime.Object
+		skupperErrorMessage string
+	}{
+		{
+			name: "site inactive",
+			args: args{
+				site: &skupperv1alpha1.Site{
+					ObjectMeta: v1.ObjectMeta{
+						Name:      "siteInactive",
+						Namespace: "test",
+						UID:       "8a96ffdf-403b-4e4a-83a8-97d3d459adb6",
+					},
+				},
+			},
+			skupperErrorMessage: "NotFound",
+			wantErr:             true,
+		},
+		{
+			name: "site fail CA",
+			args: args{
+				site: &skupperv1alpha1.Site{
+					ObjectMeta: v1.ObjectMeta{
+						Name:      "site1",
+						Namespace: "test",
+						UID:       "8a96ffdf-403b-4e4a-83a8-97d3d459adb6",
+					},
+					Spec: skupperv1alpha1.SiteSpec{
+						DefaultIssuer: "skupper-spec-issuer-ca",
+						LinkAccess:    "loadbalancer",
+					},
+					Status: skupperv1alpha1.SiteStatus{
+						DefaultIssuer: "skupper-status-issuer-ca",
+					},
+				},
+			},
+			skupperObjects: []runtime.Object{
+				&skupperv1alpha1.RouterAccess{
+					ObjectMeta: v1.ObjectMeta{
+						Name:      "Router1",
+						Namespace: "test",
+					},
+				},
+			},
+			skupperErrorMessage: "NotFound",
+			wantErr:             true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			s, err := newSiteMocks("test", tt.k8sObjects, tt.skupperObjects, tt.skupperErrorMessage, false)
+			assert.Assert(t, err)
+
+			if err := s.Recover(tt.args.site); (err != nil) != tt.wantErr {
+				t.Errorf("Site.Reconcile() error = %v", err)
+			}
+		})
+	}
+}
+
+func TestSite_checkDefaultRouterAccess(t *testing.T) {
+	type args struct {
+		site *skupperv1alpha1.Site
+	}
+	tests := []struct {
+		name                string
+		args                args
+		rtr                 *skupperv1alpha1.RouterAccess
+		wantErr             bool
+		wantLinkAccess      int
+		k8sObjects          []runtime.Object
+		skupperObjects      []runtime.Object
+		skupperErrorMessage string
+	}{
+		{
+			name: "no link access config",
+			args: args{
+				site: &skupperv1alpha1.Site{
+					ObjectMeta: v1.ObjectMeta{
+						Name:      "site1",
+						Namespace: "test",
+					},
+				},
+			},
+			wantErr:        false,
+			wantLinkAccess: 0,
+		},
+		{
+			name: "default router config",
+			args: args{
+				site: &skupperv1alpha1.Site{
+					ObjectMeta: v1.ObjectMeta{
+						Name:      "site1",
+						Namespace: "test",
+					},
+					Spec: skupperv1alpha1.SiteSpec{
+						LinkAccess: "loadbalancer",
+					},
+				},
+			},
+			wantErr:        false,
+			wantLinkAccess: 1,
+		},
+		{
+			name: "default router config exists",
+			args: args{
+				site: &skupperv1alpha1.Site{
+					ObjectMeta: v1.ObjectMeta{
+						Name:      "site1",
+						Namespace: "test",
+					},
+					Spec: skupperv1alpha1.SiteSpec{
+						LinkAccess: "loadbalancer",
+					},
+				},
+			},
+			rtr: &skupperv1alpha1.RouterAccess{
+				TypeMeta: metav1.TypeMeta{
+					APIVersion: "skupper.io/v1alpha1",
+					Kind:       "RouterAccess",
+				},
+				ObjectMeta: v1.ObjectMeta{
+					Name:      "skupper-router",
+					Namespace: "test",
+				},
+				Spec: skupperv1alpha1.RouterAccessSpec{
+					AccessType: "nodeport",
+				},
+			},
+			skupperObjects: []runtime.Object{
+				&skupperv1alpha1.RouterAccess{
+					ObjectMeta: v1.ObjectMeta{
+						Name:      "skupper-router",
+						Namespace: "test",
+					},
+				},
+			},
+			wantErr:        false,
+			wantLinkAccess: 1,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			s, err := newSiteMocks("test", tt.k8sObjects, tt.skupperObjects, tt.skupperErrorMessage, false)
+			assert.Assert(t, err)
+
+			if tt.rtr != nil {
+				// test case when there is already a router linkAccess defined
+				s.linkAccess["skupper-router"] = tt.rtr
+			}
+
+			if err = s.checkDefaultRouterAccess(context.TODO(), tt.args.site); (err != nil) != tt.wantErr {
+				t.Errorf("Site.checkDefaultRouterAccess() error = %v, wantErr %v", err, tt.wantErr)
+			}
+
+			numLinkAccess := len(s.linkAccess)
+			if tt.wantLinkAccess != numLinkAccess {
+				t.Errorf("Site.checkDefaultRouterAccess() expected link access not found expected %d, found %d", tt.wantLinkAccess, numLinkAccess)
+			} else if tt.wantLinkAccess != 0 {
+				if s.linkAccess["skupper-router"].Spec.Issuer != "skupper-site-ca" {
+					t.Errorf("Site.checkDefaultRouterAccess() incorrect default values found")
+				}
+			}
+		})
+	}
+}
+
+func TestSite_ExposeUnexpose(t *testing.T) {
+	type args struct {
+		exposed  *ExposedPortSet
+		exposed2 *ExposedPortSet
+	}
+	tests := []struct {
+		name                string
+		args                args
+		wantErr             bool
+		k8sObjects          []runtime.Object
+		skupperObjects      []runtime.Object
+		skupperErrorMessage string
+	}{
+		{
+			name: "no existing exposed ports",
+			args: args{
+				exposed: &ExposedPortSet{
+					Host: "backend",
+					Ports: map[string]Port{
+						"port1": {
+							Name:       "port1",
+							Port:       1234,
+							TargetPort: 7890,
+							Protocol:   "TCP",
+						},
+					},
+				},
+				exposed2: &ExposedPortSet{
+					Host: "backend",
+					Ports: map[string]Port{
+						"port1": {
+							Name:       "port1",
+							Port:       2222,
+							TargetPort: 7890,
+							Protocol:   "TCP",
+						},
+					},
+				},
+			},
+			k8sObjects: []runtime.Object{
+				&corev1.Service{
+					TypeMeta: metav1.TypeMeta{
+						APIVersion: "v1",
+						Kind:       "Service",
+					},
+					ObjectMeta: metav1.ObjectMeta{
+						Name: "backend",
+					},
+					Status: corev1.ServiceStatus{
+						Conditions: []v1.Condition{
+							{
+								Type:   "Configured",
+								Status: "True",
+							},
+						},
+					},
+				},
+			},
+			wantErr: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			s, err := newSiteMocks("test", tt.k8sObjects, tt.skupperObjects, tt.skupperErrorMessage, false)
+			assert.Assert(t, err)
+
+			s.Expose(tt.args.exposed)
+
+			// modify ports exposed
+			s.Expose(tt.args.exposed2)
+
+			s.Unexpose(tt.args.exposed.Host)
+
+			//TBD errors are not returned and nothing stored in Site
+			//if (err != nil) != tt.wantErr {
+			//	t.Errorf("Site.ExposeUnexpose() error = %v, wantErr %v", err, tt.wantErr)
+			//}
+		})
+	}
+}
+func TestSite_CheckListener(t *testing.T) {
+	type args struct {
+		name     string
+		listener *skupperv1alpha1.Listener
+	}
+	tests := []struct {
+		name                string
+		args                args
+		wantErr             bool
+		want                string
+		wantListeners       uint
+		k8sObjects          []runtime.Object
+		skupperObjects      []runtime.Object
+		skupperErrorMessage string
+	}{
+		{
+			name: "no site",
+			want: "not initialized",
+			// code just silently ignores this failure
+			wantErr:       false,
+			wantListeners: 0,
+		},
+		{
+			name: "one listener added",
+			args: args{
+				name: "listener1",
+				listener: &skupperv1alpha1.Listener{
+					ObjectMeta: v1.ObjectMeta{
+						Name:      "listener1",
+						Namespace: "test",
+						UID:       "8a96ffdf-403b-4e4a-83a8-97d3d459adb6",
+					},
+					Spec: skupperv1alpha1.ListenerSpec{
+						RoutingKey: "backend",
+						Port:       8080,
+						Type:       "tcp",
+						Host:       "1.2.3.4",
+					},
+				},
+			},
+			skupperObjects: []runtime.Object{
+				&skupperv1alpha1.Listener{
+					ObjectMeta: v1.ObjectMeta{
+						Name:      "listener1",
+						Namespace: "test",
+					},
+				},
+			},
+			want:          "initialized",
+			wantErr:       false,
+			wantListeners: 1,
+		},
+		/* TBD updateListenerStatus if kube command err == nil it just
+		   returns and doesn't update s.bindings.UpdateListener ???
+			{
+				name: "listener error",
+				args: args{
+					name: "listener1",
+					listener: &skupperv1alpha1.Listener{
+						ObjectMeta: v1.ObjectMeta{
+							Name:      "listener1",
+							Namespace: "test",
+							UID:       "8a96ffdf-403b-4e4a-83a8-97d3d459adb6",
+						},
+						Spec: skupperv1alpha1.ListenerSpec{
+							RoutingKey: "backend",
+							Port:       8080,
+							Type:       "tcp",
+							Host:       "1.2.3.4",
+						},
+					},
+				},
+				want:                "initialized",
+				wantErr:             false,
+				wantListeners:       1,
+				skupperErrorMessage: "NotFound",
+			},
+		*/
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			s, err := newSiteMocks("test", tt.k8sObjects, tt.skupperObjects, tt.skupperErrorMessage, false)
+			assert.Assert(t, err)
+
+			if tt.want == "initialized" {
+				s.initialised = true
+				err = createRouterConfigMock(s)
+				assert.Assert(t, err)
+			}
+
+			if err := s.CheckListener(tt.args.name, tt.args.listener); (err != nil) != tt.wantErr {
+				t.Errorf("Site.CheckListener() error = %v", err)
+			}
+
+			// check if listener is expected and has correct values
+			listener := s.bindings.bindings.GetListener(tt.args.name)
+			if tt.wantListeners != 0 {
+				listenerConfigured := false
+				if listener == nil {
+					t.Errorf("Site.CheckListener() expected listener doesn't exist")
+				} else {
+					if listener.Spec.Port != tt.args.listener.Spec.Port {
+						t.Errorf("Site.CheckListener() expected listener doesn't have correct values")
+					}
+					for _, condition := range listener.Status.Conditions {
+						if condition.Type == "Configured" && condition.Reason == "OK" {
+							listenerConfigured = true
+						}
+					}
+					if listenerConfigured == false {
+						t.Errorf("Site.CheckListener() link not in expected configured state")
+					}
+				}
+			} else if listener != nil {
+				t.Errorf("Site.CheckListener() unexpected listener exists")
+			}
+		})
+	}
+}
+
+func TestSite_CheckConnector(t *testing.T) {
+	type args struct {
+		name      string
+		connector *skupperv1alpha1.Connector
+	}
+	tests := []struct {
+		name                string
+		args                args
+		wantErr             bool
+		want                string
+		wantConnectors      uint
+		k8sObjects          []runtime.Object
+		skupperObjects      []runtime.Object
+		skupperErrorMessage string
+	}{
+		{
+			name: "no connector",
+			// code just silently ignores this failure
+			wantErr:        false,
+			wantConnectors: 0,
+		},
+		{
+			name: "one connector added",
+			args: args{
+				name: "connector1",
+				connector: &skupperv1alpha1.Connector{
+					ObjectMeta: v1.ObjectMeta{
+						Name:      "connector1",
+						Namespace: "test",
+						UID:       "8a96ffdf-403b-4e4a-83a8-97d3d459adb6",
+					},
+					Spec: skupperv1alpha1.ConnectorSpec{
+						RoutingKey: "backend",
+						Port:       8080,
+						Type:       "tcp",
+						Host:       "1.2.3.4",
+					},
+				},
+			},
+			skupperObjects: []runtime.Object{
+				&skupperv1alpha1.Connector{
+					ObjectMeta: v1.ObjectMeta{
+						Name:      "connector1",
+						Namespace: "test",
+					},
+				},
+			},
+			want:           "initialized",
+			wantErr:        false,
+			wantConnectors: 1,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			s, err := newSiteMocks("test", tt.k8sObjects, tt.skupperObjects, tt.skupperErrorMessage, false)
+			assert.Assert(t, err)
+
+			if tt.want == "initialized" {
+				s.initialised = true
+				err = createRouterConfigMock(s)
+				assert.Assert(t, err)
+			}
+
+			if err := s.CheckConnector(tt.args.name, tt.args.connector); (err != nil) != tt.wantErr {
+				t.Errorf("Site.Checkconnector() error = %v", err)
+			}
+
+			// check if connector is expected and has correct values
+			connector := s.bindings.bindings.GetConnector(tt.args.name)
+			if tt.wantConnectors != 0 {
+				connectorConfigured := false
+				if connector == nil {
+					t.Errorf("Site.Checkconnector() expected connector doesn't exist")
+				} else {
+					if connector.Spec.Port != tt.args.connector.Spec.Port {
+						t.Errorf("Site.Checkconnector() expected connector doesn't have correct values")
+					}
+					for _, condition := range connector.Status.Conditions {
+						if condition.Type == "Configured" && condition.Reason == "OK" {
+							connectorConfigured = true
+						}
+					}
+					if connectorConfigured == false {
+						t.Errorf("Site.CheckConnector() link not in expected configured state")
+					}
+				}
+			} else if connector != nil {
+				t.Errorf("Site.Checkconnector() unexpected connector exists")
+			}
+		})
+	}
+}
+
+func TestSite_CheckLink(t *testing.T) {
+	type args struct {
+		name       string
+		linkconfig *skupperv1alpha1.Link
+	}
+	tests := []struct {
+		name                string
+		args                args
+		wantErr             bool
+		want                string
+		wantLinks           int
+		k8sObjects          []runtime.Object
+		skupperObjects      []runtime.Object
+		skupperErrorMessage string
+	}{
+		{
+			name: "no link",
+			args: args{
+				name: "link1",
+			},
+			wantErr:   false,
+			wantLinks: 0,
+		},
+		{
+			name: "link - site not initialized",
+			args: args{
+				name: "link1",
+				linkconfig: &skupperv1alpha1.Link{
+					ObjectMeta: v1.ObjectMeta{
+						Name:      "link1",
+						Namespace: "test",
+						UID:       "8a96ffdf-403b-4e4a-83a8-97d3d459adb6",
+					},
+					Spec: skupperv1alpha1.LinkSpec{
+						Cost: 1,
+						Endpoints: []skupperv1alpha1.Endpoint{
+							{
+								Name: string(qdr.RoleInterRouter),
+								Host: "10.10.10.1",
+								Port: "55671",
+							},
+						},
+					},
+				},
+			},
+			wantErr:   false,
+			wantLinks: 1,
+		},
+		{
+			name: "link - not found",
+			args: args{
+				name: "link1",
+				linkconfig: &skupperv1alpha1.Link{
+					ObjectMeta: v1.ObjectMeta{
+						Name:      "link1",
+						Namespace: "test",
+						UID:       "8a96ffdf-403b-4e4a-83a8-97d3d459adb6",
+					},
+					Spec: skupperv1alpha1.LinkSpec{
+						Cost: 1,
+						Endpoints: []skupperv1alpha1.Endpoint{
+							{
+								Name: string(qdr.RoleInterRouter),
+								Host: "10.10.10.1",
+								Port: "55671",
+							},
+						},
+					},
+				},
+			},
+			want:                "initialized",
+			wantErr:             true,
+			wantLinks:           1,
+			skupperErrorMessage: "NotFound",
+		},
+		{
+			name: "link - ok",
+			args: args{
+				name: "link1",
+				linkconfig: &skupperv1alpha1.Link{
+					ObjectMeta: v1.ObjectMeta{
+						Name:      "link1",
+						Namespace: "test",
+						UID:       "8a96ffdf-403b-4e4a-83a8-97d3d459adb6",
+					},
+					Spec: skupperv1alpha1.LinkSpec{
+						Cost: 2,
+						Endpoints: []skupperv1alpha1.Endpoint{
+							{
+								Name: string(qdr.RoleInterRouter),
+								Host: "1.1.1.1",
+								Port: "55671",
+							},
+						},
+					},
+				},
+			},
+			skupperObjects: []runtime.Object{
+				&skupperv1alpha1.Link{
+					ObjectMeta: v1.ObjectMeta{
+						Name:      "link1",
+						Namespace: "test",
+					},
+				},
+			},
+			want:      "initialized",
+			wantErr:   false,
+			wantLinks: 1,
+		},
+		{
+			name: "link - error",
+			args: args{
+				name: "link1",
+				linkconfig: &skupperv1alpha1.Link{
+					ObjectMeta: v1.ObjectMeta{
+						Name:      "link1",
+						Namespace: "test",
+						UID:       "8a96ffdf-403b-4e4a-83a8-97d3d459adb6",
+					},
+					Spec: skupperv1alpha1.LinkSpec{
+						Cost: 2,
+						Endpoints: []skupperv1alpha1.Endpoint{
+							{
+								Name: string(qdr.RoleInterRouter),
+								Host: "1.1.1.1",
+								Port: "55671",
+							},
+						},
+					},
+				},
+			},
+			want:                "initialized",
+			wantErr:             true,
+			wantLinks:           1,
+			skupperErrorMessage: "NotFound",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			s, err := newSiteMocks("test", tt.k8sObjects, tt.skupperObjects, tt.skupperErrorMessage, false)
+			assert.Assert(t, err)
+
+			if tt.want == "initialized" {
+				s.initialised = true
+				err = createRouterConfigMock(s)
+				assert.Assert(t, err)
+			}
+
+			if err := s.CheckLink(tt.args.name, tt.args.linkconfig); (err != nil) != tt.wantErr {
+				t.Errorf("Site.CheckLink() error = %v, wantErr %v", err, tt.skupperErrorMessage)
+			}
+
+			if tt.want == "initialized" {
+				linkConfigured := false
+				if len(s.links) != tt.wantLinks {
+					t.Errorf("Site.CheckLink() link not added")
+				}
+				link := s.links[tt.args.name].Definition()
+				if link.Spec.Cost != tt.args.linkconfig.Spec.Cost {
+					t.Errorf("Site.CheckLink() link not configured correctly")
+				}
+
+				for _, condition := range link.Status.Conditions {
+					if condition.Type == "Configured" && condition.Reason == "OK" {
+						linkConfigured = true
+					}
+				}
+				if linkConfigured == false {
+					t.Errorf("Site.CheckLink() link not in configured state")
+				}
+				// test unlinking
+				if err := s.unlink(tt.args.name); err != nil {
+					t.Errorf("Site.unlink() link remove failure")
+				}
+				if len(s.links) != 0 {
+					t.Errorf("Site.CheckLink() link not removed")
+				}
+			} else {
+				// router not initialized
+				numLinks := len(s.links)
+				if numLinks != tt.wantLinks {
+					t.Errorf("Site.CheckLink() incorrect links expected: want %d found %d", numLinks, tt.wantLinks)
+				}
+				// expect link status not configured
+				if numLinks != 0 {
+					link := s.links[tt.args.name].Definition()
+					for _, condition := range link.Status.Conditions {
+						if condition.Type == "Configured" && condition.Reason == "OK" {
+							t.Errorf("Site.CheckLink() link in configured state but should not be")
+						}
+					}
+				}
+			}
+		})
+	}
+}
+
+func TestSite_CheckRouterAccess(t *testing.T) {
+	type args struct {
+		name string
+		la   *skupperv1alpha1.RouterAccess
+	}
+	tests := []struct {
+		name                string
+		args                args
+		wantErr             bool
+		wantLinkAccess      int
+		want                string
+		k8sObjects          []runtime.Object
+		skupperObjects      []runtime.Object
+		skupperErrorMessage string
+	}{
+		{
+			name: "no router access config",
+			args: args{
+				name: "skupper-router",
+			},
+			// code silently ignores this failure
+			wantErr:        false,
+			wantLinkAccess: 0,
+			want:           "initialized",
+		},
+		{
+			name: "router access config",
+			args: args{
+				name: "skupper-router",
+				la: &skupperv1alpha1.RouterAccess{
+					TypeMeta: metav1.TypeMeta{
+						APIVersion: "skupper.io/v1alpha1",
+						Kind:       "RouterAccess",
+					},
+					ObjectMeta: v1.ObjectMeta{
+						Name:      "skupper-router",
+						Namespace: "test",
+					},
+					Spec: skupperv1alpha1.RouterAccessSpec{
+						AccessType: "nodeport",
+					},
+				},
+			},
+			skupperObjects: []runtime.Object{
+				&skupperv1alpha1.RouterAccess{
+					ObjectMeta: v1.ObjectMeta{
+						Name:      "skupper-router",
+						Namespace: "test",
+					},
+				},
+			},
+			wantErr:        false,
+			wantLinkAccess: 1,
+			want:           "initialized",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			s, err := newSiteMocks("test", tt.k8sObjects, tt.skupperObjects, tt.skupperErrorMessage, true)
+			assert.Assert(t, err)
+
+			if tt.want == "initialized" {
+				s.initialised = true
+				err = createRouterConfigMock(s)
+				assert.Assert(t, err)
+			}
+
+			if err = s.CheckRouterAccess(tt.args.name, tt.args.la); (err != nil) != tt.wantErr {
+				t.Errorf("Site.CheckRouterAccess() error = %v, wantErr %v", err, tt.wantErr)
+			}
+
+			numLinkAccess := len(s.linkAccess)
+			if tt.wantLinkAccess != numLinkAccess {
+				t.Errorf("Site.CheckRouterAccess() expected link access not found expected %d, found %d", tt.wantLinkAccess, numLinkAccess)
+			} else if tt.wantLinkAccess != 0 {
+				if s.linkAccess["skupper-router"].Spec.AccessType != "nodeport" {
+					t.Errorf("Site.CheckRouterAccess() incorrect values found")
+				}
+			}
+		})
+	}
+}
+
+func Test_NetworkStatusUpdate(t *testing.T) {
+	type args struct {
+		siteRecord []skupperv1alpha1.SiteRecord
+	}
+	tests := []struct {
+		name                string
+		args                args
+		linkconfig          *skupperv1alpha1.Link
+		wantErr             bool
+		k8sObjects          []runtime.Object
+		skupperObjects      []runtime.Object
+		skupperErrorMessage string
+	}{
+		{
+			name: "no site",
+			args: args{
+				siteRecord: []skupperv1alpha1.SiteRecord{
+					{
+						Id:        "",
+						Name:      "site1",
+						Namespace: "test",
+						Platform:  "kubernetes",
+						Version:   "1.8.0",
+					},
+				},
+			},
+			wantErr:             true,
+			skupperErrorMessage: "NotFound",
+		},
+		{
+			name: "site1",
+			args: args{
+				siteRecord: []skupperv1alpha1.SiteRecord{
+					{
+						Id:        "8a96ffdf-403b-4e4a-83a8-97d3d459adb6",
+						Name:      "site1",
+						Namespace: "test",
+						Platform:  "podman",
+						Version:   "1.8.0",
+						Links: []skupperv1alpha1.LinkRecord{
+							{
+								Name:           "link1",
+								RemoteSiteName: "east",
+							},
+						},
+					},
+				},
+			},
+			linkconfig: &skupperv1alpha1.Link{
+				ObjectMeta: v1.ObjectMeta{
+					Name:      "link1",
+					Namespace: "test",
+					UID:       "8a96ffdf-403b-4e4a-83a8-97d3d459adb6",
+				},
+				Spec: skupperv1alpha1.LinkSpec{
+					Cost: 2,
+					Endpoints: []skupperv1alpha1.Endpoint{
+						{
+							Name: string(qdr.RoleInterRouter),
+							Host: "1.1.1.1",
+							Port: "55671",
+						},
+					},
+				},
+			},
+			skupperObjects: []runtime.Object{
+				&skupperv1alpha1.Site{
+					TypeMeta: metav1.TypeMeta{
+						APIVersion: "skupper.io/v1alpha1",
+						Kind:       "Site",
+					},
+					ObjectMeta: v1.ObjectMeta{
+						Name:      "site1",
+						Namespace: "test",
+					},
+				},
+			},
+			wantErr: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			s, err := newSiteMocks("test", tt.k8sObjects, tt.skupperObjects, tt.skupperErrorMessage, false)
+			assert.Assert(t, err)
+
+			// add link
+			if tt.linkconfig != nil {
+				link := s.newLink(tt.linkconfig)
+				s.links[tt.linkconfig.ObjectMeta.Name] = link
+			}
+
+			if err := s.NetworkStatusUpdated(tt.args.siteRecord); (err != nil) != tt.wantErr {
+				t.Errorf("Site.NetworkStatusUpdated() error = %v, wantErr %v", err, tt.wantErr)
+			}
+
+			if tt.wantErr == false {
+				// verify network was updated
+				foundConfig := false
+				for _, network := range s.site.Status.Network {
+					if network.Platform == "podman" && network.Version == "1.8.0" {
+						foundConfig = true
+					}
+				}
+				if foundConfig == false {
+					t.Errorf("Site.NetworkStatusUpdated() network not updated")
+				}
+			}
+		})
+	}
+}
+
+func Test_CheckSecuredAccess(t *testing.T) {
+	type args struct {
+		sa *skupperv1alpha1.SecuredAccess
+	}
+	tests := []struct {
+		name                string
+		args                args
+		rtr                 *skupperv1alpha1.RouterAccess
+		wantErr             bool
+		k8sObjects          []runtime.Object
+		skupperObjects      []runtime.Object
+		skupperErrorMessage string
+	}{
+		{
+			name: "no linkAccess name",
+			args: args{
+				sa: &skupperv1alpha1.SecuredAccess{
+					TypeMeta: metav1.TypeMeta{
+						APIVersion: "skupper.io/v1alpha1",
+						Kind:       "SecuredAccess",
+					},
+				},
+			},
+			wantErr: true,
+		},
+		{
+			name: "no existing linkAccess",
+			args: args{
+				sa: &skupperv1alpha1.SecuredAccess{
+					TypeMeta: metav1.TypeMeta{
+						APIVersion: "skupper.io/v1alpha1",
+						Kind:       "SecuredAccess",
+					},
+					ObjectMeta: v1.ObjectMeta{
+						Name:      "skupper-router",
+						Namespace: "test",
+						Annotations: map[string]string{
+							"internal.skupper.io/controlled":   "true",
+							"internal.skupper.io/routeraccess": "skupper-router",
+						},
+					},
+				},
+			},
+			wantErr: true,
+		},
+		{
+			name: "linkAccess modified",
+			args: args{
+				sa: &skupperv1alpha1.SecuredAccess{
+					TypeMeta: metav1.TypeMeta{
+						APIVersion: "skupper.io/v1alpha1",
+						Kind:       "SecuredAccess",
+					},
+					ObjectMeta: v1.ObjectMeta{
+						Name:      "skupper-router",
+						Namespace: "test",
+						Annotations: map[string]string{
+							"internal.skupper.io/controlled":   "true",
+							"internal.skupper.io/routeraccess": "skupper-router",
+						},
+					},
+					Spec: v1alpha1.SecuredAccessSpec{
+						AccessType: "loadbalancer",
+					},
+					Status: v1alpha1.SecuredAccessStatus{
+						Endpoints: []skupperv1alpha1.Endpoint{
+							{
+								Name: string(qdr.RoleInterRouter),
+								Host: "10.10.10.1",
+								Port: "55671",
+							},
+						},
+					},
+				},
+			},
+			rtr: &skupperv1alpha1.RouterAccess{
+				TypeMeta: metav1.TypeMeta{
+					APIVersion: "skupper.io/v1alpha1",
+					Kind:       "RouterAccess",
+				},
+				ObjectMeta: v1.ObjectMeta{
+					Name:      "skupper-router",
+					Namespace: "test",
+				},
+				Spec: skupperv1alpha1.RouterAccessSpec{
+					AccessType: "nodeport",
+				},
+			},
+			skupperObjects: []runtime.Object{
+				&skupperv1alpha1.RouterAccess{
+					ObjectMeta: v1.ObjectMeta{
+						Name:      "skupper-router",
+						Namespace: "test",
+					},
+				},
+			},
+			wantErr: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			s, err := newSiteMocks("test", tt.k8sObjects, tt.skupperObjects, tt.skupperErrorMessage, false)
+			assert.Assert(t, err)
+
+			if tt.rtr != nil {
+				// test case when there is already a router linkAccess defined
+				s.linkAccess["skupper-router"] = tt.rtr
+			}
+			s.CheckSecuredAccess(tt.args.sa)
+
+			if tt.wantErr == true {
+				// verify no link access
+				if len(s.linkAccess) != 0 {
+					t.Errorf("Site.CheckSecuredAccess() unexpected linkAccess found")
+				}
+			} else {
+				// expected updated linkAccess
+				if len(s.linkAccess) != 1 {
+					t.Errorf("Site.CheckSecuredAccess() linkAccess not found")
+				}
+				if s.linkAccess["skupper-router"].Spec.AccessType == "loadbalancer" {
+					t.Errorf("Site.CheckSecuredAccess() linkAccess not updated")
+				}
+				// TBD adds to code coverge but doesn't return error if failed
+				if err = s.checkSecuredAccess(); err != nil {
+					t.Errorf("Site.CheckSecuredAccess() linkAccess not updated")
+				}
+			}
+		})
+	}
+}
+
+// --- helper
+
+func newSiteMocks(namespace string, k8sObjects []runtime.Object, skupperObjects []runtime.Object, fakeSkupperError string, accessMgr bool) (*Site, error) {
+
+	site := &skupperv1alpha1.Site{
+		ObjectMeta: v1.ObjectMeta{
+			Name:      "site1",
+			Namespace: "test",
+			UID:       "8a96ffdf-403b-4e4a-83a8-97d3d459adb6",
+		},
+		Spec: skupperv1alpha1.SiteSpec{
+			DefaultIssuer: "skupper-spec-issuer-ca",
+		},
+		Status: skupperv1alpha1.SiteStatus{
+			DefaultIssuer: "skupper-status-issuer-ca",
+		},
+	}
+
+	client, err := fakeclient.NewFakeClient(namespace, k8sObjects, skupperObjects, fakeSkupperError)
+	if err != nil {
+		return nil, err
+	}
+
+	controller := kube.NewController("test", client)
+	newSite := &Site{
+		controller: controller,
+		bindings:   NewExtendedBindings(controller),
+		links:      make(map[string]*site1.Link),
+		errors:     make(map[string]string),
+		linkAccess: make(map[string]*skupperv1alpha1.RouterAccess),
+		certs:      certificates.NewCertificateManager(controller),
+		access:     securedaccess.NewSecuredAccessManager(client, nil, "loadbalancer"),
+		adaptor:    BindingAdaptor{},
+		routerPods: make(map[string]*corev1.Pod),
+	}
+
+	newSite.site = site
+	newSite.name = site.ObjectMeta.Name
+	newSite.namespace = site.ObjectMeta.Namespace
+
+	return newSite, nil
+}
+
+func createRouterConfigMock(s *Site) error {
+	rc := qdr.InitialConfig(s.name+"-${HOSTNAME}", s.site.GetSiteId(), version.Version, s.isEdge(), 3)
+	rc.AddAddress(qdr.Address{
+		Prefix:       "mc",
+		Distribution: "multicast",
+	})
+	rc.SetNormalListeners(SSL_PROFILE_PATH)
+
+	err := s.createRouterConfig(&rc)
+	if err != nil {
+		return err
+	}
+	return nil
+}
diff --git a/pkg/qdr/qdr_test.go b/pkg/qdr/qdr_test.go
index 026b0c5e..d790501b 100644
--- a/pkg/qdr/qdr_test.go
+++ b/pkg/qdr/qdr_test.go
@@ -7,6 +7,8 @@ import (
 	"github.com/skupperproject/skupper/api/types"
 	"github.com/skupperproject/skupper/pkg/utils"
 	"gotest.tools/assert"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 func TestInitialConfig(t *testing.T) {
@@ -44,7 +46,36 @@ func TestInitialConfig(t *testing.T) {
 	}
 }
 
-func TestAddListener(t *testing.T) {
+func TestInitialConfigSkupperRouter(t *testing.T) {
+	routerOptions := types.RouterOptions{
+		MaxFrameSize:     1518,
+		LoadBalancerIp:   "1.2.3.4",
+		DisableMutualTLS: true,
+		Logging: []types.RouterLogConfig{
+			{
+				Module: "PROTOCOL",
+				Level:  "trace",
+			},
+		},
+	}
+	path := "/tmp/skupper-router"
+	routerConfig := InitialConfigSkupperRouter("foo", "bar", "1.2.3", false, 10, routerOptions, path)
+
+	if routerConfig.Metadata.Id != "foo" {
+		t.Errorf("Invalid id, expected 'foo' got %q", routerConfig.Metadata.Id)
+	}
+	if len(routerConfig.LogConfig) != 1 {
+		t.Errorf("Expect one log entry")
+	}
+	if routerConfig.Addresses["mc"].Distribution != "multicast" {
+		t.Errorf("Expect address to configured as multicast")
+	}
+	if routerConfig.IsEdge() {
+		t.Errorf("Expected interior mode")
+	}
+}
+
+func TestAddRemoveListener(t *testing.T) {
 	config := InitialConfig("foo", "bar", "undefined", true, 3)
 	config.AddListener(Listener{
 		Name: "l1",
@@ -63,6 +94,72 @@ func TestAddListener(t *testing.T) {
 	if config.Listeners["127.0.0.1@8888"].Name != "127.0.0.1@8888" {
 		t.Errorf("Expected name '127.0.0.1@8888' but got %q", config.Listeners["127.0.0.1@8888"].Name)
 	}
+	result := config.AddListener(Listener{
+		Name: "l1",
+		Port: 5672,
+	})
+	if result == true {
+		t.Errorf("Expect add to fail, duplicate listener")
+	}
+	if len(config.Listeners) != 2 {
+		t.Errorf("Expected two listeners but found %d", len(config.Listeners))
+	}
+	result, _ = config.RemoveListener("l1")
+	if result == false {
+		t.Errorf("Expected to remove existing listener")
+	}
+	result, _ = config.RemoveListener("bad")
+	if result == true {
+		t.Errorf("Expected to not find listener")
+	}
+	if len(config.Listeners) != 1 {
+		t.Errorf("Expected 1 listener but found %d", len(config.Listeners))
+	}
+}
+
+func TestAddRemoveConnector(t *testing.T) {
+	config := InitialConfig("foo", "bar", "undefined", true, 3)
+	config.AddConnector(Connector{
+		Name: "c1",
+		Role: RoleInterRouter,
+		Port: "5672",
+		Cost: 1,
+	})
+	if config.Connectors["c1"].Cost != 1 {
+		t.Errorf("Expected cost 1 but got %d", config.Connectors["c1"].Cost)
+	}
+	config.AddConnector(Connector{
+		Name: "c2",
+		Host: "127.0.0.1",
+		Port: "8888",
+		Role: RoleEdge,
+	})
+	if config.Connectors["c2"].Port != "8888" {
+		t.Errorf("Expected port 8888 but got %s", config.Connectors["c2"].Port)
+	}
+	result := config.AddConnector(Connector{
+		Name: "c1",
+		Role: RoleInterRouter,
+		Port: "5672",
+		Cost: 1,
+	})
+	if result == true {
+		t.Errorf("Expect add to fail, duplicate Connector")
+	}
+	if len(config.Connectors) != 2 {
+		t.Errorf("Expected two Connectors but found %d", len(config.Connectors))
+	}
+	result, _ = config.RemoveConnector("c1")
+	if result == false {
+		t.Errorf("Expected to remove existing Connector")
+	}
+	result, _ = config.RemoveConnector("bad")
+	if result == true {
+		t.Errorf("Expected to not find Connector")
+	}
+	if len(config.Connectors) != 1 {
+		t.Errorf("Expected 1 Connector but found %d", len(config.Connectors))
+	}
 }
 
 func TestAddSslProfile(t *testing.T) {
@@ -420,6 +517,31 @@ func TestMarshalUnmarshalRouterConfigWithLogging(t *testing.T) {
 	checkLevel(t, &input, "DEFAULT", "debug+")
 }
 
+func TestUpdateConfigMap(t *testing.T) {
+	routerConfig := RouterConfig{}
+	data, _ := routerConfig.AsConfigMapData()
+
+	siteConfig := &corev1.ConfigMap{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: "v1",
+			Kind:       "ConfigMap",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name: types.SiteConfigMapName,
+		},
+		Data: data,
+	}
+
+	updated, err := routerConfig.UpdateConfigMap(siteConfig)
+	if !updated {
+		t.Errorf("Expect routerconfig to be updated")
+	}
+
+	if err != nil {
+		t.Errorf("Failed updating routerconfig")
+	}
+}
+
 func TestFailedConvert(t *testing.T) {
 	a := []string{"random"}
 	b := SslProfile{}
diff --git a/pkg/site/defaultissuer_test.go b/pkg/site/defaultissuer_test.go
deleted file mode 100644
index 3d03ab13..00000000
--- a/pkg/site/defaultissuer_test.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package site
-
-import (
-	"testing"
-
-	skupperv1alpha1 "github.com/skupperproject/skupper/pkg/apis/skupper/v1alpha1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-func TestDefaultIssuer(t *testing.T) {
-	type args struct {
-		site *skupperv1alpha1.Site
-	}
-	tests := []struct {
-		name string
-		args args
-		want string
-	}{
-		{
-			name: "nil site",
-			args: args{
-				site: nil,
-			},
-			want: "skupper-site-ca",
-		},
-		{
-			name: "spec issuer",
-			args: args{
-				site: &skupperv1alpha1.Site{
-					ObjectMeta: v1.ObjectMeta{
-						Name:      "site1",
-						Namespace: "test",
-					},
-					Spec: skupperv1alpha1.SiteSpec{
-						DefaultIssuer: "skupper-spec-issuer-ca",
-					},
-					Status: skupperv1alpha1.SiteStatus{
-						DefaultIssuer: "skupper-status-issuer-ca",
-					},
-				},
-			},
-			want: "skupper-spec-issuer-ca",
-		},
-		{
-			name: "status issuer",
-			args: args{
-				site: &skupperv1alpha1.Site{
-					ObjectMeta: v1.ObjectMeta{
-						Name:      "site1",
-						Namespace: "test",
-					},
-					Spec: skupperv1alpha1.SiteSpec{
-						DefaultIssuer: "",
-					},
-					Status: skupperv1alpha1.SiteStatus{
-						DefaultIssuer: "skupper-status-issuer-ca",
-					},
-				},
-			},
-			want: "skupper-status-issuer-ca",
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := DefaultIssuer(tt.args.site); got != tt.want {
-				t.Errorf("DefaultIssuer() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
diff --git a/pkg/vanflow/eventsource/client_test.go b/pkg/vanflow/eventsource/client_test.go
index b7bb6624..33db014f 100644
--- a/pkg/vanflow/eventsource/client_test.go
+++ b/pkg/vanflow/eventsource/client_test.go
@@ -87,6 +87,15 @@ func TestClient(t *testing.T) {
 		t.Error("expected client.Close() to promptly return")
 	}
 
+	func() {
+		defer func() {
+			if r := recover(); r != nil {
+				t.Errorf("client.Close() should be safe to call multiple times but paniced: %v", r)
+			}
+		}()
+		client.Close()
+	}()
+
 	msg, err := record.Encode()
 	assert.Check(t, err)
 	sender.Send(tstCtx, msg)