Skip to content
This repository was archived by the owner on Jan 11, 2023. It is now read-only.

check for kubernetesConfig nil #3164

Merged
merged 3 commits into from
Jun 5, 2018
Merged

check for kubernetesConfig nil #3164

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a59832
check for kubernetesConfig nil
jackfrancis Jun 4, 2018
d29b623
basic unit tests
jackfrancis Jun 4, 2018
4cf4470
check for nil Properties
jackfrancis Jun 4, 2018
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
2 changes: 1 addition & 1 deletion pkg/acsengine/engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,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.PrivateCluster != nil && helpers.IsTrueBoolPointer(properties.OrchestratorProfile.KubernetesConfig.PrivateCluster.Enabled) {
if properties.OrchestratorProfile.KubernetesConfig != nil && properties.OrchestratorProfile.KubernetesConfig.PrivateCluster != nil && helpers.IsTrueBoolPointer(properties.OrchestratorProfile.KubernetesConfig.PrivateCluster.Enabled) {
if properties.MasterProfile.Count > 1 {
// more than 1 master, use the internal lb IP
firstMasterIP := net.ParseIP(properties.MasterProfile.FirstConsecutiveStaticIP).To4()
Expand Down