Users/rowagne/updating agent pool

.travis.yml

@@ -7,7 +7,7 @@ install:
 - docker build -t docker-gc-helm-chart-validate -f Dockerfile.helmtest .
 
 script:
-- docker build -t jackil/docker-gc -f Dockerfile .
+- docker build -t src/docker-cache-cleaner -f Dockerfile .
 
 after_success:
-- docker build -t jackil/docker-gc -f Dockerfile .
+- docker build -t src/docker-cache-cleaner -f Dockerfile .

.vscode/launch.json

@@ -10,7 +10,7 @@
              "request": "launch",
              "preLaunchTask": "build",
              // If you have changed target frameworks, make sure to update the program path.
-             "program": "${workspaceRoot}/DockerGC/bin/Debug/netcoreapp2.0/DockerGC.dll",
+             "program": "${workspaceRoot}/DockerGC/bin/Debug/netcoreapp5.0/DockerGC.dll",
              "args": [],
              "cwd": "${workspaceRoot}",
              // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window

README.md

@@ -112,4 +112,6 @@ For custom configurations, please head to values.yaml.
 
 docker-gc.service is an example of using it with fleet.
 
+## Run and create namespace
 
+helm install --generate-name jackil-docker-gc -n <namespace> --create-namespace

deploy/specs/all-base.yaml

@@ -0,0 +1,60 @@
+---
+# --- ABSTRACT ALL BASE ---
+# -------------------------
+envs:
+  all-base:
+    abstract: true
+    spec:
+      __name__: ~ # spec will inject the env name as env.__name__
+#-----apps
+      apps:
+        __base__: # the __base__ app gets inherited by all other apps
+          __name__: ~ # this instructs conf to inject the app name as app.__name__
+          __anchor__: app
+          build:
+            __base__:
+              publish: false # infra repo opted-out from msftkube builds
+            docker:
+              __omit_base__: [ 'publish' ] # do not inherit this setting
+              builds:
+                __base__: # this __base__ docker build gets inherited by all docker builds
+                  dir: "{{app.build.dotnet.outdir}}"
+                  checksum: True  # with <Deterministic>true</Deterministic>, always checksum the dir
+                  # if a savePath is specified in docker build def then a tarball of the image will be saved into the image. It can be quite big.
+                  # savePath: "{{paths.drop}}/docker/images/{{app.__name__}}.tar.gz"
+          k8s:
+            source: "{{paths.k8s.source}}/{{app.__name__}}.yaml"
+            destinationDirectory: "{{paths.k8s.dest}}"
+            parameters:
+              replicaCount: 2
+          azure:
+            __base__: # base here is the type of azure resource: sql, acs, etc
+              __base__: # base is a specific named azure resource: sql-server-01, cluster-01, storage-01
+                subscription: "{{deploy.azure.subscription}}"
+                region: "{{deploy.azure.region}}"
+                group: "{{deploy.azure.group}}"
+        docker-cache-cleaner:
+          k8s:
+            parameters:
+              namespace: docker-cache-cleaner
+              fullname: docker-cache-cleaner
+              chartName: docker-cache-cleaner
+              imagePullPolicy: IfNotPresent
+              allowMissingResourceFiles: True
+              recyclingStrategy: ByDate
+              dockerEndpoint: unix:///var/run/docker.sock
+              executionIntervalInMinutes: 360
+              dockerClientTimeoutInSeconds: 180
+              imageDeletionOrder: ByImageLastTouchDate
+              strategy: ByDate
+              daysBeforeDeletion: 1
+              containerStateBlacklist: dead,exited
+              socketPath: /var/run/docker.sock
+              volumeName: docker-volume
+          resources:
+            limits:
+              cpu: 100m
+              memory: 128Mi
+            requests:
+              cpu: "0"
+              memory: 128Mi

deploy/specs/build.yaml

@@ -0,0 +1,14 @@
+apps:
+  __base__: # this __base__ app gets inherited by all other apps
+    __name__: ~ # this instructs spec to inject the app name as app.__name__
+    __anchor__: app
+    icm:
+      routingId: Vienna-MIR
+  docker-cache-cleaner:
+    deploymentGroups:
+      - "default"
+    build:
+      docker:
+        builds:
+          docker-cache-cleaner:
+            dir: "{{paths.src}}"

deploy/specs/path.yaml

@@ -0,0 +1,11 @@
+paths:
+  acs:
+    source: "{{paths.root}}/deploy/templates/acs"
+    dest: "{{paths.drop}}/arm"
+  k8s:
+    source: "{{paths.root}}/deploy/templates/k8s"
+    dest: "{{paths.drop}}/k8s"
+  helm:
+    source: "{{paths.root}}/deploy/templates/helm"
+    dest: "{{paths.drop}}/helm"
+  src: "{{paths.root}}/src"

deploy/specs/publish.yaml

@@ -0,0 +1,9 @@
+publish:
+  azure:
+    keyvault: 
+      name: vienna-test-westus
+  docker:
+    registry:
+      name: viennadroptest
+      resourceGroup: viennadroptest
+      subscription: ad203158-bc5d-4e72-b764-2607833a71dc

deploy/templates/helm/docker-cache-cleaner-values.yaml

@@ -0,0 +1,33 @@
+# Default values for docker-gc.
+image:
+  repository: viennadroptest.azurecr.io/docker-cache-cleaner
+  tag: "{{app.drop.images.docker-cache-cleaner.tag}}"
+  pullPolicy: IfNotPresent
+docker:
+  socketPath: /var/run/docker.sock
+  volumeName: docker-volume
+fullname: docker-cache-cleaner
+fullnameOverride: docker-cache-cleaner
+nameOverride: docker-cache-cleaner
+statsd:
+  enabled: false
+  #host: localhost
+  #port: 8125
+config:
+  dockerEndpoint: unix:///var/run/docker.sock
+  executionIntervalInMinutes: 360
+  dockerClientTimeoutInSeconds: 180
+  imageDeletionOrder: ByImageLastTouchDate
+  strategy: ByDate
+  daysBeforeDeletion: 1
+  containerStateBlacklist: dead,exited
+nodeSelector:
+  beta.kubernetes.io/os: linux
+resources:
+  limits:
+    cpu: 100m
+    memory: 128Mi
+  requests:
+    cpu: "0"
+    memory: 128Mi
+

deploy/templates/k8s/docker-cache-cleaner.yaml

@@ -0,0 +1,61 @@
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: "{{app.k8s.parameters.fullname}}"
+  namespace: "{{app.k8s.parameters.namespace}}"
+  labels:
+    app: "{{app.k8s.parameters.fullname}}"
+    chart: "{{app.k8s.parameters.chartName}}"
+spec:
+  selector:
+    matchLabels:
+      app: docker-cache-cleaner
+  template:
+    metadata:
+      labels:
+        app: docker-cache-cleaner
+    spec:
+      containers:
+      - name: "{{app.k8s.parameters.fullname}}"
+        image: "{{publish.docker.registry.hostname}}/{{app.drop.images.docker-cache-cleaner.name}}:{{app.drop.images.docker-cache-cleaner.tag}}"
+        imagePullPolicy: "{{app.k8s.parameters.imagePullPolicy}}"
+        resources:
+          limits:
+            cpu: "{{app.resources.limits.cpu}}"
+            memory: "{{app.resources.limits.memory}}"
+          requests:
+            cpu: "{{app.resources.requests.cpu}}"
+            memory: "{{app.resources.requests.memory}}"
+        env:
+        - name: DOCKERGC_RECYCLING_STRATEGY
+          value: "{{app.k8s.parameters.recyclingStrategy}}"
+        - name: DOCKERGC_EXECUTION_INTERVAL_IN_MINUTES
+          value: "{{app.k8s.parameters.executionIntervalInMinutes}}"
+        - name: DOCKERGC_DOCKER_ENDPOINT
+          value: "{{app.k8s.parameters.dockerEndpoint}}"
+        - name: DOCKERGC_CONTAINER_STATE_BLACKLIST
+          value: "{{app.k8s.parameters.containerStateBlacklist}}"
+        - name: DOCKERGC_IMAGE_DELETION_ORDER
+          value: "{{app.k8s.parameters.imageDeletionOrder}}"
+        - name: DOCKERGC_DOCKER_CLIENT_TIMEOUT_IN_SECONDS
+          value: "{{app.k8s.parameters.dockerClientTimeoutInSeconds}}"
+        - name: DOCKERGC_DAYS_BEFORE_DELETION
+          value: "{{app.k8s.parameters.daysBeforeDeletion}}"
+        volumeMounts:
+         - mountPath: "{{app.k8s.parameters.socketPath}}"
+           name: "{{app.k8s.parameters.volumeName}}"
+      nodeSelector:
+        beta.kubernetes.io/os: linux
+      tolerations:
+      - effect: NoSchedule
+        operator: Exists
+      - effect: NoExecute
+        operator: Exists
+      volumes:
+       - name: "{{app.k8s.parameters.volumeName}}"
+         hostPath:
+          path: "{{app.k8s.parameters.socketPath}}"
+  updateStrategy:
+    rollingUpdate:
+      maxUnavailable: 100%
+    type: RollingUpdate

scripts/task.py

@@ -0,0 +1,59 @@
+# pylint: disable=locally-disabled,line-too-long,missing-docstring
+import os
+import argparse
+import logging
+import shutil
+
+import msftkube as mk
+
+mk.steps.acs.TEMPLATE_TRANSFORMERS = [
+    # _transformer_encrypt_storages,
+    # mk.steps.acs._transformer_do_not_use_port_22,
+    # _transformer_add_security_extension,
+    mk.steps.acs._parameters_change_to_keyvault_reference('servicePrincipalClientId'),
+    mk.steps.acs._parameters_change_to_keyvault_reference('sshRSAPublicKey'),
+    mk.steps.acs._parameters_change_to_keyvault_reference('servicePrincipalClientSecret')
+]
+
+def main():
+
+    commands = mk.commands.DEFAULT_COMMANDS
+
+    context = mk.context.create(commands.keys())
+
+    # determine paths. Script could be in repository or a build drop
+    script_dir = os.path.dirname(__file__)
+    root_dir = os.path.abspath(os.path.join(script_dir, '..'))
+    if os.path.isdir(os.path.join(root_dir, 'src')):
+        # we are in repository
+        drop_dir = os.path.join(root_dir, 'build')
+        mk.util.ensure_dir(drop_dir)
+        def copy_scripts_into_drop(spec, context): # pylint: disable=unused-argument
+            mk.logger.info('task.py - Copying scripts into drop folder')
+            scripts_dest = os.path.join(drop_dir, 'scripts')
+            mk.util.copytree_clobber(script_dir, scripts_dest)
+            mk.util.copytree_clobber(mk.__path__[0], os.path.join(scripts_dest, 'msftkube'))
+            mk.util.copytree_clobber(os.path.join(root_dir, 'deploy'), os.path.join(drop_dir, 'deploy'))
+        commands['publish'] += [copy_scripts_into_drop]
+    else:
+        # we are in a build drop outside of the repository
+        drop_dir = root_dir
+
+    mk.logger.info('task.py - Drop dir path is %s', drop_dir)
+
+    # write log file to drop
+    mk.logger.addFileHandler(os.path.join(drop_dir, 'build.log'))
+
+    # Seed spec from paths and args
+    seed_spec = {'paths': {'drop': drop_dir}}
+
+    # provide user args & context to steps
+
+    # read specs from files into spec
+    spec = mk.spec.create(root_dir, [seed_spec, os.path.join(root_dir, 'deploy', 'specs')])
+
+    # run any steps selected
+    mk.commands.execute(commands, spec, context)
+
+if __name__ == '__main__':
+    main()

scripts/task.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+set -ex
+
+PARENT_DIR=$(realpath `dirname $0`/..)
+
+python -m venv /tmp/aml-venv
+source /tmp/aml-venv/bin/activate
+wget -O - https://aka.ms/msftkube-bootstrapper.sh | bash
+
+cd $PARENT_DIR
+msftkube "$@"

DockerGC.Tests/DockerGC.Tests.csproj → src/DockerGC.Tests/DockerGC.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>

DockerGC/DockerGC.csproj → src/DockerGC/DockerGC.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Docker.DotNet" Version="3.125.0" />

Dockerfile → src/Dockerfile

@@ -1,15 +1,17 @@
-FROM microsoft/dotnet:2.0-sdk AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build-env
 WORKDIR /docker-gc
 
 COPY DockerGC ./
 
 RUN dotnet publish -c Release -o out
 
 # build runtime image
-FROM microsoft/dotnet:2.0-runtime 
+FROM mcr.microsoft.com/dotnet/runtime:5.0 
 WORKDIR /docker-gc
 COPY --from=build-env /docker-gc/out ./
 
+RUN apt update && apt upgrade -y && apt autoclean
+
 ENV DOCKERGC_DOCKER_ENDPOINT unix:///var/run/docker.sock
 ENV DOCKERGC_EXECUTION_INTERVAL_IN_MINUTES 720
 ENV DOCKERGC_DOCKER_CLIENT_TIMEOUT_IN_SECONDS 180

Dockerfile.helmtest → src/Dockerfile.helmtest

@@ -18,9 +18,9 @@ RUN /bin/helm init --client-only && /bin/helm repo update
 
 WORKDIR ["/bin/helm"]
 
-COPY helm-chart/jackil-docker-gc jackil-docker-gc
+COPY src/docker-cache-cleaner docker-cache-cleaner
 
-RUN MSG=$(helm lint jackil-docker-gc | grep "no failures")
+RUN MSG=$(helm lint docker-cache-cleaner | grep "no failures")
 
 RUN echo $MSG
 

Dockerfile.test → src/Dockerfile.test

@@ -1,6 +1,6 @@
 # DockerGC Unit Tests Dockerfile
 
-FROM microsoft/dotnet:2.0-sdk
+FROM mcr.microsoft.com/dotnet/sdk:5.0
 
 COPY DockerGC DockerGC
 COPY DockerGC.Tests DockerGC.Tests

src/docker-cache-cleaner/Chart.yaml

@@ -0,0 +1,12 @@
+name: docker-cache-cleaner
+description: A Docker Image Garbage Collector Helm chart for Kubernetes
+home: https://github.com/johndoe0920/docker-gc
+version: 1.0.0
+appVersion: 1.0.0
+sources:
+  - https://github.com/johndoe0920/docker-gc
+maintainers:
+  - name: Jiaqi Liu
+    email: jackil@Microsoft.com
+  - name: Ross Wagner
+    email: rowagne@microsoft.com