Merge pull request #15 from OctopusDeployLabs/deprecate-win2019

Remove win 2019 build
OctopusDeployLabs · Jan 25, 2024 · c31928a · c31928a
2 parents 4382e0a + 3c2fddf
commit c31928a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 102 deletions.
diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
@@ -16,7 +16,6 @@ jobs:
       GCLOUD_CLI_VERSION: ${{ steps.step1.outputs.GCLOUD_CLI_VERSION }}
       KUBECTL_MAJOR_MINOR_VERSION: ${{ steps.step1.outputs.KUBECTL_MAJOR_MINOR_VERSION }}
       CONTINUE: ${{ steps.step1.outputs.Continue }}
-      WIN2019_VERSION: ${{ steps.step1.outputs.WIN2019_VERSION }}
       WIN2022_VERSION: ${{ steps.step1.outputs.WIN2022_VERSION }}
     steps:    
     - uses: actions/checkout@v3
@@ -94,20 +93,15 @@ jobs:
             {
                 Write-Host "We need to upgrade the container to $versionToCompare"            
                 
-                Write-Host "Getting OS versions for windows 2022 and 2019"
-                $win2019_manifest = (docker manifest inspect --verbose "octopuslabs/workertools:latest-windows.2019" | ConvertFrom-Json)
-                $WIN2019_VERSION = $win2019_manifest.Descriptor.Platform.'os.version'
-                Write-Host "WIN2019_VERSION: $WIN2019_VERSION"
-
+                Write-Host "Getting OS versions for windows 2022"
                 $win2022_manifest = (docker manifest inspect --verbose "octopuslabs/workertools:latest-windows.2022" | ConvertFrom-Json)
                 $WIN2022_VERSION = $win2022_manifest.Descriptor.Platform.'os.version'
                 Write-Host "WIN2022_VERSION: $WIN2022_VERSION"
 
-                if([string]::IsNullOrWhiteSpace($WIN2019_VERSION) -or [string]::IsNullOrWhiteSpace($WIN2022_VERSION)) {
-                  throw "Could not establish OS versions for windows 2022 and 2019 needed for docker manifest"
+                if([string]::IsNullOrWhiteSpace($WIN2022_VERSION)) {
+                  throw "Could not establish OS versions for windows 2022 needed for docker manifest"
                 }
 
-                echo "WIN2019_VERSION=$WIN2019_VERSION" >> $env:GITHUB_OUTPUT
                 echo "WIN2022_VERSION=$WIN2022_VERSION" >> $env:GITHUB_OUTPUT
 
                 Write-Host "We have everything we need, continuing."
@@ -163,38 +157,7 @@ jobs:
     - name: Push the ubuntu.2204 latest image  
       run: docker push octopuslabs/k8s-workertools:latest-ubuntu.2204
       if: ${{ needs.get-version-number.outputs.CONTINUE == 'Yes' }}
-
-  build-win-2019:
-    needs: [get-version-number]
-    runs-on: windows-2019
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: DockerHub Login
-      env:
-        USERNAME: ${{ secrets.DOCKER_HUB_USER }}
-        PASSWORD: ${{ secrets.DOCKER_HUB_PAT }}
-      run: docker login --username ${env:USERNAME} --password "${env:PASSWORD}"
-      if: ${{ needs.get-version-number.outputs.CONTINUE == 'Yes' }}
-
-    - name: Build the win2019 image
-      env:
-        VERSION_NUMBER: ${{ needs.get-version-number.outputs.VERSION }}     
-        GCLOUD_CLI_VERSION: ${{ needs.get-version-number.outputs.GCLOUD_CLI_VERSION }}
-      run: docker build ./windows-2019 --build-arg GCLOUD_CLI_VERSION=${env:GCLOUD_CLI_VERSION} --tag octopuslabs/k8s-workertools:${env:VERSION_NUMBER}-windows.2019 --tag octopuslabs/k8s-workertools:latest-windows.2019
-      if: ${{ needs.get-version-number.outputs.CONTINUE == 'Yes' }}
-
-    - name: Push the win2019 version-specific image
-      env:
-        VERSION_NUMBER: ${{ needs.get-version-number.outputs.VERSION }}     
-      run: docker push octopuslabs/k8s-workertools:${env:VERSION_NUMBER}-windows.2019
-      if: ${{ needs.get-version-number.outputs.CONTINUE == 'Yes' }}
-
-    - name: Push the win2019 latest image  
-      run: docker push octopuslabs/k8s-workertools:latest-windows.2019
-      if: ${{ needs.get-version-number.outputs.CONTINUE == 'Yes' }}
-
+
   build-win-2022:
     needs: [get-version-number]
     runs-on: windows-2022
@@ -227,7 +190,7 @@ jobs:
       if: ${{ needs.get-version-number.outputs.CONTINUE == 'Yes' }}
 
   build-docker-manifest:
-    needs: [get-version-number, build-ubuntu, build-win-2019, build-win-2022]
+    needs: [get-version-number, build-ubuntu, build-win-2022]
     runs-on: ubuntu-latest
 
     steps:
@@ -239,15 +202,13 @@ jobs:
       if: ${{ needs.get-version-number.outputs.CONTINUE == 'Yes' }}
 
     - name: Create docker manifest for latest tag
-      run: docker manifest create octopuslabs/k8s-workertools:latest octopuslabs/k8s-workertools:latest-windows.2019 octopuslabs/k8s-workertools:latest-windows.2022 octopuslabs/k8s-workertools:latest-ubuntu.2204
+      run: docker manifest create octopuslabs/k8s-workertools:latest octopuslabs/k8s-workertools:latest-windows.2022 octopuslabs/k8s-workertools:latest-ubuntu.2204
       if: ${{ needs.get-version-number.outputs.CONTINUE == 'Yes' }}
 
     - name: Annotate docker manifest for latest tag
       env:
-        WIN2019_VERSION: ${{ needs.get-version-number.outputs.WIN2019_VERSION }}
         WIN2022_VERSION: ${{ needs.get-version-number.outputs.WIN2022_VERSION }}
       run: |
-       docker manifest annotate --os "windows" --os-version "$WIN2019_VERSION" --arch "amd64" "octopuslabs/k8s-workertools:latest" "octopuslabs/k8s-workertools:latest-windows.2019" && \
        docker manifest annotate --os "windows" --os-version "$WIN2022_VERSION" --arch "amd64" "octopuslabs/k8s-workertools:latest" "octopuslabs/k8s-workertools:latest-windows.2022"
       if: ${{ needs.get-version-number.outputs.CONTINUE == 'Yes' }}
 
@@ -258,16 +219,14 @@ jobs:
     - name: Create docker manifest for version-specific tag
       env:
         VERSION_NUMBER: ${{ needs.get-version-number.outputs.VERSION }}     
-      run: docker manifest create octopuslabs/k8s-workertools:$VERSION_NUMBER octopuslabs/k8s-workertools:$VERSION_NUMBER-windows.2019 octopuslabs/k8s-workertools:$VERSION_NUMBER-windows.2022 octopuslabs/k8s-workertools:$VERSION_NUMBER-ubuntu.2204
+      run: docker manifest create octopuslabs/k8s-workertools:$VERSION_NUMBER octopuslabs/k8s-workertools:$VERSION_NUMBER-windows.2022 octopuslabs/k8s-workertools:$VERSION_NUMBER-ubuntu.2204
       if: ${{ needs.get-version-number.outputs.CONTINUE == 'Yes' }}
 
     - name: Annotate docker manifest for version-specific tag
       env:
         VERSION_NUMBER: ${{ needs.get-version-number.outputs.VERSION }}  
-        WIN2019_VERSION: ${{ needs.get-version-number.outputs.WIN2019_VERSION }}
         WIN2022_VERSION: ${{ needs.get-version-number.outputs.WIN2022_VERSION }}
       run: |
-        docker manifest annotate --os "windows" --os-version "$WIN2019_VERSION" --arch "amd64" "octopuslabs/k8s-workertools:$VERSION_NUMBER" "octopuslabs/k8s-workertools:$VERSION_NUMBER-windows.2019" && \
         docker manifest annotate --os "windows" --os-version "$WIN2022_VERSION" --arch "amd64" "octopuslabs/k8s-workertools:$VERSION_NUMBER" "octopuslabs/k8s-workertools:$VERSION_NUMBER-windows.2022"
       if: ${{ needs.get-version-number.outputs.CONTINUE == 'Yes' }}
 

diff --git a/README.md b/README.md
@@ -12,7 +12,6 @@ The following images are built in this repo:
 - Ubuntu 22.04
 - Ubuntu 20.04 
 - Windows 2022 
-- Windows 2019 
 
 A new image will be built each time a new version of `kubectl` is created.  The version numbers will be based on the version of `kubectl`.
 

diff --git a/windows-2019/Dockerfile b/windows-2019/Dockerfile