This repository has been archived by the owner on Jan 11, 2023. It is now read-only.
auto-jumpbox provisioning for private clusters #2401
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
assigned 
CecileRobertMichon
changed the title
added 3 commits
March 7, 2018 16:49
jackfrancis
suggested changes
Mar 8, 2018
pkg/acsengine/engine.go
Outdated
| @@ -294,7 +294,7 @@ func GenerateKubeConfig(properties *api.Properties, location string) (string, er | |||
| kubeconfig := string(b) | |||
| // variable replacement | |||
| kubeconfig = strings.Replace(kubeconfig, "{{WrapAsVerbatim \"variables('caCertificate')\"}}", base64.StdEncoding.EncodeToString([]byte(properties.CertificateProfile.CaCertificate)), -1) | |||
| if properties.OrchestratorProfile.KubernetesConfig.EnablePrivateCluster { | |||
| if *properties.OrchestratorProfile.KubernetesConfig.PrivateCluster.Enabled { | |||
There was a problem hiding this comment.
We don't want the * reference here, if we want to have a simple boolean check (and if we know that properties.OrchestratorProfile.KubernetesConfig.PrivateCluster is non-nil), we can evaluate helpers.IsTrueBoolPointer(properties.OrchestratorProfile.KubernetesConfig.PrivateCluster.Enabled) as the if condition.
| return cs.Properties.OrchestratorProfile.KubernetesConfig.UseManagedIdentity | ||
| }, | ||
| "UseInstanceMetadata": func() bool { | ||
| return helpers.IsTrueBoolPointer(cs.Properties.OrchestratorProfile.KubernetesConfig.UseInstanceMetadata) |
There was a problem hiding this comment.
@jackfrancis is there any reason why this wasn't being done before that I'm not aware of? I also set a default
| @@ -93,6 +93,8 @@ const ( | |||
| DefaultReschedulerAddonEnabled = false | |||
| // DefaultRBACEnabled determines the acs-engine provided default for enabling kubernetes RBAC | |||
| DefaultRBACEnabled = true | |||
| // DefaultUseInstanceMetadata determines the acs-engine provided default for enabling Azure cloudprovider instance metadata service | |||
| DefaultUseInstanceMetadata = true | |||
There was a problem hiding this comment.
default value for UseInstanceMetadata is true
pkg/acsengine/defaults.go
Outdated
| @@ -443,6 +463,10 @@ func setOrchestratorDefaults(cs *api.ContainerService) { | |||
| a.OrchestratorProfile.KubernetesConfig.EnableSecureKubelet = pointerToBool(api.DefaultSecureKubeletEnabled) | |||
| } | |||
|
|
|||
| if a.OrchestratorProfile.KubernetesConfig.UseInstanceMetadata == nil { | |||
| a.OrchestratorProfile.KubernetesConfig.EnableSecureKubelet = pointerToBool(api.DefaultUseInstanceMetadata) | |||
There was a problem hiding this comment.
setting default for UseInstanceMetadata here
jackfrancis
approved these changes
Mar 8, 2018
| return cs.Properties.OrchestratorProfile.KubernetesConfig.UseManagedIdentity | ||
| }, | ||
| "UseInstanceMetadata": func() bool { | ||
| return helpers.IsTrueBoolPointer(cs.Properties.OrchestratorProfile.KubernetesConfig.UseInstanceMetadata) |
tesharp
pushed a commit
to tesharp/acs-engine
that referenced
this pull request
Mar 16, 2018
* add provision jumpbox flag * add jp to resources * fix osDisk resource * Add jumpbox parameters * fix broken link in docs * fix nil reference error for agent pool only * rename inconsistent params * handle nil jumpbox profile * Add support for storage account and managed disks * docs * update example files * missing } * fix typo in docs * use isTrueBoolPointer * keep instance metadata default * fix typo * check for nil private cluster
khaldoune
added a commit
to khaldoune/acs-engine
that referenced
this pull request
Mar 26, 2018
This reverts commit b0f5e38.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it: adds option to provision a jumpbox when enabling the private cluster. Some redesign of the private cluster config object.
Which issue this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close that issue when PR gets merged): fixes #221Special notes for your reviewer:
Release note: