feat(develop): outbound-only new service flow

.golangci.yml

@@ -92,7 +92,15 @@ issues:
   exclude-rules:
     - path: e2e/
       linters:
+        - goconst
+        - gocyclo
+        - golint
+        - errcheck
+        - dupl
+        - gosec
         - revive
+        - stylecheck
+        - wrapcheck
     - path: test/
       linters:
         - revive

Makefile

@@ -95,12 +95,12 @@ compile: deps generate format $(DIST_DIR)/$(BINARY_NAME) ## Compiles binaries
 .PHONY: test
 test: generate ## Runs tests
 	$(call header,"Running tests")
-	ginkgo -r -v -progress -vet=off -trace --skip-package=e2e --junit-report=ginkgo-test-results.xml ${args}
+	ginkgo -r -progress -vet=off -trace --skip-package=e2e --junit-report=ginkgo-test-results.xml ${args}
 
 .PHONY: test-e2e
 test-e2e: compile ## Runs end-to-end tests
 	$(call header,"Running end-to-end tests")
-	ginkgo e2e/ -r -v -progress -vet=off -trace --junit-report=ginkgo-test-results.xml ${args}
+	ginkgo e2e/ -r -progress -vet=off -trace --junit-report=ginkgo-test-results.xml ${args}
 
 .PHONY: clean
 clean: ## Removes build artifacts
@@ -227,7 +227,7 @@ $(PROJECT_DIR)/bin/controller-gen:
 	$(call header,"Installing controller-gen")
 	$(call go-get-tool,$(PROJECT_DIR)/bin/controller-gen,sigs.k8s.io/controller-tools/cmd/controller-gen@$(shell go mod graph | grep controller-tools | head -n 1 | cut -d'@' -f 2))
 
-KUSTOMIZE_VERSION?=v4.2.0
+KUSTOMIZE_VERSION?=v4.5.5
 $(PROJECT_DIR)/bin/kustomize:
 	$(call header,"Installing kustomize")
 	wget -q -c https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2F$(KUSTOMIZE_VERSION)/kustomize_$(KUSTOMIZE_VERSION)_$(GOOS)_$(GOARCH).tar.gz -O /tmp/kustomize.tar.gz
@@ -289,6 +289,12 @@ container-image: compile ## Builds the container image
 		$(IKE_CONTAINER_REGISTRY)/$(IKE_CONTAINER_REPOSITORY)/$(IKE_IMAGE_NAME):$(IKE_IMAGE_TAG) \
 		$(IKE_CONTAINER_REGISTRY)/$(IKE_CONTAINER_REPOSITORY)/$(IKE_IMAGE_NAME):latest
 
+.PHONY: container-image-all
+container-image-all: container-image container-image-test container-image-test-prepared
+
+.PHONY: container-push-all
+container-push-all: container-push container-push-test container-push-test-prepared
+
 .PHONY: container-push
 container-push: container-push--latest container-push-versioned ## Pushes container images to the registry (latest and versioned)
 
@@ -366,7 +372,7 @@ BUNDLE_CHANNELS:=--channels=$(CHANNELS)
 BUNDLE_DEFAULT_CHANNEL:=--default-channel=$(DEFAULT_CHANNEL)
 BUNDLE_METADATA_OPTS?=$(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 
-BUNDLE_IMG?=$(IKE_CONTAINER_REGISTRY)/$(IKE_CONTAINER_REPOSITORY)/istio-workspace-operator-bundle:$(IKE_IMAGE_TAG)
+BUNDLE_IMG?=$(IKE_CONTAINER_REGISTRY)/$(IKE_CONTAINER_REPOSITORY)/istio-workspace-operator-bundle
 DESC_FILE:=dist/operatorhub_description.md
 CSV_FILE:=bundle/manifests/istio-workspace-operator.clusterserviceversion.yaml
 
@@ -390,15 +396,19 @@ bundle: $(PROJECT_DIR)/bin/operator-sdk $(PROJECT_DIR)/bin/kustomize $(DIST_DIR)
 .PHONY: bundle-image
 bundle-image:	## Build the bundle image
 	$(call header,"Building bundle image")
-	$(IMG_BUILDER) build -f build/bundle.Containerfile -t $(BUNDLE_IMG) bundle/
+	$(IMG_BUILDER) build -f build/bundle.Containerfile -t $(BUNDLE_IMG):$(IKE_IMAGE_TAG) bundle/
+	$(IMG_BUILDER) tag \
+		$(BUNDLE_IMG):$(IKE_IMAGE_TAG) \
+		$(BUNDLE_IMG):latest
 
 .PHONY: bundle-push
 bundle-push:	## Push the bundle image
 	$(call header,"Pushing bundle image")
-	$(IMG_BUILDER) push $(BUNDLE_IMG)
+	$(IMG_BUILDER) push $(BUNDLE_IMG):latest
+	$(IMG_BUILDER) push $(BUNDLE_IMG):$(IKE_IMAGE_TAG)
 
 BUNDLE_TIMEOUT?=5m
-bundle-run:=operator-sdk run bundle $(BUNDLE_IMG) -n $(OPERATOR_NAMESPACE) --timeout $(BUNDLE_TIMEOUT) --index-image quay.io/operator-framework/opm:$(OPERATOR_SDK_VERSION)
+bundle-run:=operator-sdk run bundle $(BUNDLE_IMG):$(IKE_IMAGE_TAG) -n $(OPERATOR_NAMESPACE) --timeout $(BUNDLE_TIMEOUT) --index-image quay.io/operator-framework/opm:$(OPERATOR_SDK_VERSION)
 
 .PHONY: bundle-run
 bundle-run:		## Run the bundle image in OwnNamespace(OPERATOR_NAMESPACE) install mode

controllers/session/conditions.go

@@ -4,18 +4,18 @@ import (
 	"strconv"
 	"strings"
 
-	istiov1alpha1 "github.com/maistra/istio-workspace/api/maistra/v1alpha1"
+	workspacev1alpha1 "github.com/maistra/istio-workspace/api/maistra/v1alpha1"
 	"github.com/maistra/istio-workspace/pkg/model"
 )
 
-func createConditionForLocatedRef(ref model.Ref, located model.LocatorStatus) istiov1alpha1.Condition {
+func createConditionForLocatedRef(ref model.Ref, located model.LocatorStatus) workspacev1alpha1.Condition {
 	message := located.Kind + "/" + located.Name + " status " + ref.KindName.String() + ": "
 	reason := "Scheduled"
 	typeStr := createType(located.Action, located.Kind)
 	status := "true"
 
-	return istiov1alpha1.Condition{
-		Source: istiov1alpha1.Source{
+	return workspacev1alpha1.Condition{
+		Source: workspacev1alpha1.Source{
 			Kind: located.Kind,
 			Name: located.Name,
 			Ref:  ref.KindName.String(),
@@ -27,16 +27,16 @@ func createConditionForLocatedRef(ref model.Ref, located model.LocatorStatus) is
 	}
 }
 
-func createConditionForModifiedRef(ref model.Ref, modified model.ModificatorStatus) istiov1alpha1.Condition {
+func createConditionForModifiedRef(ref model.Ref, modified model.ModificatorStatus) workspacev1alpha1.Condition {
 	message := modified.Kind + "/" + modified.Name + " modified to satisfy " + ref.KindName.String() + ": "
 	if modified.Error != nil {
 		message += modified.Error.Error()
 	} else {
 		message += "ok"
 	}
-	var target *istiov1alpha1.Target
+	var target *workspacev1alpha1.Target
 	if modified.Target != nil {
-		target = &istiov1alpha1.Target{
+		target = &workspacev1alpha1.Target{
 			Kind: modified.Target.Kind,
 			Name: modified.Target.Name,
 		}
@@ -46,8 +46,8 @@ func createConditionForModifiedRef(ref model.Ref, modified model.ModificatorStat
 	reason := "Applied"
 	typeStr := createType(modified.Action, modified.Kind)
 
-	return istiov1alpha1.Condition{
-		Source: istiov1alpha1.Source{
+	return workspacev1alpha1.Condition{
+		Source: workspacev1alpha1.Source{
 			Kind: modified.Kind,
 			Name: modified.Name,
 			Ref:  ref.KindName.String(),
@@ -64,9 +64,9 @@ func createType(action model.StatusAction, kindName string) string {
 	return strings.Title(string(action)) + strings.Title(kindName)
 }
 
-func cleanupRelatedConditionsOnRemoval(ref model.Ref, session *istiov1alpha1.Session) {
+func cleanupRelatedConditionsOnRemoval(ref model.Ref, session *workspacev1alpha1.Session) {
 	if ref.Remove && refSuccessful(ref, session.Status.Conditions) {
-		var otherConditions []*istiov1alpha1.Condition
+		var otherConditions []*workspacev1alpha1.Condition
 		for i := range session.Status.Conditions {
 			condition := session.Status.Conditions[i]
 			if condition.Source.Ref != ref.KindName.String() {

controllers/session/model_convert.go

@@ -1,7 +1,7 @@
 package session
 
 import (
-	istiov1alpha1 "github.com/maistra/istio-workspace/api/maistra/v1alpha1"
+	workspacev1alpha1 "github.com/maistra/istio-workspace/api/maistra/v1alpha1"
 	"github.com/maistra/istio-workspace/pkg/model"
 )
 
@@ -14,21 +14,21 @@ const (
 )
 
 // ConvertAPIRefToModelRef converts a Session.Spec.Ref to a model.Ref.
-func ConvertAPIRefToModelRef(ref istiov1alpha1.Ref, namespace string) model.Ref {
+func ConvertAPIRefToModelRef(ref workspacev1alpha1.Ref, namespace string) model.Ref {
 	return model.Ref{KindName: model.ParseRefKindName(ref.Name), Namespace: namespace, Strategy: ref.Strategy, Args: ref.Args}
 }
 
 // ConvertModelRouteToAPIRoute returns Model route as a session Route.
-func ConvertModelRouteToAPIRoute(route model.Route) *istiov1alpha1.Route {
-	return &istiov1alpha1.Route{
+func ConvertModelRouteToAPIRoute(route model.Route) *workspacev1alpha1.Route {
+	return &workspacev1alpha1.Route{
 		Type:  route.Type,
 		Name:  route.Name,
 		Value: route.Value,
 	}
 }
 
 // ConvertAPIRouteToModelRoute returns the defined route from the session or the Default.
-func ConvertAPIRouteToModelRoute(session *istiov1alpha1.Session) model.Route {
+func ConvertAPIRouteToModelRoute(session *workspacev1alpha1.Session) model.Route {
 	if session.Spec.Route.Type == "" {
 		return model.Route{
 			Type:  RouteStrategyHeader,

controllers/session/session_controller.go

@@ -21,7 +21,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
-	istiov1alpha1 "github.com/maistra/istio-workspace/api/maistra/v1alpha1"
+	workspacev1alpha1 "github.com/maistra/istio-workspace/api/maistra/v1alpha1"
 	"github.com/maistra/istio-workspace/pkg/istio"
 	"github.com/maistra/istio-workspace/pkg/k8s"
 	"github.com/maistra/istio-workspace/pkg/log"
@@ -104,7 +104,7 @@ func add(mgr manager.Manager, r *ReconcileSession) error {
 	}
 
 	// Watch for changes to primary resource Session
-	err = c.Watch(&source.Kind{Type: &istiov1alpha1.Session{}}, &handler.InstrumentedEnqueueRequestForObject{}, predicate.GenerationChangedPredicate{})
+	err = c.Watch(&source.Kind{Type: &workspacev1alpha1.Session{}}, &handler.InstrumentedEnqueueRequestForObject{}, predicate.GenerationChangedPredicate{})
 	if err != nil {
 		return errors.Wrap(err, "failed creating session-controller")
 	}
@@ -181,7 +181,7 @@ func (r *ReconcileSession) Reconcile(orgCtx context.Context, request reconcile.R
 	c := NewInstrumentedClient(r.client)
 
 	// Fetch the Session instance
-	session := &istiov1alpha1.Session{}
+	session := &workspacev1alpha1.Session{}
 	err := c.Get(context.Background(), request.NamespacedName, session)
 	if err != nil {
 		if errorsK8s.IsNotFound(err) {
@@ -204,9 +204,9 @@ func (r *ReconcileSession) Reconcile(orgCtx context.Context, request reconcile.R
 	// update session.status.Route if it was not provided
 	session.Status.Route = ConvertModelRouteToAPIRoute(route)
 	session.Status.RouteExpression = session.Status.Route.String()
-	processing := istiov1alpha1.StateProcessing
+	processing := workspacev1alpha1.StateProcessing
 	session.Status.State = &processing
-	session.Status.Readiness = istiov1alpha1.StatusReadiness{Components: istiov1alpha1.StatusComponents{}}
+	session.Status.Readiness = workspacev1alpha1.StatusReadiness{Components: workspacev1alpha1.StatusComponents{}}
 
 	err = c.Status().Update(ctx, session)
 	if err != nil {
@@ -232,7 +232,7 @@ func (r *ReconcileSession) Reconcile(orgCtx context.Context, request reconcile.R
 
 	refs := calculateReferences(ctx, session)
 	sync := model.NewSync(r.manipulators.Locators, extractModificators(r.manipulators.Handlers))
-	session.Status.Conditions = []*istiov1alpha1.Condition{}
+	session.Status.Conditions = []*workspacev1alpha1.Condition{}
 	session.Status.Hosts = []string{}
 	session.Status.RefNames = []string{}
 	session.Status.Strategies = []string{}
@@ -299,10 +299,10 @@ func (r *ReconcileSession) Reconcile(orgCtx context.Context, request reconcile.R
 	return reconcile.Result{}, nil
 }
 
-func allConditionsSuccessful(conditions []*istiov1alpha1.Condition) bool {
+func allConditionsSuccessful(conditions []*workspacev1alpha1.Condition) bool {
 	for i := range conditions {
 		condition := conditions[i]
-		conditionFailed := condition.Status != nil && *condition.Status == istiov1alpha1.StatusFailed
+		conditionFailed := condition.Status != nil && *condition.Status == workspacev1alpha1.StatusFailed
 		validation := condition.Reason != nil && *condition.Reason == ValidationReason
 		if conditionFailed && !validation {
 			return false
@@ -312,10 +312,10 @@ func allConditionsSuccessful(conditions []*istiov1alpha1.Condition) bool {
 	return true
 }
 
-func refSuccessful(ref model.Ref, conditions []*istiov1alpha1.Condition) bool {
+func refSuccessful(ref model.Ref, conditions []*workspacev1alpha1.Condition) bool {
 	for i := range conditions {
 		condition := conditions[i]
-		conditionFailed := condition.Status != nil && *condition.Status == istiov1alpha1.StatusFailed
+		conditionFailed := condition.Status != nil && *condition.Status == workspacev1alpha1.StatusFailed
 		if condition.Source.Ref == ref.KindName.String() && conditionFailed {
 			return false
 		}
@@ -324,11 +324,11 @@ func refSuccessful(ref model.Ref, conditions []*istiov1alpha1.Condition) bool {
 	return true
 }
 
-func calculateSessionState(session *istiov1alpha1.Session) *istiov1alpha1.SessionState {
-	state := istiov1alpha1.StateSuccess
+func calculateSessionState(session *workspacev1alpha1.Session) *workspacev1alpha1.SessionState {
+	state := workspacev1alpha1.StateSuccess
 	for _, con := range session.Status.Conditions {
-		if con.Status != nil && *con.Status == istiov1alpha1.StatusFailed {
-			state = istiov1alpha1.StateFailed
+		if con.Status != nil && *con.Status == workspacev1alpha1.StatusFailed {
+			state = workspacev1alpha1.StateFailed
 
 			break
 		}
@@ -337,7 +337,7 @@ func calculateSessionState(session *istiov1alpha1.Session) *istiov1alpha1.Sessio
 	return &state
 }
 
-func calculateReferences(ctx model.SessionContext, session *istiov1alpha1.Session) []model.Ref {
+func calculateReferences(ctx model.SessionContext, session *workspacev1alpha1.Session) []model.Ref {
 	refs := []model.Ref{}
 	for _, ref := range session.Spec.Refs {
 		modelRef := ConvertAPIRefToModelRef(ref, ctx.Namespace)