Skip to content

fix kes empty configuration #286

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

Merged
merged 2 commits into from
Sep 23, 2020
Merged

fix kes empty configuration #286

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44ecb6b
fix kes empty configuration
Alevsk Sep 23, 2020
29fd99b
Merge branch 'master' into kes-annotations-fox
dvaldivia Sep 23, 2020
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
9 changes: 2 additions & 7 deletions restapi/admin_tenants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,9 +514,7 @@ func getTenantCreatedResponse(session *models.Principal, params admin_api.Create
CredsSecret: &corev1.LocalObjectReference{
Name: secretName,
},
Env: envrionmentVariables,
KES: &operator.KESConfig{},
Console: &operator.ConsoleConfiguration{},
Env: envrionmentVariables,
},
}
idpEnabled := false
Expand Down Expand Up @@ -611,10 +609,7 @@ func getTenantCreatedResponse(session *models.Principal, params admin_api.Create
if err != nil {
return nil, prepareError(errorGeneric)
}
}

// Set Labels, Annotations and Node Selector for KES
if isEncryptionEnabled && tenantReq.Encryption != nil {
// Set Labels, Annotations and Node Selector for KES
minInst.Spec.KES.Labels = tenantReq.Encryption.Labels
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a possible NPE right? the minInst.Spec.KES could be nil any time

minInst.Spec.KES.Annotations = tenantReq.Encryption.Annotations
minInst.Spec.KES.NodeSelector = tenantReq.Encryption.NodeSelector
Expand Down