consolidate windows agent image docker files

ReleaseNotes.md

@@ -11,9 +11,9 @@ additional questions or comments.
 
 Note : The agent version(s) below has dates (ciprod<mmddyyyy>), which indicate the agent build dates (not release dates)
 
-### 08/05/2020 -
-##### Version microsoft/oms:ciprod08052020 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod08052020 (linux)
-##### Version microsoft/oms:win-ciprod08052020 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod08052020 (windows)
+### 08/07/2020 -
+##### Version microsoft/oms:ciprod08072020 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod08072020 (linux)
+##### Version microsoft/oms:win-ciprod08072020 Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod08072020 (windows)
 ##### Code change log
 - Collection of KubeState metrics for deployments and HPA
 - Add the Proxy support for Windows agent

ReleaseProcess.md

@@ -15,7 +15,7 @@ Here are the high-level instructions to get the CIPROD`<MM><DD><YYYY>` image for
 4. If everything validated in DEV, make merge PR from ci_dev and ci_prod and merge once this reviewed by dev team
 6. Update following pipeline variables under ReleaseCandiate with version of chart and image tag
     - CIHELMCHARTVERSION <VersionValue> # For example, 2.7.4
-    - CIImageTagSuffix <ImageTag> # ciprod08052020 or ciprod08052020-1 etc.
+    - CIImageTagSuffix <ImageTag> # ciprod08072020 or ciprod08072020-1 etc.
 7. Merge ci_dev and ci_prod branch which will trigger automatic deployment of latest bits to CIPROD cluster with CIPROD`<MM><DD><YYYY>` image to test and scale cluters, AKS, AKS-Engine
    > Note: production image automatically pushed to CIPROD Public cloud ACR which will inturn replicated to Public cloud MCR.
 8. Validate all the scenarios against clusters in build subscription and scale clusters

charts/azuremonitor-containers/values.yaml

@@ -7,8 +7,8 @@
 omsagent:
   image:
     repo: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod"
-    tag: "ciprod08052020"
-    tagWindows: "win-ciprod08052020"
+    tag: "ciprod08072020"
+    tagWindows: "win-ciprod08072020"
     pullPolicy: IfNotPresent
     dockerProviderVersion: "10.0.0-4"
     agentVersion: "1.10.0.1"

kubernetes/linux/Dockerfile

@@ -2,7 +2,7 @@ FROM ubuntu:18.04
 MAINTAINER OMSContainers@microsoft.com
 LABEL vendor=Microsoft\ Corp \
     com.microsoft.product="Azure Monitor for containers"
-ARG IMAGE_TAG=ciprod08052020
+ARG IMAGE_TAG=ciprod08072020
 ENV AGENT_VERSION ${IMAGE_TAG}
 ENV tmpdir /opt
 ENV APPLICATIONINSIGHTS_AUTH NzAwZGM5OGYtYTdhZC00NThkLWI5NWMtMjA3ZjM3NmM3YmRi

kubernetes/omsagent.yaml

@@ -343,7 +343,7 @@ spec:
       serviceAccountName: omsagent
       containers:
         - name: omsagent
-          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod08052020"
+          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod08072020"
           imagePullPolicy: IfNotPresent
           resources:
             limits:
@@ -486,7 +486,7 @@ spec:
       serviceAccountName: omsagent
       containers:
         - name: omsagent
-          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod08052020"
+          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:ciprod08072020"
           imagePullPolicy: IfNotPresent
           resources:
             limits:
@@ -637,7 +637,7 @@ spec:
      serviceAccountName: omsagent
      containers:
        - name: omsagent-win
-         image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod08052020"
+         image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-ciprod08072020"
          imagePullPolicy: IfNotPresent
          resources:
           limits:

kubernetes/windows/Dockerfile

@@ -1,9 +1,36 @@
-FROM mcr.microsoft.com/azuremonitor/containerinsights/ciprod:winakslogbase-07022020
+FROM mcr.microsoft.com/windows/servercore:ltsc2019
 MAINTAINER OMSContainers@microsoft.com
 LABEL vendor=Microsoft\ Corp \
     com.microsoft.product="Azure Monitor for containers"
 
-ARG IMAGE_TAG=win-ciprod08052020
+ARG IMAGE_TAG=win-ciprod08072020
+
+# Do not split this into multiple RUN!
+# Docker creates a layer for every RUN-Statement
+RUN powershell -Command "Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))"
+# Fluentd depends on cool.io whose fat gem is only available for Ruby < 2.5, so need to specify --platform ruby when install Ruby > 2.5 and install msys2 to get dev tools
+RUN choco install -y ruby --version 2.6.5.1 --params "'/InstallDir:C:\ruby26'" \
+&& choco install -y msys2 --version 20190524.0.0.20191030 --params "'/NoPath /NoUpdate /InstallDir:C:\ruby26\msys64'" \
+&& choco install -y vim
+
+# gangams - optional MSYS2 update via ridk failing in merged docker file so skipping that since we dont need optional update
+RUN refreshenv \
+&& ridk install 3 \
+&& echo gem: --no-document >> C:\ProgramData\gemrc \
+&& gem install cool.io -v 1.5.4 --platform ruby \
+&& gem install oj -v 3.3.10 \
+&& gem install json -v 2.2.0 \
+&& gem install fluentd -v 1.10.2 \
+&& gem install win32-service -v 1.0.1 \
+&& gem install win32-ipc -v 0.7.0 \
+&& gem install win32-event -v 0.6.3 \
+&& gem install windows-pr -v 1.2.6 \
+&& gem install tomlrb -v 1.3.0 \
+&& gem install gyoku -v 1.3.1 \
+&& gem sources --clear-all
+
+# Remove gem cache and chocolatey
+RUN powershell -Command "Remove-Item -Force C:\ruby26\lib\ruby\gems\2.6.0\cache\*.gem; Remove-Item -Recurse -Force 'C:\ProgramData\chocolatey'"
 
 SHELL ["powershell"]