Sitelet https://github.com/kubernetes/kops/pull/17885/files/5338f9d6a52ddd38fc8136bf4b4879168340ef2e
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions cmd/kops/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ func TestMinimalGp3(t *testing.T) {

// TestMinimal runs the test on a minimum configuration, similar to kops create cluster minimal.example.com --zones us-west-1a
func TestMinimalLongClusterName(t *testing.T) {
newIntegrationTest("this.is.truly.a.really.really.long.cluster-name.minimal.example.com", "minimal-longclustername").
newIntegrationTest("this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com", "minimal-longclustername").
withAddons(
awsEBSCSIAddon,
dnsControllerAddon,
Expand Down Expand Up @@ -1566,13 +1566,14 @@ func (i *integrationTest) runTestTerraformAWS(t *testing.T) {
}
}
if i.nth {
queueName := truncate.TruncateString(strings.ReplaceAll(i.clusterName, ".", "-"), truncate.TruncateStringOptions{MaxLength: 75, AlwaysAddHash: false})
expectedFilenames = append(expectedFilenames, []string{
"aws_s3_object_" + i.clusterName + "-addons-node-termination-handler.aws-k8s-1.11_content",
"aws_cloudwatch_event_rule_" + awsup.GetClusterName40(i.clusterName) + "-ASGLifecycle_event_pattern",
"aws_cloudwatch_event_rule_" + awsup.GetClusterName40(i.clusterName) + "-SpotInterruption_event_pattern",
"aws_cloudwatch_event_rule_" + awsup.GetClusterName40(i.clusterName) + "-InstanceStateChange_event_pattern",
"aws_cloudwatch_event_rule_" + awsup.GetClusterName40(i.clusterName) + "-InstanceScheduledChange_event_pattern",
"aws_sqs_queue_" + strings.ReplaceAll(i.clusterName, ".", "-") + "-nth_policy",
"aws_sqs_queue_" + queueName + "-nth_policy",
}...)
}
if i.nthRebalance {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"Action": "ec2:AttachVolume",
"Condition": {
"StringEquals": {
"aws:ResourceTag/KubernetesCluster": "this.is.truly.a.really.really.long.cluster-name.minimal.example.com",
"aws:ResourceTag/KubernetesCluster": "this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com",
"aws:ResourceTag/k8s.io/role/master": "1"
}
},
Expand All @@ -18,7 +18,7 @@
"s3:Get*"
],
"Effect": "Allow",
"Resource": "arn:aws-test:s3:::placeholder-read-bucket/clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com/*"
"Resource": "arn:aws-test:s3:::placeholder-read-bucket/clusters.example.com/this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com/*"
},
{
"Action": [
Expand All @@ -28,7 +28,7 @@
"s3:PutObject"
],
"Effect": "Allow",
"Resource": "arn:aws-test:s3:::placeholder-write-bucket/clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com/backups/etcd/main/*"
"Resource": "arn:aws-test:s3:::placeholder-write-bucket/clusters.example.com/this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com/backups/etcd/main/*"
},
{
"Action": [
Expand All @@ -38,7 +38,7 @@
"s3:PutObject"
],
"Effect": "Allow",
"Resource": "arn:aws-test:s3:::placeholder-write-bucket/clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com/backups/etcd/events/*"
"Resource": "arn:aws-test:s3:::placeholder-write-bucket/clusters.example.com/this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com/backups/etcd/events/*"
},
{
"Action": [
Expand Down Expand Up @@ -98,7 +98,7 @@
"Action": "ec2:CreateTags",
"Condition": {
"StringEquals": {
"aws:RequestTag/KubernetesCluster": "this.is.truly.a.really.really.long.cluster-name.minimal.example.com",
"aws:RequestTag/KubernetesCluster": "this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com",
"ec2:CreateAction": [
"CreateVolume",
"CreateSnapshot"
Expand All @@ -121,7 +121,7 @@
"aws:RequestTag/KubernetesCluster": "true"
},
"StringEquals": {
"aws:ResourceTag/KubernetesCluster": "this.is.truly.a.really.really.long.cluster-name.minimal.example.com"
"aws:ResourceTag/KubernetesCluster": "this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com"
}
},
"Effect": "Allow",
Expand All @@ -134,7 +134,7 @@
"Action": "ec2:CreateTags",
"Condition": {
"StringEquals": {
"aws:RequestTag/KubernetesCluster": "this.is.truly.a.really.really.long.cluster-name.minimal.example.com",
"aws:RequestTag/KubernetesCluster": "this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com",
"ec2:CreateAction": [
"CreateSecurityGroup"
]
Expand All @@ -155,7 +155,7 @@
"aws:RequestTag/KubernetesCluster": "true"
},
"StringEquals": {
"aws:ResourceTag/KubernetesCluster": "this.is.truly.a.really.really.long.cluster-name.minimal.example.com"
"aws:ResourceTag/KubernetesCluster": "this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com"
}
},
"Effect": "Allow",
Expand Down Expand Up @@ -246,7 +246,7 @@
],
"Condition": {
"StringEquals": {
"aws:ResourceTag/KubernetesCluster": "this.is.truly.a.really.really.long.cluster-name.minimal.example.com"
"aws:ResourceTag/KubernetesCluster": "this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com"
}
},
"Effect": "Allow",
Expand All @@ -263,7 +263,7 @@
],
"Condition": {
"StringEquals": {
"aws:RequestTag/KubernetesCluster": "this.is.truly.a.really.really.long.cluster-name.minimal.example.com"
"aws:RequestTag/KubernetesCluster": "this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com"
}
},
"Effect": "Allow",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,11 @@ ensure-install-dir

cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
CloudProvider: aws
ClusterName: this.is.truly.a.really.really.long.cluster-name.minimal.example.com
ConfigBase: memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com
ClusterName: this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com
ConfigBase: memfs://clusters.example.com/this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane
NodeupConfigHash: IB25rYyYurdfF4yuB9OoURb/W0q0GsfGNY8aroJeLR8=
NodeupConfigHash: 3vC71oWGFv3oYHYdplKVl+BaIR2gPL/ul6MKNwR5ZIU=

__EOF_KUBE_ENV

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ ensure-install-dir

cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
CloudProvider: aws
ClusterName: this.is.truly.a.really.really.long.cluster-name.minimal.example.com
ClusterName: this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com
ConfigServer:
CACertificates: |
-----BEGIN CERTIFICATE-----
Expand All @@ -146,10 +146,10 @@ ConfigServer:
9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
-----END CERTIFICATE-----
servers:
- https://kops-controller.internal.this.is.truly.a.really.really.long.cluster-name.minimal.example.com:3988/
- https://kops-controller.internal.this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com:3988/
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: hMySj8GI+fTBZi+Q2+obulPUQh5lfhI7+NkiHplYAjE=
NodeupConfigHash: hXzXoVkEbaQPaIKSuskQNO/9qnhp3fgTgJWXd5h2G8o=

__EOF_KUBE_ENV

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: kops.k8s.io/v1alpha2
kind: Cluster
metadata:
creationTimestamp: "2016-12-10T22:42:27Z"
name: this.is.truly.a.really.really.long.cluster-name.minimal.example.com
name: this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com
spec:
api:
dns: {}
Expand All @@ -16,14 +16,14 @@ spec:
cloudControllerManager:
allocateNodeCIDRs: true
clusterCIDR: 100.96.0.0/11
clusterName: this.is.truly.a.really.really.long.cluster-name.minimal.example.com
clusterName: this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
leaderElection:
leaderElect: true
cloudProvider: aws
clusterDNSDomain: cluster.local
configBase: memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com
configBase: memfs://clusters.example.com/this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com
containerd:
logLevel: info
runc:
Expand All @@ -33,7 +33,7 @@ spec:
dnsZone: Z1AFAKE1ZON3YO
etcdClusters:
- backups:
backupStore: memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com/backups/etcd/main
backupStore: memfs://clusters.example.com/this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com/backups/etcd/main
etcdMembers:
- instanceGroup: master-us-test-1a
name: us-test-1a
Expand All @@ -42,7 +42,7 @@ spec:
name: main
version: 3.5.25
- backups:
backupStore: memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com/backups/etcd/events
backupStore: memfs://clusters.example.com/this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com/backups/etcd/events
etcdMembers:
- instanceGroup: master-us-test-1a
name: us-test-1a
Expand All @@ -52,7 +52,7 @@ spec:
version: 3.5.25
externalDns:
provider: dns-controller
keyStore: memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com/pki
keyStore: memfs://clusters.example.com/this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com/pki
kubeAPIServer:
allowPrivileged: true
anonymousAuth: false
Expand Down Expand Up @@ -93,16 +93,16 @@ spec:
requestheaderUsernameHeaders:
- X-Remote-User
securePort: 443
serviceAccountIssuer: https://api.internal.this.is.truly.a.really.really.long.cluster-name.minimal.example.com
serviceAccountJWKSURI: https://api.internal.this.is.truly.a.really.really.long.cluster-name.minimal.example.com/openid/v1/jwks
serviceAccountIssuer: https://api.internal.this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com
serviceAccountJWKSURI: https://api.internal.this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com/openid/v1/jwks
serviceClusterIPRange: 100.64.0.0/13
storageBackend: etcd3
kubeControllerManager:
allocateNodeCIDRs: true
attachDetachReconcileSyncPeriod: 1m0s
cloudProvider: external
clusterCIDR: 100.96.0.0/11
clusterName: this.is.truly.a.really.really.long.cluster-name.minimal.example.com
clusterName: this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/kube-controller-manager:v1.32.0
leaderElection:
Expand Down Expand Up @@ -166,7 +166,7 @@ spec:
registerSchedulable: true
shutdownGracePeriod: 30s
shutdownGracePeriodCriticalPods: 10s
masterPublicName: api.this.is.truly.a.really.really.long.cluster-name.minimal.example.com
masterPublicName: api.this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com
networkCIDR: 172.20.0.0/16
networking:
cni: {}
Expand All @@ -187,7 +187,7 @@ spec:
version: v1.22.0
nonMasqueradeCIDR: 100.64.0.0/10
podCIDR: 100.96.0.0/11
secretStore: memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com/secrets
secretStore: memfs://clusters.example.com/this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com/secrets
serviceClusterIPRange: 100.64.0.0/13
sshAccess:
- 0.0.0.0/0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ spec:
- /bin/sh
- -c
- mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /ko-app/etcd-manager
--backup-store=memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com/backups/etcd/events
--backup-store=memfs://clusters.example.com/this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com/backups/etcd/events
--client-urls=https://__name__:4002 --cluster-name=etcd-events --containerized=true
--dns-suffix=.internal.this.is.truly.a.really.really.long.cluster-name.minimal.example.com
--dns-suffix=.internal.this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com
--grpc-port=3997 --peer-urls=https://__name__:2381 --quarantine-client-urls=https://__name__:3995
--v=6 --volume-name-tag=k8s.io/etcd/events --volume-provider=aws --volume-tag=k8s.io/etcd/events
--volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/this.is.truly.a.really.really.long.cluster-name.minimal.example.com=owned
--volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com=owned
> /tmp/pipe 2>&1
env:
- name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ spec:
- /bin/sh
- -c
- mkfifo /tmp/pipe; (tee -a /var/log/etcd.log < /tmp/pipe & ) ; exec /ko-app/etcd-manager
--backup-store=memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com/backups/etcd/main
--backup-store=memfs://clusters.example.com/this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com/backups/etcd/main
--client-urls=https://__name__:4001 --cluster-name=etcd --containerized=true
--dns-suffix=.internal.this.is.truly.a.really.really.long.cluster-name.minimal.example.com
--dns-suffix=.internal.this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com
--grpc-port=3996 --peer-urls=https://__name__:2380 --quarantine-client-urls=https://__name__:3994
--v=6 --volume-name-tag=k8s.io/etcd/main --volume-provider=aws --volume-tag=k8s.io/etcd/main
--volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/this.is.truly.a.really.really.long.cluster-name.minimal.example.com=owned
--volume-tag=k8s.io/role/control-plane=1 --volume-tag=kubernetes.io/cluster/this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com=owned
> /tmp/pipe 2>&1
env:
- name: ETCD_MANAGER_DAILY_BACKUPS_RETENTION
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
APIServerConfig:
API:
dns: {}
publicName: api.this.is.truly.a.really.really.long.cluster-name.minimal.example.com
publicName: api.this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com
ClusterDNSDomain: cluster.local
KubeAPIServer:
allowPrivileged: true
Expand Down Expand Up @@ -43,8 +43,8 @@ APIServerConfig:
requestheaderUsernameHeaders:
- X-Remote-User
securePort: 443
serviceAccountIssuer: https://api.internal.this.is.truly.a.really.really.long.cluster-name.minimal.example.com
serviceAccountJWKSURI: https://api.internal.this.is.truly.a.really.really.long.cluster-name.minimal.example.com/openid/v1/jwks
serviceAccountIssuer: https://api.internal.this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com
serviceAccountJWKSURI: https://api.internal.this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com/openid/v1/jwks
serviceClusterIPRange: 100.64.0.0/13
storageBackend: etcd3
ServiceAccountPublicKeys: |
Expand Down Expand Up @@ -227,14 +227,14 @@ CAs:
MA0GCSqGSIb3DQEBCwUAA0EAVQVx5MUtuAIeePuP9o51xtpT2S6Fvfi8J4ICxnlA
9B7UD2ushcVFPtaeoL9Gfu8aY4KJBeqqg5ojl4qmRnThjw==
-----END CERTIFICATE-----
ClusterName: this.is.truly.a.really.really.long.cluster-name.minimal.example.com
ClusterName: this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com
ControlPlaneConfig:
KubeControllerManager:
allocateNodeCIDRs: true
attachDetachReconcileSyncPeriod: 1m0s
cloudProvider: external
clusterCIDR: 100.96.0.0/11
clusterName: this.is.truly.a.really.really.long.cluster-name.minimal.example.com
clusterName: this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/kube-controller-manager:v1.32.0
leaderElection:
Expand Down Expand Up @@ -302,19 +302,19 @@ Networking:
serviceClusterIPRange: 100.64.0.0/13
UpdatePolicy: automatic
channels:
- memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com/addons/bootstrap-channel.yaml
- memfs://clusters.example.com/this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com/addons/bootstrap-channel.yaml
configStore:
keypairs: memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com/pki
secrets: memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com/secrets
keypairs: memfs://clusters.example.com/this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com/pki
secrets: memfs://clusters.example.com/this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com/secrets
containerdConfig:
logLevel: info
runc:
version: 1.3.4
sandboxImage: registry.k8s.io/pause:3.10.1
version: 2.1.6
etcdManifests:
- memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
- memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
- memfs://clusters.example.com/this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
- memfs://clusters.example.com/this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
staticManifests:
- key: kube-apiserver-healthcheck
path: manifests/static/kube-apiserver-healthcheck.yaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Assets:
- 88d6e32348c36628c8500a630c6dd4b3cb8c680b1d18dc8d1d19041f67757c6e@https://github.com/containerd/containerd/releases/download/v2.1.6/containerd-2.1.6-linux-arm64.tar.gz
- d6dcab36d1b6af1b72c7f0662e5fcf446a291271ba6006532b95c4144e19d428@https://github.com/opencontainers/runc/releases/download/v1.3.4/runc.arm64
CAs: {}
ClusterName: this.is.truly.a.really.really.long.cluster-name.minimal.example.com
ClusterName: this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com
Hooks:
- null
- null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
- args:
- --allocate-node-cidrs=true
- --cluster-cidr=100.96.0.0/11
- --cluster-name=this.is.truly.a.really.really.long.cluster-name.minimal.example.com
- --cluster-name=this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com
- --configure-cloud-routes=false
- --leader-elect=true
- --v=2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -863,8 +863,8 @@ spec:
- args:
- controller
- --endpoint=$(CSI_ENDPOINT)
- --k8s-tag-cluster-id=this.is.truly.a.really.really.long.cluster-name.minimal.example.com
- --extra-tags=KubernetesCluster=this.is.truly.a.really.really.long.cluster-name.minimal.example.com
- --k8s-tag-cluster-id=this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com
- --extra-tags=KubernetesCluster=this.is.truly.a.really.really.really.really.really.long.cluster-name.minimal.example.com
- --http-endpoint=0.0.0.0:3301
- --batching=true
- --logging-format=text
Expand Down
Loading
Loading