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

fix: update Container monitoring add-on with 11012019 agent image changes #2318

Merged
jackfrancis merged 35 commits into from
Nov 19, 2019
Merged

fix: update Container monitoring add-on with 11012019 agent image changes #2318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
3a7228c
wip azstack containermonitoring updates
ganga1980 Oct 10, 2019
02a9a2f
doc updates
ganga1980 Oct 11, 2019
1694aef
updates related to latest version of container insights agent
ganga1980 Oct 13, 2019
cd4d635
Merge branch 'master' of https://github.com/Azure/aks-engine
ganga1980 Oct 13, 2019
c1f977b
update generated template with updated agent changes
ganga1980 Oct 13, 2019
b4c9ede
refact wsdomain function
ganga1980 Oct 13, 2019
504e103
getworkspacedomain to support azstack and supported envs
ganga1980 Oct 14, 2019
aa22af0
fix pr feedback
ganga1980 Oct 14, 2019
63f2940
add more error handling
ganga1980 Oct 15, 2019
b052684
Merge branch 'master' of https://github.com/Azure/aks-engine
ganga1980 Oct 15, 2019
4ce54b5
minor doc updates
ganga1980 Oct 15, 2019
c325497
push latest yamls
ganga1980 Oct 15, 2019
df4f592
add labels on health service and crd
ganga1980 Oct 15, 2019
e3d744e
Merge branch 'master' of https://github.com/Azure/aks-engine
ganga1980 Oct 16, 2019
2a1e3e4
Merge branch 'master' of https://github.com/Azure/aks-engine
ganga1980 Oct 16, 2019
17d0d3a
Merge branch 'master' of https://github.com/Azure/aks-engine
ganga1980 Oct 17, 2019
4709bb9
Merge branch 'master' of https://github.com/Azure/aks-engine
ganga1980 Oct 17, 2019
d595631
fix feedback on azure stack doc
ganga1980 Oct 17, 2019
622378e
Merge branch 'master' of https://github.com/Azure/aks-engine
ganga1980 Oct 18, 2019
1791630
update to latest version of omsagent image
ganga1980 Oct 18, 2019
38d7836
Merge branch 'master' of https://github.com/Azure/aks-engine
ganga1980 Oct 18, 2019
1ef7e20
fix lint error
ganga1980 Oct 21, 2019
2f03554
add deployment tests for china, usgov clouds
ganga1980 Oct 22, 2019
b9f2651
add more tests and move getworkspace domain to helpers
ganga1980 Oct 23, 2019
8fc4f87
fix test failure
ganga1980 Oct 23, 2019
bdd4cf5
add tests for newly added helper method
ganga1980 Oct 23, 2019
7ca3515
refactor the deployment tests
ganga1980 Oct 23, 2019
bb2dd05
updates for ciprod11012019 agent image
ganga1980 Nov 14, 2019
73c74b0
merge latest changes in upstream master
ganga1980 Nov 14, 2019
792717a
fix agent image tag
ganga1980 Nov 14, 2019
fa3e8e6
fix provider version
ganga1980 Nov 14, 2019
a76f53d
Merge branch 'master' of https://github.com/Azure/aks-engine
ganga1980 Nov 14, 2019
0efd648
revert generated file changes
ganga1980 Nov 15, 2019
48057d0
add newly generated files
ganga1980 Nov 15, 2019
0a8774d
add generated files after reloading new tools
ganga1980 Nov 15, 2019
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
3 changes: 1 addition & 2 deletions parts/k8s/containeraddons/1.16/kubernetesmasteraddons-omsagent-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ rules:
resources: ["pods", "events", "nodes", "namespaces", "services"]
verbs: ["list", "get", "watch"]
- apiGroups: ["extensions"]
resources: ["deployments"]
resources: ["replicasets"]
Comment thread
ganga1980 marked this conversation as resolved.
verbs: ["list"]
- apiGroups: ["azmon.container.insights"]
resources: ["healthstates"]
Expand Down Expand Up @@ -295,7 +295,6 @@ data:
max_retry_wait 9m
retry_mdm_post_wait_minutes 60
</match>

<match kubehealth.Signals**>
type out_oms
log_level debug
Expand Down
4 changes: 2 additions & 2 deletions parts/k8s/containeraddons/1.17/kubernetesmasteraddons-omsagent-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ rules:
resources: ["pods", "events", "nodes", "namespaces", "services"]
verbs: ["list", "get", "watch"]
- apiGroups: ["extensions"]
resources: ["deployments"]
resources: ["replicasets"]
verbs: ["list"]
- apiGroups: ["azmon.container.insights"]
resources: ["healthstates"]
Expand Down Expand Up @@ -236,7 +236,7 @@ data:
max_retry_wait 9m
</match>

<match oms.api.KubePerf**>
<match oms.api.KubePerf**>
type out_oms
log_level debug
num_threads 5
Expand Down
2 changes: 1 addition & 1 deletion parts/k8s/containeraddons/kubernetesmasteraddons-omsagent-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ rules:
resources: ["pods", "events", "nodes", "namespaces", "services"]
verbs: ["list", "get", "watch"]
- apiGroups: ["extensions"]
resources: ["deployments"]
resources: ["replicasets"]
verbs: ["list"]
- apiGroups: ["azmon.container.insights"]
resources: ["healthstates"]
Expand Down
8 changes: 4 additions & 4 deletions pkg/api/addons.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ func (cs *ContainerService) setAddonsConfig(isUpgrade bool) {
cloudSpecConfig := cs.GetCloudSpecConfig()
k8sComponents := K8sComponentsByVersionMap[o.OrchestratorVersion]
specConfig := cloudSpecConfig.KubernetesSpecConfig
omsagentImage := "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod10182019"
omsagentImage := "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod11012019"
var workspaceDomain string
if cs.Properties.IsAzureStackCloud() {
dependenciesLocation := string(cs.Properties.CustomCloudProfile.DependenciesLocation)
workspaceDomain = helpers.GetLogAnalyticsWorkspaceDomain(dependenciesLocation)
if strings.EqualFold(dependenciesLocation, "china") {
omsagentImage = "dockerhub.azk8s.cn/microsoft/oms:ciprod10182019"
omsagentImage = "dockerhub.azk8s.cn/microsoft/oms:ciprod11012019"
}
} else {
workspaceDomain = helpers.GetLogAnalyticsWorkspaceDomain(cloudSpecConfig.CloudName)
if strings.EqualFold(cloudSpecConfig.CloudName, "AzureChinaCloud") {
omsagentImage = "dockerhub.azk8s.cn/microsoft/oms:ciprod10182019"
omsagentImage = "dockerhub.azk8s.cn/microsoft/oms:ciprod11012019"
}
}
workspaceDomain = base64.StdEncoding.EncodeToString([]byte(workspaceDomain))
Expand Down Expand Up @@ -267,7 +267,7 @@ func (cs *ContainerService) setAddonsConfig(isUpgrade bool) {
Enabled: to.BoolPtr(DefaultContainerMonitoringAddonEnabled && !cs.Properties.IsAzureStackCloud()),
Config: map[string]string{
"omsAgentVersion": "1.10.0.1",
"dockerProviderVersion": "7.0.0-5",
"dockerProviderVersion": "7.0.0-6",
"schema-versions": "v1",
"clusterName": clusterDNSPrefix,
"workspaceDomain": workspaceDomain,
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/addons_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4079,7 +4079,7 @@ func TestSetAddonsConfig(t *testing.T) {
Enabled: to.BoolPtr(true),
Config: map[string]string{
"omsAgentVersion": "1.10.0.1",
"dockerProviderVersion": "7.0.0-5",
"dockerProviderVersion": "7.0.0-6",
"schema-versions": "v1",
"clusterName": "aks-engine-cluster",
"workspaceDomain": "b3BpbnNpZ2h0cy5henVyZS5jb20=",
Expand All @@ -4091,7 +4091,7 @@ func TestSetAddonsConfig(t *testing.T) {
MemoryRequests: "250Mi",
CPULimits: "150m",
MemoryLimits: "600Mi",
Image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod10182019",
Image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod11012019",
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/defaults_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ func TestAssignDefaultAddonImages(t *testing.T) {
ReschedulerAddonName: "k8s.gcr.io/rescheduler:v0.4.0",
MetricsServerAddonName: "k8s.gcr.io/metrics-server-amd64:v0.2.1",
NVIDIADevicePluginAddonName: "nvidia/k8s-device-plugin:1.11",
ContainerMonitoringAddonName: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod10182019",
ContainerMonitoringAddonName: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod11012019",
IPMASQAgentAddonName: "k8s.gcr.io/ip-masq-agent-amd64:v2.5.0",
AzureCNINetworkMonitoringAddonName: "mcr.microsoft.com/containernetworking/networkmonitor:v0.0.6",
DNSAutoscalerAddonName: "k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.1.1",
Expand Down
24 changes: 12 additions & 12 deletions pkg/api/k8s_versions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var k8sComponentVersions = map[string]map[string]string{
"tiller": "tiller:v2.13.1",
"rescheduler": "rescheduler:v0.4.0",
"aci-connector": "virtual-kubelet:latest",
ContainerMonitoringAddonName: "oms:ciprod10182019",
ContainerMonitoringAddonName: "oms:ciprod11012019",
AzureCNINetworkMonitoringAddonName: "networkmonitor:v0.0.6",
"cluster-autoscaler": "cluster-autoscaler:v1.16.2",
NVIDIADevicePluginAddonName: "k8s-device-plugin:1.11",
Expand Down Expand Up @@ -63,7 +63,7 @@ var k8sComponentVersions = map[string]map[string]string{
"tiller": "tiller:v2.13.1",
"rescheduler": "rescheduler:v0.4.0",
"aci-connector": "virtual-kubelet:latest",
ContainerMonitoringAddonName: "oms:ciprod10182019",
ContainerMonitoringAddonName: "oms:ciprod11012019",
AzureCNINetworkMonitoringAddonName: "networkmonitor:v0.0.6",
"cluster-autoscaler": "cluster-autoscaler:v1.16.2",
NVIDIADevicePluginAddonName: "k8s-device-plugin:1.11",
Expand Down Expand Up @@ -98,7 +98,7 @@ var k8sComponentVersions = map[string]map[string]string{
"tiller": "tiller:v2.13.1",
"rescheduler": "rescheduler:v0.4.0",
"aci-connector": "virtual-kubelet:latest",
ContainerMonitoringAddonName: "oms:ciprod10182019",
ContainerMonitoringAddonName: "oms:ciprod11012019",
AzureCNINetworkMonitoringAddonName: "networkmonitor:v0.0.6",
"cluster-autoscaler": "cluster-autoscaler:v1.15.3",
NVIDIADevicePluginAddonName: "k8s-device-plugin:1.11",
Expand Down Expand Up @@ -133,7 +133,7 @@ var k8sComponentVersions = map[string]map[string]string{
"tiller": "tiller:v2.13.1",
"rescheduler": "rescheduler:v0.4.0",
"aci-connector": "virtual-kubelet:latest",
ContainerMonitoringAddonName: "oms:ciprod10182019",
ContainerMonitoringAddonName: "oms:ciprod11012019",
AzureCNINetworkMonitoringAddonName: "networkmonitor:v0.0.6",
"cluster-autoscaler": "cluster-autoscaler:v1.14.6",
NVIDIADevicePluginAddonName: "k8s-device-plugin:1.11",
Expand Down Expand Up @@ -168,7 +168,7 @@ var k8sComponentVersions = map[string]map[string]string{
"tiller": "tiller:v2.13.1",
"rescheduler": "rescheduler:v0.4.0",
"aci-connector": "virtual-kubelet:latest",
ContainerMonitoringAddonName: "oms:ciprod10182019",
ContainerMonitoringAddonName: "oms:ciprod11012019",
AzureCNINetworkMonitoringAddonName: "networkmonitor:v0.0.6",
"cluster-autoscaler": "cluster-autoscaler:v1.13.7",
NVIDIADevicePluginAddonName: "k8s-device-plugin:1.11",
Expand Down Expand Up @@ -203,7 +203,7 @@ var k8sComponentVersions = map[string]map[string]string{
"tiller": "tiller:v2.13.1",
"rescheduler": "rescheduler:v0.4.0",
"aci-connector": "virtual-kubelet:latest",
ContainerMonitoringAddonName: "oms:ciprod10182019",
ContainerMonitoringAddonName: "oms:ciprod11012019",
AzureCNINetworkMonitoringAddonName: "networkmonitor:v0.0.6",
"cluster-autoscaler": "cluster-autoscaler:v1.12.8",
NVIDIADevicePluginAddonName: "k8s-device-plugin:1.11",
Expand Down Expand Up @@ -237,7 +237,7 @@ var k8sComponentVersions = map[string]map[string]string{
"tiller": "tiller:v2.13.1",
"rescheduler": "rescheduler:v0.4.0",
"aci-connector": "virtual-kubelet:latest",
ContainerMonitoringAddonName: "oms:ciprod10182019",
ContainerMonitoringAddonName: "oms:ciprod11012019",
AzureCNINetworkMonitoringAddonName: "networkmonitor:v0.0.6",
"cluster-autoscaler": "cluster-autoscaler:v1.3.9",
NVIDIADevicePluginAddonName: "k8s-device-plugin:1.11",
Expand Down Expand Up @@ -271,7 +271,7 @@ var k8sComponentVersions = map[string]map[string]string{
"tiller": "tiller:v2.13.1",
"rescheduler": "rescheduler:v0.3.1",
"aci-connector": "virtual-kubelet:latest",
ContainerMonitoringAddonName: "oms:ciprod10182019",
ContainerMonitoringAddonName: "oms:ciprod11012019",
AzureCNINetworkMonitoringAddonName: "networkmonitor:v0.0.6",
"cluster-autoscaler": "cluster-autoscaler:v1.2.5",
NVIDIADevicePluginAddonName: "k8s-device-plugin:1.10",
Expand Down Expand Up @@ -305,7 +305,7 @@ var k8sComponentVersions = map[string]map[string]string{
"tiller": "tiller:v2.13.1",
"rescheduler": "rescheduler:v0.3.1",
"aci-connector": "virtual-kubelet:latest",
ContainerMonitoringAddonName: "oms:ciprod10182019",
ContainerMonitoringAddonName: "oms:ciprod11012019",
AzureCNINetworkMonitoringAddonName: "networkmonitor:v0.0.6",
"cluster-autoscaler": "cluster-autoscaler:v1.1.2",
"k8s-dns-sidecar": "k8s-dns-sidecar-amd64:1.14.7",
Expand Down Expand Up @@ -338,7 +338,7 @@ var k8sComponentVersions = map[string]map[string]string{
"tiller": "tiller:v2.13.1",
"rescheduler": "rescheduler:v0.3.1",
"aci-connector": "virtual-kubelet:latest",
ContainerMonitoringAddonName: "oms:ciprod10182019",
ContainerMonitoringAddonName: "oms:ciprod11012019",
AzureCNINetworkMonitoringAddonName: "networkmonitor:v0.0.6",
"nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency,
"nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod,
Expand Down Expand Up @@ -369,7 +369,7 @@ var k8sComponentVersions = map[string]map[string]string{
"tiller": "tiller:v2.13.1",
"rescheduler": "rescheduler:v0.3.1",
"aci-connector": "virtual-kubelet:latest",
ContainerMonitoringAddonName: "oms:ciprod10182019",
ContainerMonitoringAddonName: "oms:ciprod11012019",
AzureCNINetworkMonitoringAddonName: "networkmonitor:v0.0.6",
"nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency,
"nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod,
Expand Down Expand Up @@ -400,7 +400,7 @@ var k8sComponentVersions = map[string]map[string]string{
"tiller": "tiller:v2.13.1",
"rescheduler": "rescheduler:v0.3.1",
"aci-connector": "virtual-kubelet:latest",
ContainerMonitoringAddonName: "oms:ciprod10182019",
ContainerMonitoringAddonName: "oms:ciprod11012019",
AzureCNINetworkMonitoringAddonName: "networkmonitor:v0.0.6",
"nodestatusfreq": DefaultKubernetesNodeStatusUpdateFrequency,
"nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod,
Expand Down
9 changes: 4 additions & 5 deletions pkg/engine/templates_generated.go
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions pkg/engine/testdata/key-vault-certs/kubernetes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,15 +196,15 @@
"containers": [
{
"name": "omsagent",
"image": "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod10182019",
"image": "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod11012019",
"cpuRequests": "110m",
"memoryRequests": "250Mi",
"cpuLimits": "150m",
"memoryLimits": "600Mi"
}
],
"config": {
"dockerProviderVersion": "7.0.0-5",
"dockerProviderVersion": "7.0.0-6",
"omsAgentVersion": "1.10.0.1"
}
},
Expand Down Expand Up @@ -528,4 +528,4 @@
]
}
}
}
}