Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for using ECR as pull-through image cache #16593

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Add support for using ECR as pull-through image cache #16593

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6dd08ed
Add support for using ECR as pull-through image cache
rsafonseca May 30, 2024
e10f174
Update CRDs
rsafonseca May 30, 2024
82b5dd7
Update required ECR permissions
rsafonseca May 30, 2024
bc2d4fc
Fix v1alpha3 conversion
rsafonseca May 30, 2024
d585baa
Fix ecr-credential-provider asset
rsafonseca May 30, 2024
c422330
Rebase with master
rsafonseca Jun 10, 2024
69a832c
Fix hidden tabs in string literal
rsafonseca May 30, 2024
9a76a8b
Update expected nodehashes
rsafonseca Oct 24, 2024
2852bcc
Remove string literal for better readability and easier future manipu…
rsafonseca Nov 4, 2024
a783928
tidy go.mod
rsafonseca Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions docs/iam_roles.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ The additional permissions are:
"ecr:GetAuthorizationToken",
"ecr:GetDownloadUrlForLayer",
"ecr:GetRepositoryPolicy",
"ecr:ReplicateImage",
"ecr:BatchImportUpstreamImage",
"ecr:CreateRepository",
"ecr:TagResource",
"ecr:ListImages"
],
"Resource": [
Expand Down
4 changes: 4 additions & 0 deletions k8s/crds/kops.k8s.io_clusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1003,6 +1003,10 @@ spec:
description: State directory for execution state files (default
"/run/containerd").
type: string
useECRCredentialsForMirrors:
description: Enables Kubelet ECR Credential helper to pass credentials
to containerd mirrors, to use ECR as a pull-through cache
type: boolean
version:
description: Version used to pick the containerd package.
type: string
Expand Down
4 changes: 4 additions & 0 deletions k8s/crds/kops.k8s.io_instancegroups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,10 @@ spec:
description: State directory for execution state files (default
"/run/containerd").
type: string
useECRCredentialsForMirrors:
description: Enables Kubelet ECR Credential helper to pass credentials
to containerd mirrors, to use ECR as a pull-through cache
type: boolean
version:
description: Version used to pick the containerd package.
type: string
Expand Down
14 changes: 13 additions & 1 deletion nodeup/pkg/model/kubelet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,12 +459,21 @@ func (b *KubeletBuilder) addECRCredentialProvider(c *fi.NodeupModelBuilderContex
}

{

configContent := `apiVersion: kubelet.config.k8s.io/v1
kind: CredentialProviderConfig
providers:
- name: ecr-credential-provider
matchImages:
- "*.dkr.ecr.*.amazonaws.com"
`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In office hours, we talked about whether UseECRCredentialsForMirrors should be per mirror or whether we only apply this to urls that "look like" ECR. The (compelling) argument that @rsafonseca made is that people aren't likely to have multiple mirrors so it's not necessary.

👍

containerd := b.NodeupConfig.ContainerdConfig
if containerd.UseECRCredentialsForMirrors {
for name := range containerd.RegistryMirrors {
configContent += ` - "` + name + `"
`
}
}
configContent += ` - "*.dkr.ecr.*.amazonaws.com"
- "*.dkr.ecr.*.amazonaws.com.cn"
- "*.dkr.ecr-fips.*.amazonaws.com"
- "*.dkr.ecr.us-iso-east-1.c2s.ic.gov"
Expand All @@ -473,6 +482,9 @@ providers:
apiVersion: credentialprovider.kubelet.k8s.io/v1
args:
- get-credentials
env:
- name: AWS_REGION
value: ` + b.Cloud.Region() + `
`

t := &nodetasks.File{
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/kops/containerdconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ type ContainerdConfig struct {
SeLinuxEnabled bool `json:"selinuxEnabled,omitempty"`
// NRI configures the Node Resource Interface.
NRI *NRIConfig `json:"nri,omitempty"`
// Enables Kubelet ECR Credential helper to pass credentials to containerd mirrors, to use ECR as a pull-through cache
UseECRCredentialsForMirrors bool `json:"useECRCredentialsForMirrors,omitempty"`
}

type NRIConfig struct {
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/kops/v1alpha2/containerdconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ type ContainerdConfig struct {
SeLinuxEnabled bool `json:"selinuxEnabled,omitempty"`
// NRI configures the Node Resource Interface.
NRI *NRIConfig `json:"nri,omitempty"`
// Enables Kubelet ECR Credential helper to pass credentials to containerd mirrors, to use ECR as a pull-through cache
UseECRCredentialsForMirrors bool `json:"useECRCredentialsForMirrors,omitempty"`
}

type NRIConfig struct {
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/kops/v1alpha2/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions pkg/apis/kops/v1alpha3/containerdconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ type ContainerdConfig struct {
SeLinuxEnabled bool `json:"selinuxEnabled,omitempty"`
// NRI configures the Node Resource Interface.
NRI *NRIConfig `json:"nri,omitempty"`
// Enables Kubelet ECR Credential helper to pass credentials to containerd mirrors, to use ECR as a pull-through cache
UseECRCredentialsForMirrors bool `json:"useECRCredentialsForMirrors,omitempty"`
}

type NRIConfig struct {
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/kops/v1alpha3/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions pkg/assets/assetdata/ecr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ filestores:
# Manually constructed; there is a .sha256 file available for each asset

files:
- name: v1.27.1/linux/amd64/ecr-credential-provider-linux-amd64
sha256: 5035d7814c95cd3cedbc5efb447ef25a4942ef05caab2159746d55ce1698c74a
- name: v1.27.1/linux/arm64/ecr-credential-provider-linux-arm64
sha256: b3d567bda9e2996fc1fbd9d13506bd16763d3865b5c7b0b3c4b48c6088c04481
- name: v1.29.0/linux/amd64/ecr-credential-provider-linux-amd64
sha256: 0d97641c8977fe775cb18f9e6f40acd99ef2570543b55e5c13dec320dcaa8ee3
- name: v1.29.0/linux/arm64/ecr-credential-provider-linux-arm64
sha256: 8313d0744b7e5cfaccb7aa1327c5260471eb9463bc769f87df6f45dee84b8c44
4 changes: 4 additions & 0 deletions pkg/model/iam/iam_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,10 @@ func addECRPermissions(p *Policy) {
"ecr:DescribeRepositories",
"ecr:ListImages",
"ecr:BatchGetImage",
"ecr:ReplicateImage",
"ecr:BatchImportUpstreamImage",
"ecr:CreateRepository",
"ecr:TagResource",
)
}

Expand Down
4 changes: 4 additions & 0 deletions pkg/model/iam/tests/iam_builder_master_gossip_ecr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,15 @@
"ec2:GetInstanceTypesFromInstanceRequirements",
"ecr:BatchCheckLayerAvailability",
"ecr:BatchGetImage",
"ecr:BatchImportUpstreamImage",
"ecr:CreateRepository",
"ecr:DescribeRepositories",
"ecr:GetAuthorizationToken",
"ecr:GetDownloadUrlForLayer",
"ecr:GetRepositoryPolicy",
"ecr:ListImages",
"ecr:ReplicateImage",
"ecr:TagResource",
"elasticloadbalancing:DescribeListeners",
"elasticloadbalancing:DescribeLoadBalancerAttributes",
"elasticloadbalancing:DescribeLoadBalancerPolicies",
Expand Down
4 changes: 4 additions & 0 deletions pkg/model/iam/tests/iam_builder_master_strict_ecr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,15 @@
"ec2:GetInstanceTypesFromInstanceRequirements",
"ecr:BatchCheckLayerAvailability",
"ecr:BatchGetImage",
"ecr:BatchImportUpstreamImage",
"ecr:CreateRepository",
"ecr:DescribeRepositories",
"ecr:GetAuthorizationToken",
"ecr:GetDownloadUrlForLayer",
"ecr:GetRepositoryPolicy",
"ecr:ListImages",
"ecr:ReplicateImage",
"ecr:TagResource",
"elasticloadbalancing:DescribeListeners",
"elasticloadbalancing:DescribeLoadBalancerAttributes",
"elasticloadbalancing:DescribeLoadBalancerPolicies",
Expand Down
4 changes: 4 additions & 0 deletions pkg/model/iam/tests/iam_builder_node_gossip_ecr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,15 @@
"ec2:DescribeRegions",
"ecr:BatchCheckLayerAvailability",
"ecr:BatchGetImage",
"ecr:BatchImportUpstreamImage",
"ecr:CreateRepository",
"ecr:DescribeRepositories",
"ecr:GetAuthorizationToken",
"ecr:GetDownloadUrlForLayer",
"ecr:GetRepositoryPolicy",
"ecr:ListImages",
"ecr:ReplicateImage",
"ecr:TagResource",
"iam:GetServerCertificate",
"iam:ListServerCertificates",
"kms:GenerateRandom"
Expand Down
4 changes: 4 additions & 0 deletions pkg/model/iam/tests/iam_builder_node_strict_ecr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,15 @@
"ec2:DescribeRegions",
"ecr:BatchCheckLayerAvailability",
"ecr:BatchGetImage",
"ecr:BatchImportUpstreamImage",
"ecr:CreateRepository",
"ecr:DescribeRepositories",
"ecr:GetAuthorizationToken",
"ecr:GetDownloadUrlForLayer",
"ecr:GetRepositoryPolicy",
"ecr:ListImages",
"ecr:ReplicateImage",
"ecr:TagResource",
"iam:GetServerCertificate",
"iam:ListServerCertificates",
"kms:GenerateRandom"
Expand Down
2 changes: 1 addition & 1 deletion pkg/nodemodel/fileassets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ func (c *FileAssets) AddFileAssets(assetBuilder *assets.AssetBuilder) error {
case kops.CloudProviderAWS:
binaryLocation := c.Cluster.Spec.CloudProvider.AWS.BinariesLocation
if binaryLocation == nil {
binaryLocation = fi.PtrTo("https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1")
binaryLocation = fi.PtrTo("https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.29.0")
}

u, err := url.Parse(fmt.Sprintf("%s/linux/%s/ecr-credential-provider-linux-%s", *binaryLocation, arch, arch))
Expand Down
4 changes: 4 additions & 0 deletions ...r/additionalobjects/data/aws_iam_role_policy_masters.additionalobjects.example.com_policy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,15 @@
"ec2:GetInstanceTypesFromInstanceRequirements",
"ecr:BatchCheckLayerAvailability",
"ecr:BatchGetImage",
"ecr:BatchImportUpstreamImage",
"ecr:CreateRepository",
"ecr:DescribeRepositories",
"ecr:GetAuthorizationToken",
"ecr:GetDownloadUrlForLayer",
"ecr:GetRepositoryPolicy",
"ecr:ListImages",
"ecr:ReplicateImage",
"ecr:TagResource",
"elasticloadbalancing:DescribeListeners",
"elasticloadbalancing:DescribeLoadBalancerAttributes",
"elasticloadbalancing:DescribeLoadBalancerPolicies",
Expand Down
4 changes: 4 additions & 0 deletions ...ter/additionalobjects/data/aws_iam_role_policy_nodes.additionalobjects.example.com_policy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,15 @@
"ec2:DescribeRegions",
"ecr:BatchCheckLayerAvailability",
"ecr:BatchGetImage",
"ecr:BatchImportUpstreamImage",
"ecr:CreateRepository",
"ecr:DescribeRepositories",
"ecr:GetAuthorizationToken",
"ecr:GetDownloadUrlForLayer",
"ecr:GetRepositoryPolicy",
"ecr:ListImages",
"ecr:ReplicateImage",
"ecr:TagResource",
"iam:GetServerCertificate",
"iam:ListServerCertificates",
"kms:GenerateRandom"
Expand Down
2 changes: 1 addition & 1 deletion ...ata/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ ClusterName: additionalobjects.example.com
ConfigBase: memfs://tests/additionalobjects.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane
NodeupConfigHash: kNBO80k1V/ugSBjFTxW1RW+23YbMonVwSOkEYbveAz0=
NodeupConfigHash: zaJk/8x+R3AbdOmCeTeJcfkYxwJ4UXwU3BkrvfObs1A=

__EOF_KUBE_ENV

Expand Down
2 changes: 1 addition & 1 deletion .../additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ ConfigServer:
- https://kops-controller.internal.additionalobjects.example.com:3988/
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: 6AaVwhN6o777YkF45ZweqV01WbCiwLzXgU6Gs/SKT+k=
NodeupConfigHash: n89Bgvdtt3L/DoB/d4aJj3RgQL8KDQvwrBQNFODkCL0=

__EOF_KUBE_ENV

Expand Down
4 changes: 2 additions & 2 deletions ...pdate_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Assets:
amd64:
- bfb6b977100963f2879a33e5fbaa59a5276ba829a957a6819c936e9c1465f981@https://dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubelet
- 4717660fd1466ec72d59000bb1d9f5cdc91fac31d491043ca62b34398e0799ce@https://dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubectl
- 5035d7814c95cd3cedbc5efb447ef25a4942ef05caab2159746d55ce1698c74a@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/amd64/ecr-credential-provider-linux-amd64
- 0d97641c8977fe775cb18f9e6f40acd99ef2570543b55e5c13dec320dcaa8ee3@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.29.0/linux/amd64/ecr-credential-provider-linux-amd64
- f3a841324845ca6bf0d4091b4fc7f97e18a623172158b72fc3fdcdb9d42d2d37@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.2.0/cni-plugins-linux-amd64-v1.2.0.tgz
- f8b2d935d1f86003f4e0c1af3b9f0d2820bacabe6dc9f562785b74af24c5e468@https://github.com/containerd/containerd/releases/download/v1.7.22/containerd-1.7.22-linux-amd64.tar.gz
- a83c0804ebc16826829e7925626c4793da89a9b225bbcc468f2b338ea9f8e8a8@https://github.com/opencontainers/runc/releases/download/v1.1.14/runc.amd64
Expand All @@ -71,7 +71,7 @@ Assets:
arm64:
- 05dd12e35783cab4960e885ec0e7d0e461989b94297e7bea9018ccbd15c4dce9@https://dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubelet
- f5484bd9cac66b183c653abed30226b561f537d15346c605cc81d98095f1717c@https://dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubectl
- b3d567bda9e2996fc1fbd9d13506bd16763d3865b5c7b0b3c4b48c6088c04481@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/arm64/ecr-credential-provider-linux-arm64
- 8313d0744b7e5cfaccb7aa1327c5260471eb9463bc769f87df6f45dee84b8c44@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.29.0/linux/arm64/ecr-credential-provider-linux-arm64
- 525e2b62ba92a1b6f3dc9612449a84aa61652e680f7ebf4eff579795fe464b57@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.2.0/cni-plugins-linux-arm64-v1.2.0.tgz
- 48d0a8461ae829b12b07c3663b14b70287d0607a0792719c51b4e4dd700b02ce@https://github.com/containerd/containerd/releases/download/v1.7.22/containerd-1.7.22-linux-arm64.tar.gz
- 050ee97c266bf7d31e1474568ffcbb2a3ff2208087aaa238c8bbe7e398414126@https://github.com/opencontainers/runc/releases/download/v1.1.14/runc.arm64
Expand Down
4 changes: 2 additions & 2 deletions ...ntegration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Assets:
amd64:
- bfb6b977100963f2879a33e5fbaa59a5276ba829a957a6819c936e9c1465f981@https://dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubelet
- 4717660fd1466ec72d59000bb1d9f5cdc91fac31d491043ca62b34398e0799ce@https://dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubectl
- 5035d7814c95cd3cedbc5efb447ef25a4942ef05caab2159746d55ce1698c74a@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/amd64/ecr-credential-provider-linux-amd64
- 0d97641c8977fe775cb18f9e6f40acd99ef2570543b55e5c13dec320dcaa8ee3@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.29.0/linux/amd64/ecr-credential-provider-linux-amd64
- f3a841324845ca6bf0d4091b4fc7f97e18a623172158b72fc3fdcdb9d42d2d37@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.2.0/cni-plugins-linux-amd64-v1.2.0.tgz
- f8b2d935d1f86003f4e0c1af3b9f0d2820bacabe6dc9f562785b74af24c5e468@https://github.com/containerd/containerd/releases/download/v1.7.22/containerd-1.7.22-linux-amd64.tar.gz
- a83c0804ebc16826829e7925626c4793da89a9b225bbcc468f2b338ea9f8e8a8@https://github.com/opencontainers/runc/releases/download/v1.1.14/runc.amd64
Expand All @@ -11,7 +11,7 @@ Assets:
arm64:
- 05dd12e35783cab4960e885ec0e7d0e461989b94297e7bea9018ccbd15c4dce9@https://dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubelet
- f5484bd9cac66b183c653abed30226b561f537d15346c605cc81d98095f1717c@https://dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubectl
- b3d567bda9e2996fc1fbd9d13506bd16763d3865b5c7b0b3c4b48c6088c04481@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/arm64/ecr-credential-provider-linux-arm64
- 8313d0744b7e5cfaccb7aa1327c5260471eb9463bc769f87df6f45dee84b8c44@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.29.0/linux/arm64/ecr-credential-provider-linux-arm64
- 525e2b62ba92a1b6f3dc9612449a84aa61652e680f7ebf4eff579795fe464b57@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.2.0/cni-plugins-linux-arm64-v1.2.0.tgz
- 48d0a8461ae829b12b07c3663b14b70287d0607a0792719c51b4e4dd700b02ce@https://github.com/containerd/containerd/releases/download/v1.7.22/containerd-1.7.22-linux-arm64.tar.gz
- 050ee97c266bf7d31e1474568ffcbb2a3ff2208087aaa238c8bbe7e398414126@https://github.com/opencontainers/runc/releases/download/v1.1.14/runc.arm64
Expand Down
2 changes: 1 addition & 1 deletion ...piservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ ClusterName: minimal.example.com
ConfigBase: memfs://clusters.example.com/minimal.example.com
InstanceGroupName: apiserver
InstanceGroupRole: APIServer
NodeupConfigHash: armWT5T1TvUG74wHtHrz06NrWI8IXJsAaA3XNf+QC5I=
NodeupConfigHash: tSZS3aflPYTNOWv2zR8CWZ3D4z+jnqY7CBUwhUfJXtE=

__EOF_KUBE_ENV

Expand Down
2 changes: 1 addition & 1 deletion ...vernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ ClusterName: minimal.example.com
ConfigBase: memfs://clusters.example.com/minimal.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane
NodeupConfigHash: w4aA+SeJ62gFqO4Dqogs5r+vlKd8ykuhz0qix2drn3I=
NodeupConfigHash: A4Xiijj27w38SF+BjQxRYcZbUYtzm6Jv+EeKFHrEuog=

__EOF_KUBE_ENV

Expand Down
2 changes: 1 addition & 1 deletion ...pdate_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ ConfigServer:
- https://kops-controller.internal.minimal.example.com:3988/
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: BNHdKpzF2AtQ3IHZP5cbUWaJ0THhKu4nNm8p7N3/mak=
NodeupConfigHash: m6esGxwxtbFgwUWgCRDs0FlEG8G1JwKvosrDKyeZQqI=

__EOF_KUBE_ENV

Expand Down
4 changes: 2 additions & 2 deletions ...tegration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Assets:
amd64:
- 0b4ed4fcd75d33f5dff3ba17776e6089847fc83064d3f7a3ad59a34e94e60a29@https://dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubelet,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubelet
- 71a78259d70da9c5540c4cf4cff121f443e863376f68f89a759d90cef3f51e87@https://dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/amd64/kubectl
- 5035d7814c95cd3cedbc5efb447ef25a4942ef05caab2159746d55ce1698c74a@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/amd64/ecr-credential-provider-linux-amd64
- 0d97641c8977fe775cb18f9e6f40acd99ef2570543b55e5c13dec320dcaa8ee3@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.29.0/linux/amd64/ecr-credential-provider-linux-amd64
- f3a841324845ca6bf0d4091b4fc7f97e18a623172158b72fc3fdcdb9d42d2d37@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.2.0/cni-plugins-linux-amd64-v1.2.0.tgz
- bb9a9ccd6517e2a54da748a9f60dc9aa9d79d19d4724663f2386812f083968e2@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-amd64.tar.gz
- f00b144e86f8c1db347a2e8f22caade07d55382c5f76dd5c0a5b1ab64eaec8bb@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.amd64
Expand All @@ -69,7 +69,7 @@ Assets:
arm64:
- 37aa2edc7c0c4b3e488518c6a4b44c8aade75a55010534ee2be291220c73d157@https://dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubelet
- f8e09630211f2b7c6a8cc38835e7dea94708d401f5c84b23a37c70c604602ddc@https://dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.27.0/bin/linux/arm64/kubectl
- b3d567bda9e2996fc1fbd9d13506bd16763d3865b5c7b0b3c4b48c6088c04481@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/arm64/ecr-credential-provider-linux-arm64
- 8313d0744b7e5cfaccb7aa1327c5260471eb9463bc769f87df6f45dee84b8c44@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.29.0/linux/arm64/ecr-credential-provider-linux-arm64
- 525e2b62ba92a1b6f3dc9612449a84aa61652e680f7ebf4eff579795fe464b57@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.2.0/cni-plugins-linux-arm64-v1.2.0.tgz
- c3e6a054b18b20fce06c7c3ed53f0989bb4b255c849bede446ebca955f07a9ce@https://github.com/containerd/containerd/releases/download/v1.6.20/containerd-1.6.20-linux-arm64.tar.gz
- 54e79e4d48b9e191767e4abc08be1a8476a1c757e9a9f8c45c6ded001226867f@https://github.com/opencontainers/runc/releases/download/v1.1.5/runc.arm64
Expand Down
Loading
Loading