Added scripts for build edge-proxy and iotedged images

builds/misc/images.yaml

@@ -38,6 +38,9 @@ jobs:
       - script: scripts/linux/buildDiagnostics.sh $(Build.Configuration)
         displayName: Build iotedge-diagnostics
 
+      - script: scripts/linux/buildEdgeProxy.sh
+        displayName: Build Edge Proxy
+
       - task: PublishBuildArtifacts@1
         displayName: 'Publish Artifacts'
         inputs:
@@ -47,79 +50,86 @@ jobs:
      # azureiotedge-diagnostics - Not Using Template for ARM64 because we have 2 different .NET Core.
       - task: Bash@3
         displayName: Build Image azureiotedge-diagnostics - aarch64
-        inputs: 
-           filePath: scripts/linux/buildImage.sh
-           arguments: -r $(registry.address) -u $(registry.user) -p $(registry.password) -i azureiotedge-diagnostics -n microsoft -P azureiotedge-diagnostics --target-arch aarch64
+        inputs:
+          filePath: scripts/linux/buildImage.sh
+          arguments: -r $(registry.address) -u $(registry.user) -p $(registry.password) -i azureiotedge-diagnostics -n microsoft -P azureiotedge-diagnostics --target-arch aarch64
+
+     # Edge Proxy - Not Using Template because it doesn't have .NET code
+      - task: Bash@3
+        displayName: Build Image - Edge Proxy - aarch64
+        inputs:
+          filePath: scripts/linux/buildImage.sh
+          arguments: -r $(registry.address) -u $(registry.user) -p $(registry.password) -i azureiotedge-proxy -n microsoft -P azureiotedge-proxy --target-arch aarch64
 
     # Edge Agent - Not Using Template for ARM64 because we have 2 different .NET Core.
       - task: Bash@3
         displayName: Build Edge Agent Image - aarch64
-        inputs: 
+        inputs:
            filePath: scripts/linux/buildImage.sh
            arguments: -r $(registry.address) -u $(registry.user) -p $(registry.password) -i azureiotedge-agent -n microsoft -P Microsoft.Azure.Devices.Edge.Agent.Service --target-arch aarch64
 
      # Edge Hub - Not Using Template for ARM64 because we have 2 different .NET Core.
       - task: Bash@3
         displayName: Build Edge Hub Image - aarch64
-        inputs: 
+        inputs:
            filePath: scripts/linux/buildImage.sh
            arguments: -r $(registry.address) -u $(registry.user) -p $(registry.password) -i azureiotedge-hub -n microsoft -P Microsoft.Azure.Devices.Edge.Hub.Service --target-arch aarch64
 
      # Simulated Temperature Sensor - Not Using Template for ARM64 because we have 2 different .NET Core.
       - task: Bash@3
         displayName: Build Image Temperature Sensor - aarch64
-        inputs: 
+        inputs:
            filePath: scripts/linux/buildImage.sh
-           arguments: -r $(registry.address) -u $(registry.user) -p $(registry.password) -i azureiotedge-simulated-temperature-sensor -n microsoft -P SimulatedTemperatureSensor --target-arch aarch64     
+           arguments: -r $(registry.address) -u $(registry.user) -p $(registry.password) -i azureiotedge-simulated-temperature-sensor -n microsoft -P SimulatedTemperatureSensor --target-arch aarch64
 
       # Temperature Filter - Not Using Template for ARM64 because we have 2 different .NET Core.
       - task: Bash@3
         displayName: Build Image Temperature Filter - aarch64
-        inputs: 
+        inputs:
            filePath: scripts/linux/buildImage.sh
-           arguments: -r $(registry.address) -u $(registry.user) -p $(registry.password) -i azureiotedge-temperature-filter -n microsoft -P TemperatureFilter --target-arch aarch64     
-           
+           arguments: -r $(registry.address) -u $(registry.user) -p $(registry.password) -i azureiotedge-temperature-filter -n microsoft -P TemperatureFilter --target-arch aarch64
+
       # Load Gen - Not Using Template for ARM64 because we have 2 different .NET Core.
       - task: Bash@3
         displayName: Build Image Load Gen - aarch64
-        inputs: 
+        inputs:
            filePath: scripts/linux/buildImage.sh
-           arguments: -r $(registry.address) -u $(registry.user) -p $(registry.password) -i azureiotedge-load-gen -n microsoft -P load-gen --target-arch aarch64     
-           
+           arguments: -r $(registry.address) -u $(registry.user) -p $(registry.password) -i azureiotedge-load-gen -n microsoft -P load-gen --target-arch aarch64
+
       # Messages Analyzer - Not Using Template for ARM64 because we have 2 different .NET Core.
       - task: Bash@3
         displayName: Build Image Messages Analyzer - aarch64
-        inputs: 
+        inputs:
            filePath: scripts/linux/buildImage.sh
-           arguments: -r $(registry.address) -u $(registry.user) -p $(registry.password) -i azureiotedge-analyzer -n microsoft -P MessagesAnalyzer --target-arch aarch64     
+           arguments: -r $(registry.address) -u $(registry.user) -p $(registry.password) -i azureiotedge-analyzer -n microsoft -P MessagesAnalyzer --target-arch aarch64
 
-      # Functions Sample - Not Using Template for ARM64 because we have 2 different .NET Core.//TODO: Enable this once Functions supports arm64v8. Right now they are not ready. 
+      # Functions Sample - Not Using Template for ARM64 because we have 2 different .NET Core.//TODO: Enable this once Functions supports arm64v8. Right now they are not ready.
       #- task: Bash@3
       #  displayName: Build Image Functions Sample - aarch64
-      #  inputs: 
+      #  inputs:
       #     filePath: scripts/linux/buildImage.sh
-      #     arguments: -r $(registry.address) -u $(registry.user) -p $(registry.password) -i azureiotedge-functions-filter -n azureiotedge -P EdgeHubTriggerCSharp --target-arch aarch64     
+      #     arguments: -r $(registry.address) -u $(registry.user) -p $(registry.password) -i azureiotedge-functions-filter -n azureiotedge -P EdgeHubTriggerCSharp --target-arch aarch64
 
       # Direct Method Sender - Not Using Template for ARM64 because we have 2 different .NET Core.
       - task: Bash@3
         displayName: Build Image Direct Method Sender - aarch64
-        inputs: 
+        inputs:
            filePath: scripts/linux/buildImage.sh
-           arguments: -r $(registry.address) -u $(registry.user) -p $(registry.password) -i azureiotedge-direct-method-sender -n microsoft -P DirectMethodSender --target-arch aarch64           
+           arguments: -r $(registry.address) -u $(registry.user) -p $(registry.password) -i azureiotedge-direct-method-sender -n microsoft -P DirectMethodSender --target-arch aarch64
 
       # Direct Method Receiver - Not Using Template for ARM64 because we have 2 different .NET Core.
       - task: Bash@3
         displayName: Build Image Direct Method Receiver - aarch64
-        inputs: 
+        inputs:
            filePath: scripts/linux/buildImage.sh
-           arguments: -r $(registry.address) -u $(registry.user) -p $(registry.password) -i azureiotedge-direct-method-receiver -n microsoft -P DirectMethodReceiver --target-arch aarch64           
+           arguments: -r $(registry.address) -u $(registry.user) -p $(registry.password) -i azureiotedge-direct-method-receiver -n microsoft -P DirectMethodReceiver --target-arch aarch64
 
       # Direct Method Cloud Sender - Not Using Template for ARM64 because we have 2 different .NET Core.
       - task: Bash@3
         displayName: Build Image Direct Method Cloud Sender - aarch64
-        inputs: 
+        inputs:
            filePath: scripts/linux/buildImage.sh
-           arguments: -r $(registry.address) -u $(registry.user) -p $(registry.password) -i azureiotedge-direct-method-cloud-sender -n microsoft -P DirectMethodCloudSender --target-arch aarch64           
+           arguments: -r $(registry.address) -u $(registry.user) -p $(registry.password) -i azureiotedge-direct-method-cloud-sender -n microsoft -P DirectMethodCloudSender --target-arch aarch64
 
 
 ################################################################################
@@ -154,6 +164,9 @@ jobs:
       - script: scripts/linux/buildDiagnostics.sh $(Build.Configuration)
         displayName: Build iotedge-diagnostics
 
+      - script: scripts/linux/buildEdgeProxy.sh
+        displayName: Build Edge Proxy
+
       - script: scripts/linux/createArtifactInfo.sh --output-folder '$(Build.BinariesDirectory)/publish' --build-number $(Build.BuildNumber)
         displayName: 'Create Artifact Info File'
 
@@ -170,6 +183,13 @@ jobs:
           imageName: azureiotedge-diagnostics
           project: azureiotedge-diagnostics
 
+      # Edge Proxy
+      - template: templates/image-linux.yaml
+        parameters:
+          name: Edge Proxy
+          imageName: azureiotedge-proxy
+          project: azureiotedge-proxy
+
       # Edge Agent
       - template: templates/image-linux.yaml
         parameters:
@@ -377,3 +397,5 @@ jobs:
       displayName: 'Publish Temperature Sensor Manifest'
     - script: scripts/linux/buildManifest.sh -r $(registry.address) -u $(registry.user) -p $(registry.password) -v $(Build.BuildNumber) -t $(System.DefaultWorkingDirectory)/edgelet/iotedge-diagnostics/docker/manifest.yaml.template -n microsoft --tags "$(tags)"
       displayName: 'Publish azureiotedge-diagnostics Manifest'
+    - script: scripts/linux/buildManifest.sh -r $(registry.address) -u $(registry.user) -p $(registry.password) -v $(Build.BuildNumber) -t $(System.DefaultWorkingDirectory)/edge-proxy/docker/manifest.yaml.template -n microsoft --tags "$(tags)"
+      displayName: 'Publish azureiotedge-proxy Manifest'

edge-proxy/README.md

@@ -0,0 +1,3 @@
+# Edge Proxy
+
+This project contains a proxy server for edge modules that runs in kubernetes environment.

edge-proxy/docker/linux/amd64/Dockerfile

@@ -0,0 +1,3 @@
+FROM traefik:v1.7.11-alpine
+COPY ./docker/linux/amd64/run.sh /
+CMD ["/run.sh"]

edge-proxy/docker/linux/arm32v7/Dockerfile

@@ -0,0 +1,3 @@
+FROM arm32v6/traefik:v1.7.11-alpine
+COPY ./docker/linux/arm32v7/run.sh /
+CMD ["/run.sh"]

edge-proxy/docker/linux/arm64v8/Dockerfile

@@ -0,0 +1,3 @@
+FROM arm64v8/traefik:v1.7.11-alpine
+COPY ./docker/linux/arm64v8/run.sh /
+CMD ["/run.sh"]

edge-proxy/docker/manifest.yaml.template

@@ -0,0 +1,18 @@
+image: __REGISTRY__/__NAMESPACE__/azureiotedge-proxy:__VERSION__
+tags: __TAGS__
+manifests:
+  -
+    image: __REGISTRY__/__NAMESPACE__/azureiotedge-proxy:__VERSION__-linux-amd64
+    platform:
+      architecture: amd64
+      os: linux
+  -
+    image: __REGISTRY__/__NAMESPACE__/azureiotedge-proxy:__VERSION__-linux-arm32v7
+    platform:
+      architecture: arm
+      os: linux
+  -
+    image: __REGISTRY__/__NAMESPACE__/azureiotedge-proxy:__VERSION__-linux-arm64v8
+    platform:
+      architecture: arm64
+      os: linux      

edge-proxy/src/run.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+set -e
+
+# read service account token from filesystem
+file="/var/run/secrets/kubernetes.io/serviceaccount/token"
+if [[ -e ${file} ]]
+then
+    token=`cat ${file}`
+else
+    echo "Could not find file ${file}"
+fi
+
+config_src="/etc/traefik/traefik.toml"
+if [[ ! -e ${config_src} ]]
+then
+    echo "Could not find config ${config_src}"
+    exit 1
+fi
+
+# move traefik config to a new place to allow modification
+config_dst="/traefik.toml"
+cp ${config_src} ${config_dst}
+
+# find TOKEN placeholders and replace them with a token value
+if [[ ! -z ${token} ]]
+then
+    sed -i -e 's/__TOKEN__/'${token}'/g' ${config_dst}
+fi
+
+# call traefik entry point script with a new config
+/entrypoint.sh -c /traefik.toml

scripts/linux/buildEdgeProxy.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# This script copies the edge-proxy executable files that goes into the azureiotedge-proxy image,
+# for each supported arch (x86_64, arm32v7, arm64v8).
+# It then publishes executable files along with their corresponding dockerfiles to the publish directory,
+# so that buildImage.sh can build the container image.
+
+VERSIONINFO_FILE_PATH=$BUILD_REPOSITORY_LOCALPATH/versionInfo.json
+PUBLISH_FOLDER=$BUILD_BINARIESDIRECTORY/publish
+export VERSION="$(cat "$VERSIONINFO_FILE_PATH" | jq '.version' -r)"
+
+mkdir -p $PUBLISH_FOLDER/azureiotedge-proxy/
+cp -R $BUILD_REPOSITORY_LOCALPATH/edge-proxy/docker $PUBLISH_FOLDER/azureiotedge-proxy/docker
+
+cp $BUILD_REPOSITORY_LOCALPATH/edge-proxy/src/run.sh $PUBLISH_FOLDER/azureiotedge-proxy/docker/linux/amd64/
+cp $BUILD_REPOSITORY_LOCALPATH/edge-proxy/src/run.sh $PUBLISH_FOLDER/azureiotedge-proxy/docker/linux/arm32v7/
+cp $BUILD_REPOSITORY_LOCALPATH/edge-proxy/src/run.sh $PUBLISH_FOLDER/azureiotedge-proxy/docker/linux/arm64v8/