-
Notifications
You must be signed in to change notification settings - Fork 558
Conversation
d3b3131
to
0fb8c4b
Compare
pkg/acsengine/defaults.go
Outdated
@@ -130,8 +131,13 @@ var ( | |||
}, | |||
//KubernetesSpecConfig - Due to Chinese firewall issue, the default containers from google is blocked, use the Chinese local mirror instead | |||
KubernetesSpecConfig: KubernetesSpecConfig{ | |||
KubernetesImageBase: "crproxy.trafficmanager.net:6000/google_containers/", | |||
TillerImageBase: "crproxy.trafficmanager.net:6000/kubernetes-helm/", | |||
KubernetesImageBase: "crproxy.trafficmanager.net:6000/google_containers/", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's punt on modifying the China cloud spec, we usually defer to the China team to manage this. If you'd like, you could open up an issue to add ACI connector addon capability to China cloud and we can work with them on it.
pkg/api/vlabs/types.go
Outdated
Name string `json:"name,omitempty"` | ||
Enabled *bool `json:"enabled,omitempty"` | ||
Containers []KubernetesContainerSpec `json:"containers,omitempty"` | ||
Environment []KubernetesEnvironmentSpec `json:"environment,omitempty"` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be great to make this a map[string]string
so it has general purpose value. KubernetesAddon
is meant to be a generic interface for configuring an addon.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How about Config map[string]string
`json:"config,omitempty"
29500f3
to
af68aa2
Compare
af68aa2
to
dfd4030
Compare
@@ -136,6 +137,7 @@ var kubernetesAddonYamls15 = map[string]string{ | |||
"MASTER_ADDON_KUBERNETES_DASHBOARD_DEPLOYMENT_B64_GZIP_STR": "kubernetesmasteraddons-kubernetes-dashboard-deployment1.5.yaml", | |||
masterAddonAzureStorageClasses: masterAddonAzureStorageClassesFileUnmanaged, | |||
"MASTER_ADDON_TILLER_DEPLOYMENT_B64_GZIP_STR": "kubernetesmasteraddons-tiller-deployment1.5.yaml", | |||
"MASTER_ADDON_ACI_CONNECTOR_DEPLOYMENT_B64_GZIP_STR": "kubernetesmasteraddons-aci-connector-deployment1.5.yaml", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we really need this separate file? I don't think we are supporting K8s 1.5 and your yaml is the same for the 1.5 and the non-1.5 version, yes?
pkg/acsengine/defaults.go
Outdated
DefaultACIConnectorAddonsConfig = api.KubernetesAddon{ | ||
Name: DefaultACIConnectorAddonName, | ||
Enabled: pointerToBool(api.DefaultACIConnectorAddonEnabled), | ||
Config: map[string]string{}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add the default vals to Config
here as well. E.g.,
Config: map[string]string{
"clientId": <defaultVal>,
"clientKey": <defaultVal>,
<etc...>
}
@@ -635,6 +635,10 @@ func convertAddonsToAPI(v *vlabs.KubernetesConfig, a *KubernetesConfig) { | |||
MemoryLimits: v.Addons[i].Containers[j].MemoryLimits, | |||
}) | |||
} | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@sozercan I added the below lines to adapt the KubernetesAddons default assignment convenience function to include Config
key/vals as well
5eb06b9
to
d02030b
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm, thanks @sozercan !
What this PR does / why we need it:
Adds ACI Connector as a configurable add-on in ACS-engine