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

VC-32931: Gather Istio's secret keys #538

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

VC-32931: Gather Istio's secret keys #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
63 changes: 50 additions & 13 deletions pkg/datagatherer/k8s/dynamic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,22 @@ func getObject(version, kind, name, namespace string, withManagedFields bool) *u
}
}

func getSecret(name, namespace string, data map[string]interface{}, isTLS bool, withLastApplied bool) *unstructured.Unstructured {
type secretType string

var (
opaque secretType = "Opaque"
tls secretType = "kubernetes.io/tls"
istio secretType = "istio.io/ca-root"
)

func getSecret(name, namespace string, data map[string]interface{}, t secretType, withLastApplied bool) *unstructured.Unstructured {
object := getObject("v1", "Secret", name, namespace, false)

if data != nil {
object.Object["data"] = data
}

object.Object["type"] = "Opaque"
if isTLS {
object.Object["type"] = "kubernetes.io/tls"
}
object.Object["type"] = string(t)

metadata, _ := object.Object["metadata"].(map[string]interface{})
annotations := make(map[string]interface{})
Expand Down Expand Up @@ -510,17 +515,17 @@ func TestDynamicGatherer_Fetch(t *testing.T) {
addObjects: []runtime.Object{
getSecret("testsecret", "testns1", map[string]interface{}{
"secretKey": "secretValue",
}, false, true),
}, opaque, true),
getSecret("anothertestsecret", "testns2", map[string]interface{}{
"secretNumber": "12345",
}, false, true),
}, opaque, true),
},
expected: []*api.GatheredResource{
{
Resource: getSecret("testsecret", "testns1", nil, false, false),
Resource: getSecret("testsecret", "testns1", nil, opaque, false),
},
{
Resource: getSecret("anothertestsecret", "testns2", nil, false, false),
Resource: getSecret("anothertestsecret", "testns2", nil, opaque, false),
},
},
},
Expand All @@ -534,23 +539,55 @@ func TestDynamicGatherer_Fetch(t *testing.T) {
"tls.key": "secretValue",
"tls.crt": "value",
"ca.crt": "value",
}, true, true),
}, tls, true),
getSecret("anothertestsecret", "testns2", map[string]interface{}{
"example.key": "secretValue",
"example.crt": "value",
}, true, true),
}, tls, true),
},
expected: []*api.GatheredResource{
{
// only tls.crt and ca.cert remain
Resource: getSecret("testsecret", "testns1", map[string]interface{}{
"tls.crt": "value",
"ca.crt": "value",
}, true, false),
}, tls, false),
},
{
// all other keys removed
Resource: getSecret("anothertestsecret", "testns2", nil, true, false),
Resource: getSecret("anothertestsecret", "testns2", nil, tls, false),
},
},
},
"Secret of type istio.io/ca-root should have crts and not keys": {
config: ConfigDynamic{
IncludeNamespaces: []string{""},
GroupVersionResource: schema.GroupVersionResource{Group: "", Version: "v1", Resource: "secrets"},
},
addObjects: []runtime.Object{
getSecret("cacerts", "testns1", map[string]interface{}{
"root-cert.pem": "cert",
"ca-cert.pem": "cert",
"ca-key.pem": "privatekey",
"cert-chain.pem": "cert",
}, opaque, true),
getSecret("istio-ca-secret", "testns2", map[string]interface{}{
"ca-cert.pem": "cert",
"ca-key.pem": "privatekey",
}, istio, true),
},
expected: []*api.GatheredResource{
{
Resource: getSecret("cacerts", "testns1", map[string]interface{}{
"root-cert.pem": "cert",
"ca-cert.pem": "cert",
"cert-chain.pem": "cert",
}, opaque, false),
},
{
Resource: getSecret("istio-ca-secret", "testns2", map[string]interface{}{
"ca-cert.pem": "cert",
}, istio, false),
},
},
},
Expand Down
7 changes: 7 additions & 0 deletions pkg/datagatherer/k8s/fieldfilter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ var SecretSelectedFields = []string{
"type",
"/data/tls.crt",
"/data/ca.crt",

// The following keys correspond to the standard keys expected by Istio
// Citadel to load a custom CA certificate. The secret types may be
// "istio.io/ca-root" or "generic".
"/data/ca-cert.pem",
"/data/cert-chain.pem",
"/data/root-cert.pem",
}

// RouteSelectedFields is the list of fields sent from OpenShift Route objects to the
Expand Down