From 3e166b3506fba0bfc01107ebcdd73ca60f963097 Mon Sep 17 00:00:00 2001
From: Ross Kirkpatrick <ross.kirkpatrick@suse.com>
Date: Tue, 9 Nov 2021 13:54:12 -0500
Subject: [PATCH] remove windows server 2004 SAC build step

---
 .drone.yml    | 78 ++-------------------------------------------------
 manifest.tmpl |  6 ----
 2 files changed, 2 insertions(+), 82 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 080cab4..0df7575 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -97,7 +97,7 @@ platform:
 
 steps:
   - name: hyperkube-windows-1809-pr
-    image: rancher/dapper:v0.5.6
+    image: rancher/dapper:v0.5.7
     commands:
       - "docker build -f Dockerfile.windows --build-arg SERVERCORE_VERSION=1809 ."
     volumes:
@@ -149,79 +149,6 @@ volumes:
       path: \\\\.\\pipe\\docker_engine
 ---
 kind: pipeline
-name: windows-2004-pr
-
-platform:
-  os: windows
-  arch: amd64
-  version: 2004
-
-# remove this and use upstream images when https://github.com/drone/drone-git/pull/25 is merged
-clone:
-  disable: true
-
-steps:
-  - name: clone
-    image: rancher/drone-images:git-2004
-  - name: hyperkube-windows-2004-pr
-    image: rancher/dapper:v0.5.6
-    commands:
-      - "docker build -f Dockerfile.windows --build-arg SERVERCORE_VERSION=2004 ."
-    volumes:
-      - name: docker_pipe
-        path: \\\\.\\pipe\\docker_engine
-    when:
-      event:
-        - pull_request
-
-volumes:
-  - name: docker_pipe
-    host:
-      path: \\\\.\\pipe\\docker_engine
----
-kind: pipeline
-name: windows-2004
-
-platform:
-  os: windows
-  arch: amd64
-  version: 2004
-
-# remove this and use upstream images when https://github.com/drone/drone-git/pull/25 is merged
-clone:
-  disable: true
-
-steps:
-  - name: clone
-    image: rancher/drone-images:git-2004
-  - name: publish-hyperkube-windows-2004
-    image: rancher/drone-images:docker-2004
-    settings:
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-      dockerfile: Dockerfile.windows
-      repo: rancher/hyperkube
-      tag: "${DRONE_TAG}-windows-2004"
-      build_args:
-        - SERVERCORE_VERSION=2004
-    volumes:
-      - name: docker_pipe
-        path: \\\\.\\pipe\\docker_engine
-    when:
-      instance:
-        - drone-publish.rancher.io
-      event:
-        - tag
-
-volumes:
-  - name: docker_pipe
-    host:
-      path: \\\\.\\pipe\\docker_engine
-
----
-kind: pipeline
 name: windows-20H2-pr
 
 platform:
@@ -237,7 +164,7 @@ steps:
   - name: clone
     image: rancher/drone-images:git-20H2
   - name: hyperkube-windows-20H2-pr
-    image: rancher/dapper:v0.5.6
+    image: rancher/dapper:v0.5.7
     commands:
       - "docker build -f Dockerfile.windows.20H2 --build-arg SERVERCORE_VERSION=20H2 ."
     volumes:
@@ -315,5 +242,4 @@ depends_on:
 - linux-amd64
 - linux-arm64
 - windows-1809
-- windows-2004
 - windows-20H2
diff --git a/manifest.tmpl b/manifest.tmpl
index b073018..2cd9d28 100644
--- a/manifest.tmpl
+++ b/manifest.tmpl
@@ -16,12 +16,6 @@ manifests:
       architecture: amd64
       os: windows
       version: 1809
-  -
-    image: rancher/hyperkube:{{build.tag}}-windows-2004
-    platform:
-      architecture: amd64
-      os: windows
-      version: 2004
   -
     image: rancher/hyperkube:{{build.tag}}-windows-20H2
     platform: