Skip to content

fix(e2e): skip ValidateScriptlessPhase3 when CustomCATrustCerts is set #9013

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

Closed
mxj220 wants to merge 1 commit into from
+3 −1
Closed

fix(e2e): skip ValidateScriptlessPhase3 when CustomCATrustCerts is set #9013

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
4 changes: 3 additions & 1 deletion e2e/validators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2770,7 +2770,9 @@ func ValidateScriptlessNBCCSECmd(ctx context.Context, s *Scenario) {
// ValidateScriptlessPhase3 validates that there are not diffs between ANC generated cse cmd NBC cse cmd vars
func ValidateScriptlessPhase3(ctx context.Context, s *Scenario) {
s.T.Helper()
if s.Runtime.AKSNodeConfig != nil && s.Runtime.NBC.EnableScriptlessNBCCSECmd {
nbc := s.Runtime.NBC
if s.Runtime.AKSNodeConfig != nil && nbc.EnableScriptlessNBCCSECmd &&
(nbc.CustomCATrustConfig == nil || len(nbc.CustomCATrustConfig.CustomCATrustCerts) == 0) {
Comment on lines +2773 to +2775
logFile := "/var/log/azure/aks-node-controller.log"
if !fileHasContent(ctx, s, logFile, "env compare: no differences found between provision-config and nbc-cmd env vars") {
// Grep for all env-compare diff markers to show what's different.
Expand Down
Loading