Sitelet https://github.com/kubernetes/kops/pull/18387/files
Skip to content

Automated cherry pick of #18384: Fix kops get assets when spec.dnsZone is a DNS name #18387

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

Merged
k8s-ci-robot merged 1 commit into from
May 21, 2026
Merged

Automated cherry pick of #18384: Fix kops get assets when spec.dnsZone is a DNS name #18387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions cmd/kops/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,6 +758,7 @@ func TestPrivateDns1(t *testing.T) {
awsEBSCSIAddon,
dnsControllerAddon,
).
withTestGetAssets().
runTestTerraformAWS(t)
}

Expand Down
8 changes: 8 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 @@ -748,6 +748,14 @@ func (b *PolicyResource) Open() (io.Reader, error) {

if b.DNSZone != nil {
hostedZoneID := fi.ValueOf(b.DNSZone.ZoneID)
if hostedZoneID == "" {
// ZoneID is normally populated by DNSZone.Find before this runs. In dry-run modes that
// skip Find (e.g. `kops get assets`), it may still be empty; fall back to the DNS name
// so the policy renders. The resulting ARN is not a valid Route53 ARN, but the policy
// is not applied in that mode.
hostedZoneID = fi.ValueOf(b.DNSZone.DNSName)
klog.V(4).Infof("Falling back to DNS name %q for IAM policy because ZoneID is empty", hostedZoneID)
}
if hostedZoneID == "" {
// Dependency analysis failure?
return nil, fmt.Errorf("DNS ZoneID not set")
Expand Down
82 changes: 82 additions & 0 deletions tests/integration/update_cluster/privatedns1/assets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
files:
- canonical: https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubelet
download: https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubelet
sha: 5c0d28cea2a3a5c91861dda088a29d56c1b027e184dae1d792686f0710750076
- canonical: https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl
download: https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl
sha: cfda68cba5848bc3b6c6135ae2f20ba2c78de20059f68789c090166d6abc3e2c
- canonical: https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/linux/amd64/ecr-credential-provider-linux-amd64
download: https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/linux/amd64/ecr-credential-provider-linux-amd64
sha: 7644623e4ec9ad443ab352a8a5800a5180ee28741288be805286ba72bb8e7164
- canonical: https://github.com/containernetworking/plugins/releases/download/v1.6.2/cni-plugins-linux-amd64-v1.6.2.tgz
download: https://github.com/containernetworking/plugins/releases/download/v1.6.2/cni-plugins-linux-amd64-v1.6.2.tgz
sha: b8e811578fb66023f90d2e238d80cec3bdfca4b44049af74c374d4fae0f9c090
- canonical: https://github.com/containerd/containerd/releases/download/v2.1.5/containerd-2.1.5-linux-amd64.tar.gz
download: https://github.com/containerd/containerd/releases/download/v2.1.5/containerd-2.1.5-linux-amd64.tar.gz
sha: 403af72d9f956ed8a5ad5b0ac0f1e8e371a1488f2b9edf9b4ba13db0653936ea
- canonical: https://github.com/opencontainers/runc/releases/download/v1.3.3/runc.amd64
download: https://github.com/opencontainers/runc/releases/download/v1.3.3/runc.amd64
sha: 8781ab9f71c12f314d21c8e85f13ca1a82d90cf475aa5131a7b543fcc5487543
- canonical: https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet
download: https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet
sha: e45a7795391cd62ee226666039153832d3096c0f892266cd968936e18b2b40b0
- canonical: https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl
download: https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl
sha: 00b182d103a8a73da7a4d11e7526d0543dcf352f06cc63a1fde25ce9243f49a0
- canonical: https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/linux/arm64/ecr-credential-provider-linux-arm64
download: https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/linux/arm64/ecr-credential-provider-linux-arm64
sha: 1980e3a038cb16da48a137743b31fb81de6c0b59fa06c206c2bc20ce0a52f849
- canonical: https://github.com/containernetworking/plugins/releases/download/v1.6.2/cni-plugins-linux-arm64-v1.6.2.tgz
download: https://github.com/containernetworking/plugins/releases/download/v1.6.2/cni-plugins-linux-arm64-v1.6.2.tgz
sha: 01e0e22acc7f7004e4588c1fe1871cc86d7ab562cd858e1761c4641d89ebfaa4
- canonical: https://github.com/containerd/containerd/releases/download/v2.1.5/containerd-2.1.5-linux-arm64.tar.gz
download: https://github.com/containerd/containerd/releases/download/v2.1.5/containerd-2.1.5-linux-arm64.tar.gz
sha: fe81122c0cc8222470fa3be51f42fa918ac29ffd956ccd2fc408c1997babd2ca
- canonical: https://github.com/opencontainers/runc/releases/download/v1.3.3/runc.arm64
download: https://github.com/opencontainers/runc/releases/download/v1.3.3/runc.arm64
sha: 3c9a8e9e6dafd00db61f4611692447ebab4a56388bae4f82192aed67b66df712
images:
- canonical: registry.k8s.io/kube-apiserver:v1.34.0
download: registry.k8s.io/kube-apiserver:v1.34.0
- canonical: registry.k8s.io/pause:3.9
download: registry.k8s.io/pause:3.9
- canonical: registry.k8s.io/kube-controller-manager:v1.34.0
download: registry.k8s.io/kube-controller-manager:v1.34.0
- canonical: registry.k8s.io/kube-scheduler:v1.34.0
download: registry.k8s.io/kube-scheduler:v1.34.0
- canonical: registry.k8s.io/kube-proxy:v1.34.0
download: registry.k8s.io/kube-proxy:v1.34.0
- canonical: registry.k8s.io/kops/kops-controller:1.34.2
download: registry.k8s.io/kops/kops-controller:1.34.2
- canonical: registry.k8s.io/coredns/coredns:v1.12.4
download: registry.k8s.io/coredns/coredns:v1.12.4
- canonical: registry.k8s.io/cpa/cluster-proportional-autoscaler:v1.9.0
download: registry.k8s.io/cpa/cluster-proportional-autoscaler:v1.9.0
- canonical: registry.k8s.io/kops/dns-controller:1.34.2
download: registry.k8s.io/kops/dns-controller:1.34.2
- canonical: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0
download: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0
- canonical: registry.k8s.io/provider-aws/cloud-controller-manager:v1.34.0
download: registry.k8s.io/provider-aws/cloud-controller-manager:v1.34.0
- canonical: registry.k8s.io/provider-aws/aws-ebs-csi-driver:v1.47.0
download: registry.k8s.io/provider-aws/aws-ebs-csi-driver:v1.47.0
- canonical: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.14.0
download: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.14.0
- canonical: registry.k8s.io/sig-storage/livenessprobe:v2.16.0
download: registry.k8s.io/sig-storage/livenessprobe:v2.16.0
- canonical: registry.k8s.io/sig-storage/csi-provisioner:v5.3.0
download: registry.k8s.io/sig-storage/csi-provisioner:v5.3.0
- canonical: registry.k8s.io/sig-storage/csi-attacher:v4.9.0
download: registry.k8s.io/sig-storage/csi-attacher:v4.9.0
- canonical: registry.k8s.io/sig-storage/csi-resizer:v1.14.0
download: registry.k8s.io/sig-storage/csi-resizer:v1.14.0
- canonical: registry.k8s.io/kops/kube-apiserver-healthcheck:1.34.2
download: registry.k8s.io/kops/kube-apiserver-healthcheck:1.34.2
- canonical: registry.k8s.io/etcd:v3.4.13
download: registry.k8s.io/etcd:v3.4.13
- canonical: registry.k8s.io/etcd:v3.5.30
download: registry.k8s.io/etcd:v3.5.30
- canonical: registry.k8s.io/etcd:v3.6.11
download: registry.k8s.io/etcd:v3.6.11
- canonical: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260512
download: registry.k8s.io/etcd-manager/etcd-manager-slim:v3.0.20260512
Loading