Skip to content

Commit

Permalink
fix e2e compile errors
Browse files Browse the repository at this point in the history
  • Loading branch information
timmy-wright committed Nov 5, 2024
1 parent b5df8d3 commit bfbf0c2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
4 changes: 2 additions & 2 deletions e2e/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ func nbcToNbcContractV1(nbc *datamodel.NodeBootstrappingConfiguration) *aksnodec
KubeletFlags: aksnodeconfigv1.GetKubeletConfigFlag(nbc.KubeletConfig, cs, agentPool, false),
KubeletNodeLabels: aksnodeconfigv1.GetKubeletNodeLabels(agentPool),
},
TlsBootstrappingConfig: &aksnodeconfigv1.TLSBootstrappingConfig{
TlsBootstrappingToken: *nbc.KubeletClientTLSBootstrapToken,
BootstrappingConfig: &aksnodeconfigv1.BootstrappingConfig{
TlsBootstrappingToken: nbc.KubeletClientTLSBootstrapToken,
},
KubernetesCaCert: base64.StdEncoding.EncodeToString([]byte(cs.Properties.CertificateProfile.CaCertificate)),
KubeBinaryConfig: &aksnodeconfigv1.KubeBinaryConfig{
Expand Down
7 changes: 6 additions & 1 deletion e2e/validation.go
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,15 @@ func leakedSecretsValidators(scenario *Scenario) []*LiveVMValidator {
"bootstrap token": *scenario.Runtime.NBC.KubeletClientTLSBootstrapToken,
}
} else {
token := scenario.Runtime.AKSNodeConfig.BootstrappingConfig.TlsBootstrappingToken
strToken := ""
if token != nil {
strToken = *token
}
secrets = map[string]string{
"client private key": b64Encoded(scenario.Runtime.AKSNodeConfig.KubeletConfig.KubeletClientKey),
"service principal secret": b64Encoded(scenario.Runtime.AKSNodeConfig.AuthConfig.ServicePrincipalSecret),
"bootstrap token": scenario.Runtime.AKSNodeConfig.TlsBootstrappingConfig.TlsBootstrappingToken,
"bootstrap token": strToken,
}
}

Expand Down

0 comments on commit bfbf0c2

Please sign in to comment.