Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature to exclude an identity via command line parameter #260 #261

Merged
merged 9 commits into from
Oct 3, 2022
Merged

Feature to exclude an identity via command line parameter #260 #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ff23be4
asset exclude list
Sep 19, 2022
ab35ff1
fix tests
Sep 19, 2022
d77a70a
add tests for isAnExcludedAsset
Sep 19, 2022
9e63da5
Update admiral/cmd/admiral/cmd/root.go
nirvanagit Sep 28, 2022
c39da17
Update admiral/pkg/clusters/types.go
nirvanagit Sep 28, 2022
e95779b
Update admiral/cmd/admiral/cmd/root.go
nirvanagit Sep 28, 2022
9cc61ba
Replace asset references with identity
Sep 28, 2022
579922e
Update asset references with identity
Sep 28, 2022
2b3d99d
use map instead of list to find out if identity is excluded
Sep 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions admiral/cmd/admiral/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ import (
"context"
"flag"
"fmt"
"github.com/istio-ecosystem/admiral/admiral/pkg/apis/admiral/routes"
"github.com/istio-ecosystem/admiral/admiral/pkg/apis/admiral/server"
"github.com/istio-ecosystem/admiral/admiral/pkg/clusters"
"github.com/istio-ecosystem/admiral/admiral/pkg/controller/common"
log "github.com/sirupsen/logrus"
"os"
"os/signal"
"sync"
"syscall"
"time"

"github.com/istio-ecosystem/admiral/admiral/pkg/apis/admiral/routes"
"github.com/istio-ecosystem/admiral/admiral/pkg/apis/admiral/server"
"github.com/istio-ecosystem/admiral/admiral/pkg/clusters"
"github.com/istio-ecosystem/admiral/admiral/pkg/controller/common"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
)

Expand Down Expand Up @@ -142,6 +142,8 @@ func GetRootCmd(args []string) *cobra.Command {
"The value of envoy filter is to add additional config to the filter config section")
rootCmd.PersistentFlags().BoolVar(&params.EnableRoutingPolicy, "enable_routing_policy", false,
"If Routing Policy feature needs to be enabled")
rootCmd.PersistentFlags().StringArrayVar(&params.ExcludedIdentityList, "excluded_identity_list", []string{},
"List of identities which should be excluded from getting processed")
return rootCmd
}

Expand Down
9 changes: 4 additions & 5 deletions admiral/pkg/clusters/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,15 @@ import (
"strings"
"time"

argo "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1"
"github.com/golang/protobuf/ptypes/duration"
"github.com/golang/protobuf/ptypes/wrappers"
"github.com/google/go-cmp/cmp"
"github.com/istio-ecosystem/admiral/admiral/pkg/apis/admiral/model"
v1 "github.com/istio-ecosystem/admiral/admiral/pkg/apis/admiral/v1"
"github.com/istio-ecosystem/admiral/admiral/pkg/controller/admiral"
"github.com/istio-ecosystem/admiral/admiral/pkg/controller/common"
"github.com/istio-ecosystem/admiral/admiral/pkg/controller/util"

argo "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1"
"github.com/golang/protobuf/ptypes/duration"
"github.com/golang/protobuf/ptypes/wrappers"
"github.com/google/go-cmp/cmp"
log "github.com/sirupsen/logrus"
"google.golang.org/protobuf/testing/protocmp"
v1alpha32 "istio.io/api/networking/v1alpha3"
Expand Down
49 changes: 27 additions & 22 deletions admiral/pkg/clusters/registry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package clusters
import (
"context"
"strings"
"sync"
"testing"
"time"

Expand All @@ -23,10 +24,17 @@ import (
"k8s.io/client-go/tools/clientcmd"
)

func init() {
p := common.AdmiralParams{
var registryTestSingleton sync.Once

func admiralParamsForRegistryTests() common.AdmiralParams {
return common.AdmiralParams{
LabelSet: &common.LabelSet{
WorkloadIdentityKey: "identity",
GlobalTrafficDeploymentLabel: "identity",
PriorityKey: "priority",
EnvKey: "admiral.io/env",
},
KubeconfigPath: "testdata/fake.config",
LabelSet: &common.LabelSet{},
EnableSAN: true,
SANPrefix: "prefix",
HostnameSuffix: "mesh",
Expand All @@ -40,34 +48,30 @@ func init() {
EnableRoutingPolicy: true,
EnvoyFilterVersion: "1.13",
}
}

p.LabelSet.WorkloadIdentityKey = "identity"
p.LabelSet.GlobalTrafficDeploymentLabel = "identity"
p.LabelSet.PriorityKey = "priority"
p.LabelSet.EnvKey = "admiral.io/env"

common.InitializeConfig(p)
func setupForRegistryTests() {
registryTestSingleton.Do(func() {
common.ResetSync()
common.InitializeConfig(admiralParamsForRegistryTests())
})
}

func TestDeleteCacheControllerThatDoesntExist(t *testing.T) {

setupForRegistryTests()
w := NewRemoteRegistry(nil, common.AdmiralParams{})

err := w.deleteCacheController("I don't exit")

if err != nil {
t.Fail()
}
}

func TestDeleteCacheController(t *testing.T) {

setupForRegistryTests()
w := NewRemoteRegistry(nil, common.AdmiralParams{})

r := rest.Config{
Host: "test.com",
}

cluster := "test.cluster"
w.createCacheController(&r, cluster, time.Second*time.Duration(300))
rc := w.GetRemoteController(cluster)
Expand All @@ -89,7 +93,7 @@ func TestDeleteCacheController(t *testing.T) {
}

func TestCopyServiceEntry(t *testing.T) {

setupForRegistryTests()
se := networking.ServiceEntry{
Hosts: []string{"test.com"},
}
Expand All @@ -102,7 +106,7 @@ func TestCopyServiceEntry(t *testing.T) {
}

func TestCopyEndpoint(t *testing.T) {

setupForRegistryTests()
se := networking.WorkloadEntry{
Address: "127.0.0.1",
}
Expand All @@ -116,6 +120,7 @@ func TestCopyEndpoint(t *testing.T) {
}

func TestCopySidecar(t *testing.T) {
setupForRegistryTests()
spec := networking.Sidecar{
WorkloadSelector: &networking.WorkloadSelector{
Labels: map[string]string{"TestLabel": "TestValue"},
Expand Down Expand Up @@ -202,9 +207,8 @@ func createMockRemoteController(f func(interface{})) (*RemoteController, error)
}

func TestCreateSecretController(t *testing.T) {

setupForRegistryTests()
err := createSecretController(context.Background(), NewRemoteRegistry(nil, common.AdmiralParams{}))

if err != nil {
t.Fail()
}
Expand All @@ -221,14 +225,12 @@ func TestCreateSecretController(t *testing.T) {
}

func TestInitAdmiral(t *testing.T) {

setupForRegistryTests()
p := common.AdmiralParams{
KubeconfigPath: "testdata/fake.config",
LabelSet: &common.LabelSet{},
}

p.LabelSet.WorkloadIdentityKey = "overridden-key"

rr, err := InitAdmiral(context.Background(), p)

if err != nil {
Expand All @@ -244,6 +246,7 @@ func TestInitAdmiral(t *testing.T) {
}

func TestAdded(t *testing.T) {
setupForRegistryTests()
ctx := context.Background()
p := common.AdmiralParams{
KubeconfigPath: "testdata/fake.config",
Expand Down Expand Up @@ -279,6 +282,7 @@ func TestAdded(t *testing.T) {
}

func TestGetServiceForDeployment(t *testing.T) {
setupForRegistryTests()
baseRc, _ := createMockRemoteController(func(i interface{}) {
//res := i.(istio.Config)
//se, ok := res.Spec.(*v1alpha3.ServiceEntry)
Expand Down Expand Up @@ -364,6 +368,7 @@ func TestGetServiceForDeployment(t *testing.T) {
}

func TestUpdateCacheController(t *testing.T) {
setupForRegistryTests()
p := common.AdmiralParams{
KubeconfigPath: "testdata/fake.config",
}
Expand Down
18 changes: 16 additions & 2 deletions admiral/pkg/clusters/serviceentry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,15 @@ func modifyServiceEntryForNewServiceOrPod(
if rc.RolloutController != nil {
rollout = rc.RolloutController.Cache.Get(sourceIdentity, env)
}
if deployment == nil && rollout == nil {
log.Infof("Neither deployment nor rollouts found for identity=%s in env=%s namespace=%s", sourceIdentity, env, namespace)
continue
}
if deployment != nil {
if len(remoteRegistry.ExcludedIdentityMap) > 0 && remoteRegistry.ExcludedIdentityMap[common.GetDeploymentGlobalIdentifier(deployment)] {
log.Infof(LogFormat, event, env, sourceIdentity, clusterId, "Processing skipped as identity is in the exclude list")
return nil
}
remoteRegistry.AdmiralCache.IdentityClusterCache.Put(sourceIdentity, rc.ClusterID, rc.ClusterID)
serviceInstance = getServiceForDeployment(rc, deployment)
if serviceInstance == nil {
Expand All @@ -112,6 +120,10 @@ func modifyServiceEntryForNewServiceOrPod(
sourceDeployments[rc.ClusterID] = deployment
createServiceEntryForDeployment(ctx, event, rc, remoteRegistry.AdmiralCache, localMeshPorts, deployment, serviceEntries)
} else if rollout != nil {
if len(remoteRegistry.ExcludedIdentityMap) > 0 && remoteRegistry.ExcludedIdentityMap[common.GetRolloutGlobalIdentifier(rollout)] {
log.Infof(LogFormat, event, env, sourceIdentity, clusterId, "Processing skipped as identity is in the exclude list")
return nil
}
remoteRegistry.AdmiralCache.IdentityClusterCache.Put(sourceIdentity, rc.ClusterID, rc.ClusterID)
weightedServices = getServiceForRollout(ctx, rc, rollout)
if len(weightedServices) == 0 {
Expand Down Expand Up @@ -367,8 +379,10 @@ func modifySidecarForLocalClusterCommunication(ctx context.Context, sidecarNames
return
}

sidecar, _ := sidecarConfig.IstioClient.NetworkingV1alpha3().Sidecars(sidecarNamespace).Get(ctx, common.GetWorkloadSidecarName(), v12.GetOptions{})

sidecar, err := sidecarConfig.IstioClient.NetworkingV1alpha3().Sidecars(sidecarNamespace).Get(ctx, common.GetWorkloadSidecarName(), v12.GetOptions{})
if err != nil {
return
}
if sidecar == nil || (sidecar.Spec.Egress == nil) {
return
}
Expand Down
Loading