From 0cb2f052bb3b20231adc85d41732fb6b2c844a95 Mon Sep 17 00:00:00 2001 From: Yu Xiang Zhang Date: Thu, 15 Feb 2024 02:35:04 +0000 Subject: [PATCH] Update build image manifest, tag file and workflows --- .github/workflows/release-candidate.yaml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/update-generated.yaml | 2 +- Dockerfile | 2 +- build/docker/build_image_manifest | 10 +++++----- build/docker/image_tag | 2 +- pkg/apis/eksctl.io/v1alpha5/assets/schema.json | 12 ++++++------ 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release-candidate.yaml b/.github/workflows/release-candidate.yaml index 34d3cdfdcb..47f09a3cc8 100644 --- a/.github/workflows/release-candidate.yaml +++ b/.github/workflows/release-candidate.yaml @@ -7,7 +7,7 @@ jobs: rc: name: Trigger release candidate build runs-on: ubuntu-latest - container: public.ecr.aws/eksctl/eksctl-build:c1ae010fa4b927d123afc6fdd7df07203aa40dd8 + container: public.ecr.aws/eksctl/eksctl-build:5e2d110f32a60d699ca0642ac3287190227c45ec steps: - name: Checkout uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8addcca12e..1931018b43 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -7,7 +7,7 @@ jobs: rc: name: Trigger release build runs-on: ubuntu-latest - container: public.ecr.aws/eksctl/eksctl-build:c1ae010fa4b927d123afc6fdd7df07203aa40dd8 + container: public.ecr.aws/eksctl/eksctl-build:5e2d110f32a60d699ca0642ac3287190227c45ec steps: - name: Checkout uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1 diff --git a/.github/workflows/update-generated.yaml b/.github/workflows/update-generated.yaml index 76c5c2e9e9..ce804b7686 100644 --- a/.github/workflows/update-generated.yaml +++ b/.github/workflows/update-generated.yaml @@ -18,7 +18,7 @@ jobs: resource: ["coredns", "aws-node"] name: Update ${{ matrix.resource }} and open PR runs-on: ubuntu-latest - container: public.ecr.aws/eksctl/eksctl-build:c1ae010fa4b927d123afc6fdd7df07203aa40dd8 + container: public.ecr.aws/eksctl/eksctl-build:5e2d110f32a60d699ca0642ac3287190227c45ec env: GOPRIVATE: "" steps: diff --git a/Dockerfile b/Dockerfile index 85d6978809..57633e47c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_IMAGE=public.ecr.aws/eksctl/eksctl-build:c1ae010fa4b927d123afc6fdd7df07203aa40dd8 +ARG BUILD_IMAGE=public.ecr.aws/eksctl/eksctl-build:5e2d110f32a60d699ca0642ac3287190227c45ec FROM $BUILD_IMAGE as build WORKDIR /src diff --git a/build/docker/build_image_manifest b/build/docker/build_image_manifest index c1ae010fa4..5e2d110f32 100644 --- a/build/docker/build_image_manifest +++ b/build/docker/build_image_manifest @@ -7,11 +7,11 @@ "github.com/vektra/mockery/v2 v2.38.0" "github.com/github-release/github-release v0.10.0" "golang.org/x/tools v0.16.1" -"k8s.io/code-generator v0.25.11" -"k8s.io/code-generator v0.25.11" -"k8s.io/code-generator v0.25.11" -"k8s.io/code-generator v0.25.11" -"k8s.io/code-generator v0.25.11" +"k8s.io/code-generator v0.29.0" +"k8s.io/code-generator v0.29.0" +"k8s.io/code-generator v0.29.0" +"k8s.io/code-generator v0.29.0" +"k8s.io/code-generator v0.29.0" "sigs.k8s.io/mdtoc v1.1.0" "github.com/vburenin/ifacemaker v1.2.1" 100644 blob 80fe0de3dabc122dacbf9fd528653fab7c25af4b build/docker/Dockerfile diff --git a/build/docker/image_tag b/build/docker/image_tag index 35bd178b0d..9b3d6c6fcc 100644 --- a/build/docker/image_tag +++ b/build/docker/image_tag @@ -1 +1 @@ -c1ae010fa4b927d123afc6fdd7df07203aa40dd8 +5e2d110f32a60d699ca0642ac3287190227c45ec diff --git a/pkg/apis/eksctl.io/v1alpha5/assets/schema.json b/pkg/apis/eksctl.io/v1alpha5/assets/schema.json index 3bac2cc9df..b8cb34625c 100755 --- a/pkg/apis/eksctl.io/v1alpha5/assets/schema.json +++ b/pkg/apis/eksctl.io/v1alpha5/assets/schema.json @@ -1566,8 +1566,8 @@ "metrics" ], "additionalProperties": false, - "description": "used by the scaling config, see [cloudformation docs](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-metricscollection.html)", - "x-intellij-html-description": "used by the scaling config, see cloudformation docs" + "description": "used by the scaling config, see [cloudformation docs](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-metricscollection.html)", + "x-intellij-html-description": "used by the scaling config, see cloudformation docs" }, "NodeGroup": { "required": [ @@ -2484,8 +2484,8 @@ "properties": { "autoScaler": { "type": "boolean", - "description": "adds policies for cluster-autoscaler. See [autoscaler AWS docs](https://docs.aws.amazon.com/eks/latest/userguide/autoscaling.html#cluster-autoscaler).", - "x-intellij-html-description": "adds policies for cluster-autoscaler. See autoscaler AWS docs.", + "description": "adds policies for cluster-autoscaler. See [autoscaler AWS docs](https://docs.aws.amazon.com/eks/latest/userguide/cluster-autoscaler.html).", + "x-intellij-html-description": "adds policies for cluster-autoscaler. See autoscaler AWS docs.", "default": "false" }, "awsLoadBalancerController": { @@ -2502,8 +2502,8 @@ }, "ebsCSIController": { "type": "boolean", - "description": "adds policies for using the ebs-csi-controller. See [aws-ebs-csi-driver docs](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/blob/master/docs/install.md#set-up-driver-permissions).", - "x-intellij-html-description": "adds policies for using the ebs-csi-controller. See aws-ebs-csi-driver docs.", + "description": "adds policies for using the ebs-csi-controller. See [aws-ebs-csi-driver docs](https://github.com/kubernetes-sigs/aws-ebs-csi-driver#set-up-driver-permission).", + "x-intellij-html-description": "adds policies for using the ebs-csi-controller. See aws-ebs-csi-driver docs.", "default": "false" }, "efsCSIController": {