add WS2022, rm WS2004, bump versions

2025-12-06 07:49:17 +08:00 · 2021-11-09 14:49:21 -05:00
parent b6d9284175
commit 4f75e7f296
7 changed files with 209 additions and 208 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -8,7 +8,7 @@ platform:

 steps:
 - name: provisioning-tests
-  image: rancher/dapper:v0.5.4
+  image: rancher/dapper:v0.5.8
  commands:
  - dapper provisioning-tests
  privileged: true
@@ -40,7 +40,7 @@ platform:

 steps:
 - name: provisioning-tests
-  image: rancher/dapper:v0.5.4
+  image: rancher/dapper:v0.5.8
  commands:
  - dapper provisioning-tests-rke
  privileged: true
@@ -75,7 +75,7 @@ platform:

 steps:
 - name: build
-  image: rancher/dapper:v0.5.4
+  image: rancher/dapper:v0.5.8
  commands:
  - dapper ci
  privileged: true
@@ -89,7 +89,7 @@ steps:
    - tag

 - name: fossa-amd64
-  image: rancher/dapper:v0.5.4
+  image: rancher/dapper:v0.5.8
  failure: ignore
  environment:
    FOSSA_API_KEY:
@@ -111,7 +111,7 @@ steps:
      - tag

 - name: stage-binaries
-  image: rancher/dapper:v0.5.4
+  image: rancher/dapper:v0.5.8
  commands:
  - "cp -r ./bin/* ./package/"
  when:
@@ -371,7 +371,7 @@ platform:

 steps:
 - name: build
-  image: rancher/dapper:v0.5.4
+  image: rancher/dapper:v0.5.8
  commands:
  - dapper ci
  privileged: true
@@ -385,7 +385,7 @@ steps:
    - tag

 - name: stage-binaries
-  image: rancher/dapper:v0.5.4
+  image: rancher/dapper:v0.5.8
  commands:
  - "cp -r ./bin/* ./package/"
  when:
@@ -566,7 +566,7 @@ platform:
 steps:
  - name: build
    pull: always
-    image: rancher/dapper:v0.5.4
+    image: rancher/dapper:v0.5.8
    commands:
      - dapper.exe -f Dockerfile-windows.dapper -d ci
    volumes:
@@ -579,7 +579,7 @@ steps:
        - tag

  - name: stage-binaries
-    image: rancher/dapper:v0.5.4
+    image: rancher/dapper:v0.5.8
    commands:
      - "cp -r ./bin/* ./package/windows/"
    when:
@@ -667,124 +667,6 @@ trigger:

 ---
 kind: pipeline
-name: default-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
-    settings:
-      depth: 20
-  - name: build
-    pull: always
-    image: rancher/dapper:v0.5.4
-    commands:
-      - dapper.exe -f Dockerfile-windows.dapper -d ci
-    volumes:
-      - name: docker_pipe
-        path: \\\\.\\pipe\\docker_engine
-    when:
-      event:
-        - push
-        - pull_request
-        - tag
-
-  - name: stage-binaries
-    image: rancher/dapper:v0.5.4
-    commands:
-      - "cp -r ./bin/* ./package/windows/"
-    when:
-      event:
-        - push
-        - tag
-
-  - name: docker-publish-head-agent
-    image: rancher/drone-images:docker-2004
-    settings:
-      purge: false
-      build_args:
-        - SERVERCORE_VERSION=2004
-        - ARCH=amd64
-        - VERSION=${DRONE_BRANCH/release\//}-${DRONE_COMMIT}-head
-      context: package/windows
-      custom_dns: 1.1.1.1
-      dockerfile: package/windows/Dockerfile.agent
-      password:
-        from_secret: docker_password
-      repo: rancher/rancher-agent
-      tag: ${DRONE_BRANCH/release\//}-${DRONE_COMMIT}-windows-2004
-      username:
-        from_secret: docker_username
-    volumes:
-      - name: docker_pipe
-        path: \\\\.\\pipe\\docker_engine
-    when:
-      ref:
-        include:
-          - "refs/heads/master"
-          - "refs/heads/release/v*"
-      event:
-        - push
-
-  - name: docker-publish-agent
-    image: rancher/drone-images:docker-2004
-    settings:
-      purge: false
-      build_args:
-        - SERVERCORE_VERSION=2004
-        - ARCH=amd64
-        - "VERSION=${DRONE_TAG}"
-      context: package/windows
-      custom_dns: 1.1.1.1
-      dockerfile: package/windows/Dockerfile.agent
-      password:
-        from_secret: docker_password
-      repo: rancher/rancher-agent
-      tag: "${DRONE_TAG}-windows-2004"
-      username:
-        from_secret: docker_username
-    volumes:
-      - name: docker_pipe
-        path: \\\\.\\pipe\\docker_engine
-    when:
-      event:
-        - tag
-
-  - name: slack_notify
-    image: plugins/slack
-    settings:
-      template: "Build {{build.link}} failed to publish an image/artifact.\n"
-      username: Drone_Publish
-      webhook:
-        from_secret: slack_webhook
-    when:
-      event:
-        exclude:
-          - pull_request
-      instance:
-        - drone-publish.rancher.io
-      status:
-        - failure
-
-volumes:
-  - name: docker_pipe
-    host:
-      path: \\\\.\\pipe\\docker_engine
-
-trigger:
-  event:
-    exclude:
-      - promote
---
-kind: pipeline
 name: default-windows-20H2

 platform:
@@ -803,7 +685,7 @@ steps:
      depth: 20
  - name: build
    pull: always
-    image: rancher/dapper:v0.5.4
+    image: rancher/dapper:v0.5.8
    commands:
      - dapper.exe -f Dockerfile-windows.dapper -d ci
    volumes:
@@ -816,7 +698,7 @@ steps:
        - tag

  - name: stage-binaries
-    image: rancher/dapper:v0.5.4
+    image: rancher/dapper:v0.5.8
    commands:
      - "cp -r ./bin/* ./package/windows/"
    when:
@@ -902,7 +784,124 @@ trigger:
    exclude:
      - promote

+---
+kind: pipeline
+name: default-windows-ltsc2022

+platform:
+  os: windows
+  arch: amd64
+  version: 2022
+
+# 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-amd64-ltsc2022
+    settings:
+      depth: 20
+  - name: build
+    pull: always
+    image: rancher/dapper:v0.5.8
+    commands:
+      - dapper.exe -f Dockerfile-windows.dapper -d ci
+    volumes:
+      - name: docker_pipe
+        path: \\\\.\\pipe\\docker_engine
+    when:
+      event:
+        - push
+        - pull_request
+        - tag
+
+  - name: stage-binaries
+    image: rancher/dapper:v0.5.8
+    commands:
+      - "cp -r ./bin/* ./package/windows/"
+    when:
+      event:
+        - push
+        - tag
+
+  - name: docker-publish-head-agent
+    image: rancher/drone-images:docker-amd64-ltsc2022
+    settings:
+      purge: false
+      build_args:
+        - SERVERCORE_VERSION=ltsc2022
+        - ARCH=amd64
+        - VERSION=${DRONE_BRANCH/release\//}-${DRONE_COMMIT}-head
+      context: package/windows
+      custom_dns: 1.1.1.1
+      dockerfile: package/windows/Dockerfile.agent
+      password:
+        from_secret: docker_password
+      repo: rancher/rancher-agent
+      tag: ${DRONE_BRANCH/release\//}-${DRONE_COMMIT}-windows-ltsc2022
+      username:
+        from_secret: docker_username
+    volumes:
+      - name: docker_pipe
+        path: \\\\.\\pipe\\docker_engine
+    when:
+      ref:
+        include:
+          - "refs/heads/master"
+          - "refs/heads/release/v*"
+      event:
+        - push
+
+  - name: docker-publish-agent
+    image: rancher/drone-images:docker-amd64-ltsc2022
+    settings:
+      purge: false
+      build_args:
+        - SERVERCORE_VERSION=ltsc2022
+        - ARCH=amd64
+        - "VERSION=${DRONE_TAG}"
+      context: package/windows
+      custom_dns: 1.1.1.1
+      dockerfile: package/windows/Dockerfile.agent
+      password:
+        from_secret: docker_password
+      repo: rancher/rancher-agent
+      tag: "${DRONE_TAG}-windows-ltsc2022"
+      username:
+        from_secret: docker_username
+    volumes:
+      - name: docker_pipe
+        path: \\\\.\\pipe\\docker_engine
+    when:
+      event:
+        - tag
+
+  - name: slack_notify
+    image: plugins/slack
+    settings:
+      template: "Build {{build.link}} failed to publish an image/artifact.\n"
+      username: Drone_Publish
+      webhook:
+        from_secret: slack_webhook
+    when:
+      event:
+        exclude:
+          - pull_request
+      instance:
+        - drone-publish.rancher.io
+      status:
+        - failure
+
+volumes:
+  - name: docker_pipe
+    host:
+      path: \\\\.\\pipe\\docker_engine
+
+trigger:
+  event:
+    exclude:
+      - promote
 ---

 kind: pipeline
@@ -1019,7 +1018,7 @@ steps:
    - tag

 - name: build-chart
-  image: rancher/dapper:v0.5.4
+  image: rancher/dapper:v0.5.8
  commands:
  - dapper chart/ci
  privileged: true
@@ -1076,8 +1075,8 @@ depends_on:
 - default-linux-amd64
 - default-linux-arm64
 - default-windows-1809
- default-windows-2004
 - default-windows-20H2
+- default-windows-ltsc2022
 ---
 kind: pipeline
 name: docker-image-digests-linux-amd64
@@ -1088,7 +1087,7 @@ platform:

 steps:
 - name: docker-image-digests
-  image: rancher/drone-docker-image-digests:v0.0.11
+  image: rancher/drone-docker-image-digests:v0.0.12
  environment:
    PLUGIN_GITHUB_REPOSITORY: "rancher/rancher"
    PLUGIN_GITHUB_TOKEN:
@@ -1129,7 +1128,7 @@ platform:

 steps:
 - name: docker-image-digests
-  image: rancher/drone-docker-image-digests:v0.0.11
+  image: rancher/drone-docker-image-digests:v0.0.12
  environment:
    PLUGIN_GITHUB_REPOSITORY: "rancher/rancher"
    PLUGIN_GITHUB_TOKEN:
@@ -1172,7 +1171,7 @@ platform:

 steps:
 - name: docker-image-digests
-  image: rancher/drone-docker-image-digests:v0.0.11
+  image: rancher/drone-docker-image-digests:v0.0.12
  environment:
    PLUGIN_GITHUB_REPOSITORY: "rancher/rancher"
    PLUGIN_GITHUB_TOKEN:
@@ -1205,58 +1204,6 @@ depends_on:
 - default-linux-amd64
 - default-windows-1809

---
-kind: pipeline
-name: docker-image-digests-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: luthermonson/drone-git:windows-2004-amd64
-  settings:
-    depth: 20
-
- name: docker-image-digests
-  image: rancher/drone-docker-image-digests:v0.0.11
-  environment:
-    PLUGIN_GITHUB_REPOSITORY: "rancher/rancher"
-    PLUGIN_GITHUB_TOKEN:
-      from_secret: github_token
-    PLUGIN_GITHUB_TAG: "${DRONE_TAG}"
-    PLUGIN_INPUT_FILE: "rancher-windows-images.txt"
-    PLUGIN_OUTPUT_FILE: "rancher-images-digests-windows-2004.txt"
-    PLUGIN_REGISTRY: "docker.io"
-  volumes:
-    - name: docker_pipe
-      path: \\\\.\\pipe\\docker_engine
-  when:
-    instance:
-      include:
-      - drone-publish.rancher.io
-    event:
-    - tag
-
-volumes:
-  - name: docker_pipe
-    host:
-      path: \\\\.\\pipe\\docker_engine
-
-trigger:
-  event:
-    exclude:
-    - promote
-
-depends_on:
- default-linux-amd64
- default-windows-2004
 ---
 kind: pipeline
 name: docker-image-digests-windows-20H2
@@ -1272,12 +1219,12 @@ clone:

 steps:
 - name: clone
-  image: luthermonson/drone-git:windows-20H2-amd64
+  image: rancher/drone-images:git-20H2
  settings:
    depth: 1

 - name: docker-image-digests
-  image: rancher/drone-docker-image-digests:v0.0.11
+  image: rancher/drone-docker-image-digests:v0.0.12
  environment:
    PLUGIN_GITHUB_REPOSITORY: "rancher/rancher"
    PLUGIN_GITHUB_TOKEN:
@@ -1309,6 +1256,59 @@ trigger:
 depends_on:
 - default-linux-amd64
 - default-windows-20H2
+
+---
+kind: pipeline
+name: docker-image-digests-windows-ltsc2022
+
+platform:
+  os: windows
+  arch: amd64
+  version: 2022
+
+# 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-amd64-ltsc2022
+  settings:
+    depth: 1
+
+- name: docker-image-digests
+  image: rancher/drone-docker-image-digests:v0.0.12
+  environment:
+    PLUGIN_GITHUB_REPOSITORY: "rancher/rancher"
+    PLUGIN_GITHUB_TOKEN:
+      from_secret: github_token
+    PLUGIN_GITHUB_TAG: "${DRONE_TAG}"
+    PLUGIN_INPUT_FILE: "rancher-windows-images.txt"
+    PLUGIN_OUTPUT_FILE: "rancher-images-digests-windows-ltsc2022.txt"
+    PLUGIN_REGISTRY: "docker.io"
+  volumes:
+    - name: docker_pipe
+      path: \\\\.\\pipe\\docker_engine
+  when:
+    instance:
+      include:
+      - drone-publish.rancher.io
+    event:
+    - tag
+
+volumes:
+  - name: docker_pipe
+    host:
+      path: \\\\.\\pipe\\docker_engine
+
+trigger:
+  event:
+    exclude:
+    - promote
+
+depends_on:
+- default-linux-amd64
+- default-windows-ltsc2022
 ---
 kind: pipeline
 name: publish
@@ -1319,7 +1319,7 @@ platform:

 steps:
 - name: chart-promote
-  image: rancher/dapper:v0.5.4
+  image: rancher/dapper:v0.5.8
  commands:
  - dapper chart/copy
  volumes:
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,4 +2,5 @@
 # line endings. Windows users contributing to Go will need to use a
 # modern version of git and editors capable of LF line endings.

-*.go -text diff=golang
+*.go -text diff=golang
+* text eol=lf
--- a/Dockerfile-windows.dapper
+++ b/Dockerfile-windows.dapper
@@ -14,7 +14,7 @@ RUN pushd c:\; \
    popd;

 RUN pushd c:\; \
-    $URL = 'https://github.com/golangci/golangci-lint/releases/download/v1.41.1/golangci-lint-1.41.1-windows-amd64.zip'; \
+    $URL = 'https://github.com/golangci/golangci-lint/releases/download/v1.43.0/golangci-lint-1.43.0-windows-amd64.zip'; \
    \
    Write-Host ('Downloading golangci from {0} ...' -f $URL); \
    curl.exe -sfL $URL -o c:\golangci-lint.zip; \
@@ -26,14 +26,14 @@ RUN pushd c:\; \
    Remove-Item -Force -Recurse -Path c:\golangci-lint.zip; \
    \
    Write-Host 'Updating PATH ...'; \
-    [Environment]::SetEnvironmentVariable('PATH', ('c:\golangci-lint-1.41.1-windows-amd64\;{0}' -f $env:PATH), [EnvironmentVariableTarget]::Machine); \
+    [Environment]::SetEnvironmentVariable('PATH', ('c:\golangci-lint-1.43.0-windows-amd64\;{0}' -f $env:PATH), [EnvironmentVariableTarget]::Machine); \
    \
    Write-Host 'Complete.'; \
    popd;

 # upgrade git
 RUN pushd c:\; \
-    $URL = 'https://github.com/git-for-windows/git/releases/download/v2.33.0.windows.2/MinGit-2.33.0.2-64-bit.zip'; \
+    $URL = 'https://github.com/git-for-windows/git/releases/download/v2.33.1.windows.1/MinGit-2.33.1-64-bit.zip'; \
    \
    Write-Host ('Downloading git from {0} ...' -f $URL); \
    curl.exe -sfL $URL -o c:\git.zip; \
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -23,10 +23,10 @@ RUN curl -sLf https://github.com/rancher/machine/releases/download/${CATTLE_MACH
 ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH_arm64=arm64 GOLANG_ARCH=GOLANG_ARCH_${ARCH} \
    GOPATH=/go PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash

-RUN curl -sLf https://storage.googleapis.com/golang/go1.16.6.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local
+RUN curl -sLf https://storage.googleapis.com/golang/go1.16.9.linux-${!GOLANG_ARCH}.tar.gz | tar -xzf - -C /usr/local

 RUN if [ "${ARCH}" == "amd64" ]; then \
-        curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.41.1; \
+        curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.43.0; \
        curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/spectrometer/master/install.sh | sh; \
    fi
 # workaround for https://bugzilla.suse.com/show_bug.cgi?id=1183043
--- a/manifest-agent-head.tmpl
+++ b/manifest-agent-head.tmpl
@@ -16,15 +16,15 @@ manifests:
      architecture: amd64
      os: windows
      version: 1809
-  -
-    image: rancher/rancher-agent:{{#if build.tag}}{{build.tag}}{{else}}{{replace "release/" "" build.branch }}-{{build.commit}}{{/if}}-windows-2004
-    platform:
-      architecture: amd64
-      os: windows
-      version: 2004
  -
    image: rancher/rancher-agent:{{#if build.tag}}{{build.tag}}{{else}}{{replace "release/" "" build.branch }}-{{build.commit}}{{/if}}-windows-20H2
    platform:
      architecture: amd64
      os: windows
      version: 20H2
+  -
+    image: rancher/rancher-agent:{{#if build.tag}}{{build.tag}}{{else}}{{replace "release/" "" build.branch }}-{{build.commit}}{{/if}}-windows-ltsc2022
+    platform:
+      architecture: amd64
+      os: windows
+      version: ltsc2022
--- a/manifest-agent.tmpl
+++ b/manifest-agent.tmpl
@@ -16,15 +16,15 @@ manifests:
      architecture: amd64
      os: windows
      version: 1809
-  -
-    image: rancher/rancher-agent:{{#if build.tag}}{{build.tag}}{{else}}{{replace "release/" "" build.branch }}-{{build.commit}}{{/if}}-windows-2004
-    platform:
-      architecture: amd64
-      os: windows
-      version: 2004
  -
    image: rancher/rancher-agent:{{#if build.tag}}{{build.tag}}{{else}}{{replace "release/" "" build.branch }}-{{build.commit}}{{/if}}-windows-20H2
    platform:
      architecture: amd64
      os: windows
      version: 20H2
+  -
+    image: rancher/rancher-agent:{{#if build.tag}}{{build.tag}}{{else}}{{replace "release/" "" build.branch }}-{{build.commit}}{{/if}}-windows-ltsc2022
+    platform:
+      architecture: amd64
+      os: windows
+      version: ltsc2022
--- a/package/windows/Dockerfile.agent
+++ b/package/windows/Dockerfile.agent
@@ -11,7 +11,7 @@ RUN $URL = 'https://github.com/rancher/wins/releases/download/v0.1.1/wins.exe';
    \
    Write-Host 'Complete.'
 # download kubelet
-RUN $URL = 'https://dl.k8s.io/v1.19.7/kubernetes-client-windows-amd64.tar.gz'; \
+RUN $URL = 'https://dl.k8s.io/v1.21.3/kubernetes-client-windows-amd64.tar.gz'; \
    Write-Host ('Downloading Kubernetes from {0} ...' -f $URL); \
    curl.exe -sfL $URL -o c:\kubernetes.tar.gz; \
    \