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

Update nbc contract: identityconfig, vmtype, nodepoolprofile #4208

Merged
merged 17 commits into from
Mar 29, 2024
+1,186 −1,326
Merged

Update nbc contract: identityconfig, vmtype, nodepoolprofile #4208

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
39b32ba
update nbc contract: identityconfig, vmtype, and nodepoolprofile
Mar 25, 2024
82559ff
change default vmtype to standard
Mar 25, 2024
c6e9fcb
Merge branch 'master' into lily/update-contract-identity-config
lilypan26 Mar 25, 2024
8ab66b0
add vmtype unspecified
Mar 25, 2024
3fcc491
Merge branch 'lily/update-contract-identity-config' of https://github…
Mar 25, 2024
2f59233
add back vm_size as top level field
Mar 26, 2024
aa05cb4
replace identityconfig with authconfig
Mar 26, 2024
8bf7226
group cluster config fields
Mar 27, 2024
96b373c
move vmtype and lbconfig to clusterconfig
Mar 27, 2024
eaced64
fix parser
Mar 28, 2024
f8006cc
Merge branch 'master' into lily/update-contract-identity-config
lilypan26 Mar 28, 2024
59bde8a
add comments
Mar 28, 2024
6f79fc8
Merge branch 'lily/update-contract-identity-config' of https://github…
Mar 28, 2024
dc587ca
Merge branch 'master' into lily/update-contract-identity-config
lilypan26 Mar 28, 2024
ebdec88
remove isSgxNode
Mar 29, 2024
2f4a709
Merge branch 'lily/update-contract-identity-config' of https://github…
Mar 29, 2024
b724971
Merge branch 'master' into lily/update-contract-identity-config
lilypan26 Mar 29, 2024
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
1 change: 0 additions & 1 deletion pkg/parser/utilities.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ func getBaseTemplate() *nbcontractv1.Configuration {
return &nbcontractv1.Configuration{
ProvisionOutput: "/var/log/azure/cluster-provision-cse-output.log",
LinuxAdminUsername: "azureuser",
TenantId: "",
KubernetesVersion: "1.26.0",
KubeBinaryConfig: &nbcontractv1.KubeBinaryConfig{
KubeBinaryUrl: "",
Expand Down
223 changes: 223 additions & 0 deletions pkg/proto/nbcontract/v1/authconfig.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions pkg/proto/nbcontract/v1/authconfig.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
syntax = "proto3";
package nbcontract.v1;

// Auth Config fields stored in azure.json used by cloud-provider-azure
message AuthConfig {
string target_cloud = 1; // set to cloud, default to AzurePublicCloud
string tenant_id = 2;
string subscription_id = 3;
string service_principal_id = 4; // set to aadClientId
string service_principal_secret = 5; // set to aadClientSecret
Comment on lines +9 to +10
Copy link
Contributor

Choose a reason for hiding this comment

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

At least these (and possibly others) can be unspecified. What pattern did we settle on for handling optional strings?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think we decided that unless we need to change the default value of just an empty string or need to handle the nil case specially, then there is no need to specify optional. In this case, not specifying it should have an empty string value so i excluded the optional.

string assigned_identity_id = 6; //could be user or system assigned, depending on the type
bool use_managed_identity_extension = 7; // default to false
}
Loading
Loading