Skip to content

Commit 6ebf4a0

Browse files
committed
temporary ssh patch
1 parent 93fa62d commit 6ebf4a0

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

pkg/model/gcemodel/external_access.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,14 @@ func (b *ExternalAccessModelBuilder) Build(c *fi.CloudupModelBuilderContext) err
5555
if err != nil {
5656
return err
5757
}
58+
b.AddFirewallRulesTasks(c, "ssh-external-to-master", &gcetasks.FirewallRule{
59+
Lifecycle: b.Lifecycle,
60+
TargetTags: []string{b.GCETagForRole(kops.InstanceGroupRoleControlPlane), b.GCETagForRole("Master")},
61+
Allowed: []string{"tcp:22"},
62+
SourceRanges: b.Cluster.Spec.SSHAccess,
63+
Network: network,
64+
})
65+
5866
b.AddFirewallRulesTasks(c, "ssh-external-to-bastion", &gcetasks.FirewallRule{
5967
Lifecycle: b.Lifecycle,
6068
TargetTags: []string{b.GCETagForRole(kops.InstanceGroupRoleBastion)},

tests/e2e/scenarios/scalability/run-test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ if [[ "${CLOUD_PROVIDER}" == "aws" ]]; then
6464
create_args+=("--node-size=t3a.medium,t3.medium,t2.medium,t3a.large,c5a.large,t3.large,c5.large,m5a.large,m6a.large,m5.large,c4.large,c7a.large,r5a.large,r6a.large,m7a.large")
6565
create_args+=("--node-volume-size=20")
6666
create_args+=("--zones=us-east-2a,us-east-2b,us-east-2c")
67-
create_args+=("--image=${INSTANCE_IMAGE:-ssm:/aws/service/canonical/ubuntu/server/24.04/stable/current/amd64/hvm/ebs-gp2/ami-id}")
67+
create_args+=("--image=${INSTANCE_IMAGE:-ssm:/aws/service/canonical/ubuntu/server/24.04/stable/current/amd64/hvm/ebs-gp3/ami-id}")
6868
# TODO: track failures of tests (HostPort & OIDC) when using `--dns=none`
6969
create_args+=("--dns=none")
7070
fi
7171
if [[ "${CLOUD_PROVIDER}" == "gce" ]]; then
7272
create_args+=("--zones=us-east1-b,us-east1-c,us-east1-d")
73-
create_args+=("--node-size=e2-medium")
73+
create_args+=("--node-size=e2-standard-2")
7474
create_args+=("--node-volume-size=30")
7575
create_args+=("--master-volume-size=1000")
7676
create_args+=("--gce-service-account=default")

0 commit comments

Comments
 (0)