Remove references to impersonationConfigMap.
Signed-off-by: Margo Crawford <margaretc@vmware.com>
This commit is contained in:
parent
b57878ebc5
commit
d780bf64bc
@ -49,7 +49,6 @@ data:
|
|||||||
servingCertificateSecret: (@= defaultResourceNameWithSuffix("api-tls-serving-certificate") @)
|
servingCertificateSecret: (@= defaultResourceNameWithSuffix("api-tls-serving-certificate") @)
|
||||||
credentialIssuer: (@= defaultResourceNameWithSuffix("config") @)
|
credentialIssuer: (@= defaultResourceNameWithSuffix("config") @)
|
||||||
apiService: (@= defaultResourceNameWithSuffix("api") @)
|
apiService: (@= defaultResourceNameWithSuffix("api") @)
|
||||||
impersonationConfigMap: (@= defaultResourceNameWithSuffix("impersonation-proxy-config") @)
|
|
||||||
impersonationLoadBalancerService: (@= defaultResourceNameWithSuffix("impersonation-proxy-load-balancer") @)
|
impersonationLoadBalancerService: (@= defaultResourceNameWithSuffix("impersonation-proxy-load-balancer") @)
|
||||||
impersonationClusterIPService: (@= defaultResourceNameWithSuffix("impersonation-proxy-cluster-ip") @)
|
impersonationClusterIPService: (@= defaultResourceNameWithSuffix("impersonation-proxy-cluster-ip") @)
|
||||||
impersonationTLSCertificateSecret: (@= defaultResourceNameWithSuffix("impersonation-proxy-tls-serving-certificate") @)
|
impersonationTLSCertificateSecret: (@= defaultResourceNameWithSuffix("impersonation-proxy-tls-serving-certificate") @)
|
||||||
|
@ -108,9 +108,6 @@ func validateNames(names *NamesConfigSpec) error {
|
|||||||
if names.APIService == "" {
|
if names.APIService == "" {
|
||||||
missingNames = append(missingNames, "apiService")
|
missingNames = append(missingNames, "apiService")
|
||||||
}
|
}
|
||||||
if names.ImpersonationConfigMap == "" {
|
|
||||||
missingNames = append(missingNames, "impersonationConfigMap")
|
|
||||||
}
|
|
||||||
if names.ImpersonationLoadBalancerService == "" {
|
if names.ImpersonationLoadBalancerService == "" {
|
||||||
missingNames = append(missingNames, "impersonationLoadBalancerService")
|
missingNames = append(missingNames, "impersonationLoadBalancerService")
|
||||||
}
|
}
|
||||||
|
@ -38,7 +38,6 @@ func TestFromPath(t *testing.T) {
|
|||||||
credentialIssuer: pinniped-config
|
credentialIssuer: pinniped-config
|
||||||
apiService: pinniped-api
|
apiService: pinniped-api
|
||||||
kubeCertAgentPrefix: kube-cert-agent-prefix
|
kubeCertAgentPrefix: kube-cert-agent-prefix
|
||||||
impersonationConfigMap: impersonationConfigMap-value
|
|
||||||
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
||||||
impersonationClusterIPService: impersonationClusterIPService-value
|
impersonationClusterIPService: impersonationClusterIPService-value
|
||||||
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
||||||
@ -46,6 +45,7 @@ func TestFromPath(t *testing.T) {
|
|||||||
impersonationSignerSecret: impersonationSignerSecret-value
|
impersonationSignerSecret: impersonationSignerSecret-value
|
||||||
impersonationSignerSecret: impersonationSignerSecret-value
|
impersonationSignerSecret: impersonationSignerSecret-value
|
||||||
agentServiceAccount: agentServiceAccount-value
|
agentServiceAccount: agentServiceAccount-value
|
||||||
|
extraName: extraName-value
|
||||||
labels:
|
labels:
|
||||||
myLabelKey1: myLabelValue1
|
myLabelKey1: myLabelValue1
|
||||||
myLabelKey2: myLabelValue2
|
myLabelKey2: myLabelValue2
|
||||||
@ -70,7 +70,6 @@ func TestFromPath(t *testing.T) {
|
|||||||
ServingCertificateSecret: "pinniped-concierge-api-tls-serving-certificate",
|
ServingCertificateSecret: "pinniped-concierge-api-tls-serving-certificate",
|
||||||
CredentialIssuer: "pinniped-config",
|
CredentialIssuer: "pinniped-config",
|
||||||
APIService: "pinniped-api",
|
APIService: "pinniped-api",
|
||||||
ImpersonationConfigMap: "impersonationConfigMap-value",
|
|
||||||
ImpersonationLoadBalancerService: "impersonationLoadBalancerService-value",
|
ImpersonationLoadBalancerService: "impersonationLoadBalancerService-value",
|
||||||
ImpersonationClusterIPService: "impersonationClusterIPService-value",
|
ImpersonationClusterIPService: "impersonationClusterIPService-value",
|
||||||
ImpersonationTLSCertificateSecret: "impersonationTLSCertificateSecret-value",
|
ImpersonationTLSCertificateSecret: "impersonationTLSCertificateSecret-value",
|
||||||
@ -98,7 +97,6 @@ func TestFromPath(t *testing.T) {
|
|||||||
servingCertificateSecret: pinniped-concierge-api-tls-serving-certificate
|
servingCertificateSecret: pinniped-concierge-api-tls-serving-certificate
|
||||||
credentialIssuer: pinniped-config
|
credentialIssuer: pinniped-config
|
||||||
apiService: pinniped-api
|
apiService: pinniped-api
|
||||||
impersonationConfigMap: impersonationConfigMap-value
|
|
||||||
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
||||||
impersonationClusterIPService: impersonationClusterIPService-value
|
impersonationClusterIPService: impersonationClusterIPService-value
|
||||||
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
||||||
@ -121,7 +119,6 @@ func TestFromPath(t *testing.T) {
|
|||||||
ServingCertificateSecret: "pinniped-concierge-api-tls-serving-certificate",
|
ServingCertificateSecret: "pinniped-concierge-api-tls-serving-certificate",
|
||||||
CredentialIssuer: "pinniped-config",
|
CredentialIssuer: "pinniped-config",
|
||||||
APIService: "pinniped-api",
|
APIService: "pinniped-api",
|
||||||
ImpersonationConfigMap: "impersonationConfigMap-value",
|
|
||||||
ImpersonationLoadBalancerService: "impersonationLoadBalancerService-value",
|
ImpersonationLoadBalancerService: "impersonationLoadBalancerService-value",
|
||||||
ImpersonationClusterIPService: "impersonationClusterIPService-value",
|
ImpersonationClusterIPService: "impersonationClusterIPService-value",
|
||||||
ImpersonationTLSCertificateSecret: "impersonationTLSCertificateSecret-value",
|
ImpersonationTLSCertificateSecret: "impersonationTLSCertificateSecret-value",
|
||||||
@ -140,7 +137,7 @@ func TestFromPath(t *testing.T) {
|
|||||||
name: "Empty",
|
name: "Empty",
|
||||||
yaml: here.Doc(``),
|
yaml: here.Doc(``),
|
||||||
wantError: "validate names: missing required names: servingCertificateSecret, credentialIssuer, " +
|
wantError: "validate names: missing required names: servingCertificateSecret, credentialIssuer, " +
|
||||||
"apiService, impersonationConfigMap, impersonationLoadBalancerService, " +
|
"apiService, impersonationLoadBalancerService, " +
|
||||||
"impersonationClusterIPService, impersonationTLSCertificateSecret, impersonationCACertificateSecret, " +
|
"impersonationClusterIPService, impersonationTLSCertificateSecret, impersonationCACertificateSecret, " +
|
||||||
"impersonationSignerSecret, agentServiceAccount",
|
"impersonationSignerSecret, agentServiceAccount",
|
||||||
},
|
},
|
||||||
@ -151,7 +148,6 @@ func TestFromPath(t *testing.T) {
|
|||||||
names:
|
names:
|
||||||
servingCertificateSecret: pinniped-concierge-api-tls-serving-certificate
|
servingCertificateSecret: pinniped-concierge-api-tls-serving-certificate
|
||||||
credentialIssuer: pinniped-config
|
credentialIssuer: pinniped-config
|
||||||
impersonationConfigMap: impersonationConfigMap-value
|
|
||||||
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
||||||
impersonationClusterIPService: impersonationClusterIPService-value
|
impersonationClusterIPService: impersonationClusterIPService-value
|
||||||
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
||||||
@ -168,7 +164,6 @@ func TestFromPath(t *testing.T) {
|
|||||||
names:
|
names:
|
||||||
servingCertificateSecret: pinniped-concierge-api-tls-serving-certificate
|
servingCertificateSecret: pinniped-concierge-api-tls-serving-certificate
|
||||||
apiService: pinniped-api
|
apiService: pinniped-api
|
||||||
impersonationConfigMap: impersonationConfigMap-value
|
|
||||||
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
||||||
impersonationClusterIPService: impersonationClusterIPService-value
|
impersonationClusterIPService: impersonationClusterIPService-value
|
||||||
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
||||||
@ -185,7 +180,6 @@ func TestFromPath(t *testing.T) {
|
|||||||
names:
|
names:
|
||||||
credentialIssuer: pinniped-config
|
credentialIssuer: pinniped-config
|
||||||
apiService: pinniped-api
|
apiService: pinniped-api
|
||||||
impersonationConfigMap: impersonationConfigMap-value
|
|
||||||
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
||||||
impersonationClusterIPService: impersonationClusterIPService-value
|
impersonationClusterIPService: impersonationClusterIPService-value
|
||||||
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
||||||
@ -195,23 +189,6 @@ func TestFromPath(t *testing.T) {
|
|||||||
`),
|
`),
|
||||||
wantError: "validate names: missing required names: servingCertificateSecret",
|
wantError: "validate names: missing required names: servingCertificateSecret",
|
||||||
},
|
},
|
||||||
{
|
|
||||||
name: "Missing impersonationConfigMap name",
|
|
||||||
yaml: here.Doc(`
|
|
||||||
---
|
|
||||||
names:
|
|
||||||
servingCertificateSecret: pinniped-concierge-api-tls-serving-certificate
|
|
||||||
credentialIssuer: pinniped-config
|
|
||||||
apiService: pinniped-api
|
|
||||||
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
|
||||||
impersonationClusterIPService: impersonationClusterIPService-value
|
|
||||||
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
|
||||||
impersonationCACertificateSecret: impersonationCACertificateSecret-value
|
|
||||||
impersonationSignerSecret: impersonationSignerSecret-value
|
|
||||||
agentServiceAccount: agentServiceAccount-value
|
|
||||||
`),
|
|
||||||
wantError: "validate names: missing required names: impersonationConfigMap",
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
name: "Missing impersonationLoadBalancerService name",
|
name: "Missing impersonationLoadBalancerService name",
|
||||||
yaml: here.Doc(`
|
yaml: here.Doc(`
|
||||||
@ -220,7 +197,6 @@ func TestFromPath(t *testing.T) {
|
|||||||
servingCertificateSecret: pinniped-concierge-api-tls-serving-certificate
|
servingCertificateSecret: pinniped-concierge-api-tls-serving-certificate
|
||||||
credentialIssuer: pinniped-config
|
credentialIssuer: pinniped-config
|
||||||
apiService: pinniped-api
|
apiService: pinniped-api
|
||||||
impersonationConfigMap: impersonationConfigMap-value
|
|
||||||
impersonationClusterIPService: impersonationClusterIPService-value
|
impersonationClusterIPService: impersonationClusterIPService-value
|
||||||
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
||||||
impersonationCACertificateSecret: impersonationCACertificateSecret-value
|
impersonationCACertificateSecret: impersonationCACertificateSecret-value
|
||||||
@ -237,7 +213,6 @@ func TestFromPath(t *testing.T) {
|
|||||||
servingCertificateSecret: pinniped-concierge-api-tls-serving-certificate
|
servingCertificateSecret: pinniped-concierge-api-tls-serving-certificate
|
||||||
credentialIssuer: pinniped-config
|
credentialIssuer: pinniped-config
|
||||||
apiService: pinniped-api
|
apiService: pinniped-api
|
||||||
impersonationConfigMap: impersonationConfigMap-value
|
|
||||||
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
||||||
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
||||||
impersonationCACertificateSecret: impersonationCACertificateSecret-value
|
impersonationCACertificateSecret: impersonationCACertificateSecret-value
|
||||||
@ -254,7 +229,6 @@ func TestFromPath(t *testing.T) {
|
|||||||
servingCertificateSecret: pinniped-concierge-api-tls-serving-certificate
|
servingCertificateSecret: pinniped-concierge-api-tls-serving-certificate
|
||||||
credentialIssuer: pinniped-config
|
credentialIssuer: pinniped-config
|
||||||
apiService: pinniped-api
|
apiService: pinniped-api
|
||||||
impersonationConfigMap: impersonationConfigMap-value
|
|
||||||
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
||||||
impersonationClusterIPService: impersonationClusterIPService-value
|
impersonationClusterIPService: impersonationClusterIPService-value
|
||||||
impersonationCACertificateSecret: impersonationCACertificateSecret-value
|
impersonationCACertificateSecret: impersonationCACertificateSecret-value
|
||||||
@ -271,7 +245,6 @@ func TestFromPath(t *testing.T) {
|
|||||||
servingCertificateSecret: pinniped-concierge-api-tls-serving-certificate
|
servingCertificateSecret: pinniped-concierge-api-tls-serving-certificate
|
||||||
credentialIssuer: pinniped-config
|
credentialIssuer: pinniped-config
|
||||||
apiService: pinniped-api
|
apiService: pinniped-api
|
||||||
impersonationConfigMap: impersonationConfigMap-value
|
|
||||||
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
||||||
impersonationClusterIPService: impersonationClusterIPService-value
|
impersonationClusterIPService: impersonationClusterIPService-value
|
||||||
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
||||||
@ -288,7 +261,6 @@ func TestFromPath(t *testing.T) {
|
|||||||
servingCertificateSecret: pinniped-concierge-api-tls-serving-certificate
|
servingCertificateSecret: pinniped-concierge-api-tls-serving-certificate
|
||||||
credentialIssuer: pinniped-config
|
credentialIssuer: pinniped-config
|
||||||
apiService: pinniped-api
|
apiService: pinniped-api
|
||||||
impersonationConfigMap: impersonationConfigMap-value
|
|
||||||
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
||||||
impersonationClusterIPService: impersonationClusterIPService-value
|
impersonationClusterIPService: impersonationClusterIPService-value
|
||||||
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
||||||
@ -310,7 +282,7 @@ func TestFromPath(t *testing.T) {
|
|||||||
impersonationSignerSecret: impersonationSignerSecret-value
|
impersonationSignerSecret: impersonationSignerSecret-value
|
||||||
agentServiceAccount: agentServiceAccount-value
|
agentServiceAccount: agentServiceAccount-value
|
||||||
`),
|
`),
|
||||||
wantError: "validate names: missing required names: impersonationConfigMap, " +
|
wantError: "validate names: missing required names: " +
|
||||||
"impersonationTLSCertificateSecret, impersonationCACertificateSecret",
|
"impersonationTLSCertificateSecret, impersonationCACertificateSecret",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -325,7 +297,6 @@ func TestFromPath(t *testing.T) {
|
|||||||
servingCertificateSecret: pinniped-concierge-api-tls-serving-certificate
|
servingCertificateSecret: pinniped-concierge-api-tls-serving-certificate
|
||||||
credentialIssuer: pinniped-config
|
credentialIssuer: pinniped-config
|
||||||
apiService: pinniped-api
|
apiService: pinniped-api
|
||||||
impersonationConfigMap: impersonationConfigMap-value
|
|
||||||
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
||||||
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
||||||
impersonationCACertificateSecret: impersonationCACertificateSecret-value
|
impersonationCACertificateSecret: impersonationCACertificateSecret-value
|
||||||
@ -345,7 +316,6 @@ func TestFromPath(t *testing.T) {
|
|||||||
servingCertificateSecret: pinniped-concierge-api-tls-serving-certificate
|
servingCertificateSecret: pinniped-concierge-api-tls-serving-certificate
|
||||||
credentialIssuer: pinniped-config
|
credentialIssuer: pinniped-config
|
||||||
apiService: pinniped-api
|
apiService: pinniped-api
|
||||||
impersonationConfigMap: impersonationConfigMap-value
|
|
||||||
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
||||||
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
||||||
impersonationCACertificateSecret: impersonationCACertificateSecret-value
|
impersonationCACertificateSecret: impersonationCACertificateSecret-value
|
||||||
@ -365,7 +335,6 @@ func TestFromPath(t *testing.T) {
|
|||||||
servingCertificateSecret: pinniped-concierge-api-tls-serving-certificate
|
servingCertificateSecret: pinniped-concierge-api-tls-serving-certificate
|
||||||
credentialIssuer: pinniped-config
|
credentialIssuer: pinniped-config
|
||||||
apiService: pinniped-api
|
apiService: pinniped-api
|
||||||
impersonationConfigMap: impersonationConfigMap-value
|
|
||||||
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
||||||
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
||||||
impersonationCACertificateSecret: impersonationCACertificateSecret-value
|
impersonationCACertificateSecret: impersonationCACertificateSecret-value
|
||||||
@ -386,7 +355,6 @@ func TestFromPath(t *testing.T) {
|
|||||||
servingCertificateSecret: pinniped-concierge-api-tls-serving-certificate
|
servingCertificateSecret: pinniped-concierge-api-tls-serving-certificate
|
||||||
credentialIssuer: pinniped-config
|
credentialIssuer: pinniped-config
|
||||||
apiService: pinniped-api
|
apiService: pinniped-api
|
||||||
impersonationConfigMap: impersonationConfigMap-value
|
|
||||||
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
impersonationLoadBalancerService: impersonationLoadBalancerService-value
|
||||||
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
impersonationTLSCertificateSecret: impersonationTLSCertificateSecret-value
|
||||||
impersonationCACertificateSecret: impersonationCACertificateSecret-value
|
impersonationCACertificateSecret: impersonationCACertificateSecret-value
|
||||||
|
@ -33,12 +33,9 @@ type APIConfigSpec struct {
|
|||||||
|
|
||||||
// NamesConfigSpec configures the names of some Kubernetes resources for the Concierge.
|
// NamesConfigSpec configures the names of some Kubernetes resources for the Concierge.
|
||||||
type NamesConfigSpec struct {
|
type NamesConfigSpec struct {
|
||||||
ServingCertificateSecret string `json:"servingCertificateSecret"`
|
ServingCertificateSecret string `json:"servingCertificateSecret"`
|
||||||
CredentialIssuer string `json:"credentialIssuer"`
|
CredentialIssuer string `json:"credentialIssuer"`
|
||||||
APIService string `json:"apiService"`
|
APIService string `json:"apiService"`
|
||||||
|
|
||||||
// TODO: remove this key entirely
|
|
||||||
ImpersonationConfigMap string `json:"impersonationConfigMap"`
|
|
||||||
ImpersonationLoadBalancerService string `json:"impersonationLoadBalancerService"`
|
ImpersonationLoadBalancerService string `json:"impersonationLoadBalancerService"`
|
||||||
ImpersonationClusterIPService string `json:"impersonationClusterIPService"`
|
ImpersonationClusterIPService string `json:"impersonationClusterIPService"`
|
||||||
ImpersonationTLSCertificateSecret string `json:"impersonationTLSCertificateSecret"`
|
ImpersonationTLSCertificateSecret string `json:"impersonationTLSCertificateSecret"`
|
||||||
|
Loading…
Reference in New Issue
Block a user