Skip to content

drop hardcoded kops_state_store and cluster_name #36316

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

Open
upodroid wants to merge 1 commit into
base: master
Choose a base branch
from
+92 −91
Open

drop hardcoded kops_state_store and cluster_name #36316

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
12 changes: 0 additions & 12 deletions config/jobs/kubernetes/kops/build_jobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,12 +385,7 @@ def presubmit_test(branch='master',
tmpl_file = "presubmit.yaml.jinja"
if scenario is not None:
tmpl_file = "presubmit-scenario.yaml.jinja"
name_hash = hashlib.md5(name.encode()).hexdigest()
env['CLOUD_PROVIDER'] = cloud
if cloud == "aws":
env['CLUSTER_NAME'] = f"e2e-{name_hash[0:10]}-{name_hash[11:16]}.tests-kops-aws.k8s.io"
if 'KOPS_STATE_STORE' not in env and cloud == "aws":
env['KOPS_STATE_STORE'] = 's3://k8s-kops-ci-prow-state-store'
if extra_flags:
env['KOPS_EXTRA_FLAGS'] = " ".join(extra_flags)
if irsa and cloud == "aws":
Expand Down Expand Up @@ -1582,7 +1577,6 @@ def generate_presubmits_scale():
networking='amazonvpc',
always_run=False,
optional=True,
artifacts='$(ARTIFACTS)',
test_timeout_minutes=450,
use_preset_for_account_creds='preset-aws-credential-boskos-scale-001-kops',
env={
Expand All @@ -1594,7 +1588,6 @@ def generate_presubmits_scale():
'NODE_MODE': "master",
'CONTROL_PLANE_COUNT': "3",
'CONTROL_PLANE_SIZE': "c8a.24xlarge",
'KOPS_STATE_STORE' : "s3://k8s-infra-kops-scale-tests",
'PROMETHEUS_SCRAPE_KUBE_PROXY': "true",
'CL2_ENABLE_DNS_PROGRAMMING': "true",
'CL2_ENABLE_API_AVAILABILITY_MEASUREMENT': "true",
Expand All @@ -1617,7 +1610,6 @@ def generate_presubmits_scale():
# only helps with setting the right anotation test.kops.k8s.io/networking
networking='amazonvpc',
always_run=False,
artifacts='$(ARTIFACTS)',
test_timeout_minutes=450,
use_preset_for_account_creds='preset-aws-credential-boskos-scale-001-kops',
env={
Expand All @@ -1630,7 +1622,6 @@ def generate_presubmits_scale():
'CL2_DELETE_TEST_THROUGHPUT': "50",
'CL2_RATE_LIMIT_POD_CREATION': "false",
'NODE_MODE': "master",
'KOPS_STATE_STORE' : "s3://k8s-infra-kops-scale-tests",
'PROMETHEUS_SCRAPE_KUBE_PROXY': "true",
'CL2_ENABLE_DNS_PROGRAMMING': "true",
'CL2_ENABLE_API_AVAILABILITY_MEASUREMENT': "true",
Expand All @@ -1651,7 +1642,6 @@ def generate_presubmits_scale():
networking='gce',
cloud="gce",
always_run=False,
artifacts='$(ARTIFACTS)',
test_timeout_minutes=450,
env={
'CNI_PLUGIN': "gce",
Expand Down Expand Up @@ -1687,7 +1677,6 @@ def generate_presubmits_scale():
cloud="gce",
always_run=False,
run_if_changed=r'^tests\/e2e\/scenarios\/scalability\/run-test.sh',
artifacts='$(ARTIFACTS)',
test_timeout_minutes=450,
env={
'CNI_PLUGIN': "gce",
Expand Down Expand Up @@ -1721,7 +1710,6 @@ def generate_presubmits_scale():
networking='gce',
cloud="gce",
always_run=False,
artifacts='$(ARTIFACTS)',
test_timeout_minutes=450,
env={
'CNI_PLUGIN': "kindnet",
Expand Down
32 changes: 0 additions & 32 deletions config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1049,10 +1049,6 @@ presubmits:
value: /home/prow/go
- name: CLOUD_PROVIDER
value: "aws"
- name: CLUSTER_NAME
value: "e2e-93386f3fd4-07e7d.tests-kops-aws.k8s.io"
- name: KOPS_STATE_STORE
value: "s3://k8s-kops-ci-prow-state-store"
- name: KOPS_IRSA
value: "true"
resources:
Expand Down Expand Up @@ -1108,10 +1104,6 @@ presubmits:
value: /home/prow/go
- name: CLOUD_PROVIDER
value: "aws"
- name: CLUSTER_NAME
value: "e2e-12ade267b4-0e701.tests-kops-aws.k8s.io"
- name: KOPS_STATE_STORE
value: "s3://k8s-kops-ci-prow-state-store"
- name: KOPS_IRSA
value: "true"
resources:
Expand Down Expand Up @@ -1167,10 +1159,6 @@ presubmits:
value: /home/prow/go
- name: CLOUD_PROVIDER
value: "aws"
- name: CLUSTER_NAME
value: "e2e-8851f75f16-e46fe.tests-kops-aws.k8s.io"
- name: KOPS_STATE_STORE
value: "s3://k8s-kops-ci-prow-state-store"
- name: KOPS_IRSA
value: "true"
resources:
Expand Down Expand Up @@ -2158,10 +2146,6 @@ presubmits:
value: /home/prow/go
- name: CLOUD_PROVIDER
value: "aws"
- name: CLUSTER_NAME
value: "e2e-d3f5571021-549a1.tests-kops-aws.k8s.io"
- name: KOPS_STATE_STORE
value: "s3://k8s-kops-ci-prow-state-store"
- name: KOPS_IRSA
value: "true"
resources:
Expand Down Expand Up @@ -2217,10 +2201,6 @@ presubmits:
value: /home/prow/go
- name: CLOUD_PROVIDER
value: "aws"
- name: CLUSTER_NAME
value: "e2e-48dc55eb73-6d49e.tests-kops-aws.k8s.io"
- name: KOPS_STATE_STORE
value: "s3://k8s-kops-ci-prow-state-store"
- name: KOPS_IRSA
value: "true"
resources:
Expand Down Expand Up @@ -2278,10 +2258,6 @@ presubmits:
value: "--ipv6 --topology=private --bastion"
- name: CLOUD_PROVIDER
value: "aws"
- name: CLUSTER_NAME
value: "e2e-e39f237b8c-e17ad.tests-kops-aws.k8s.io"
- name: KOPS_STATE_STORE
value: "s3://k8s-kops-ci-prow-state-store"
- name: KOPS_IRSA
value: "true"
resources:
Expand Down Expand Up @@ -2352,10 +2328,6 @@ presubmits:
value: "3"
- name: CLOUD_PROVIDER
value: "aws"
- name: CLUSTER_NAME
value: "e2e-1727ac1946-2023e.tests-kops-aws.k8s.io"
- name: KOPS_STATE_STORE
value: "s3://k8s-kops-ci-prow-state-store"
- name: KOPS_IRSA
value: "true"
resources:
Expand Down Expand Up @@ -2410,10 +2382,6 @@ presubmits:
value: /home/prow/go
- name: CLOUD_PROVIDER
value: "aws"
- name: CLUSTER_NAME
value: "e2e-fc5e1ab149-22fa7.tests-kops-aws.k8s.io"
- name: KOPS_STATE_STORE
value: "s3://k8s-kops-ci-prow-state-store"
- name: KOPS_IRSA
value: "true"
resources:
Expand Down
18 changes: 0 additions & 18 deletions config/jobs/kubernetes/kops/kops-presubmits-scale.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ presubmits:
value: ubuntu
- name: GOPATH
value: /home/prow/go
- name: ARTIFACTS
value: $(ARTIFACTS)
- name: CNI_PLUGIN
value: "amazonvpc"
- name: KUBE_NODE_COUNT
Expand All @@ -60,8 +58,6 @@ presubmits:
value: "3"
- name: CONTROL_PLANE_SIZE
value: "c8a.24xlarge"
- name: KOPS_STATE_STORE
value: "s3://k8s-infra-kops-scale-tests"
- name: PROMETHEUS_SCRAPE_KUBE_PROXY
value: "true"
- name: CL2_ENABLE_DNS_PROGRAMMING
Expand Down Expand Up @@ -90,8 +86,6 @@ presubmits:
value: "false"
- name: CLOUD_PROVIDER
value: "aws"
- name: CLUSTER_NAME
value: "e2e-ff02749ef8-a423a.tests-kops-aws.k8s.io"
- name: KOPS_IRSA
value: "true"
resources:
Expand Down Expand Up @@ -150,8 +144,6 @@ presubmits:
value: ubuntu
- name: GOPATH
value: /home/prow/go
- name: ARTIFACTS
value: $(ARTIFACTS)
- name: CNI_PLUGIN
value: "amazonvpc"
- name: KUBE_NODE_COUNT
Expand All @@ -170,8 +162,6 @@ presubmits:
value: "false"
- name: NODE_MODE
value: "master"
- name: KOPS_STATE_STORE
value: "s3://k8s-infra-kops-scale-tests"
- name: PROMETHEUS_SCRAPE_KUBE_PROXY
value: "true"
- name: CL2_ENABLE_DNS_PROGRAMMING
Expand All @@ -196,8 +186,6 @@ presubmits:
value: "20s"
- name: CLOUD_PROVIDER
value: "aws"
- name: CLUSTER_NAME
value: "e2e-fa029a0ba8-a2033.tests-kops-aws.k8s.io"
- name: KOPS_IRSA
value: "true"
resources:
Expand Down Expand Up @@ -256,8 +244,6 @@ presubmits:
value: prow
- name: GOPATH
value: /home/prow/go
- name: ARTIFACTS
value: $(ARTIFACTS)
- name: CNI_PLUGIN
value: "gce"
- name: KUBE_NODE_COUNT
Expand Down Expand Up @@ -363,8 +349,6 @@ presubmits:
value: prow
- name: GOPATH
value: /home/prow/go
- name: ARTIFACTS
value: $(ARTIFACTS)
- name: CNI_PLUGIN
value: "gce"
- name: KUBE_NODE_COUNT
Expand Down Expand Up @@ -467,8 +451,6 @@ presubmits:
value: prow
- name: GOPATH
value: /home/prow/go
- name: ARTIFACTS
value: $(ARTIFACTS)
- name: CNI_PLUGIN
value: "kindnet"
- name: KUBE_PROXY_MODE
Expand Down
1 change: 0 additions & 1 deletion config/jobs/kubernetes/sig-cloud-provider/aws/ec2-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,6 @@ periodics:
- --ttl=6h
- --path=s3://provider-aws-test-infra/objs.json
- --region=us-east-1
- --sweep-count=2
image: gcr.io/k8s-staging-boskos/aws-janitor:v20260107-c2c6f43
resources:
requests:
Expand Down
17 changes: 4 additions & 13 deletions config/jobs/kubernetes/sig-scalability/sig-scalability-periodic-ec2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ periodics:
args:
- --ttl=12h
- --path=s3://k8s-infra-kops-scale-tests/objs.json
- --sweep-count=2
image: gcr.io/k8s-staging-boskos/aws-janitor:v20260107-c2c6f43
resources:
requests:
Expand Down Expand Up @@ -88,8 +87,6 @@ periodics:
value: ubuntu
- name: GOPATH
value: /home/prow/go
- name: ARTIFACTS
value: $(ARTIFACTS)
- name: CNI_PLUGIN
value: "amazonvpc"
- name: KUBE_NODE_COUNT
Expand All @@ -106,8 +103,6 @@ periodics:
value: "3"
- name: CONTROL_PLANE_SIZE
value: "c8a.24xlarge"
- name: KOPS_STATE_STORE
value: "s3://k8s-infra-kops-scale-tests"
- name: PROMETHEUS_SCRAPE_KUBE_PROXY
value: "true"
- name: CL2_ENABLE_DNS_PROGRAMMING
Expand All @@ -120,12 +115,12 @@ periodics:
value: "1"
- name: ENABLE_PROMETHEUS_SERVER
value: "true"
- name: TEAR_DOWN_PROMETHEUS_SERVER
value: "false"
- name: PROMETHEUS_PVC_STORAGE_CLASS
value: "io2"
- name: CLOUD_PROVIDER
value: "aws"
- name: CLUSTER_NAME
value: "scale-5000.periodic.test-cncf-aws.k8s.io"
- name: KOPS_IRSA
value: "true"
resources:
Expand Down Expand Up @@ -194,8 +189,6 @@ periodics:
value: ubuntu
- name: GOPATH
value: /home/prow/go
- name: ARTIFACTS
value: $(ARTIFACTS)
- name: CNI_PLUGIN
value: "amazonvpc"
- name: KUBE_NODE_COUNT
Expand All @@ -212,8 +205,6 @@ periodics:
value: "3"
- name: CONTROL_PLANE_SIZE
value: "c8a.8xlarge"
- name: KOPS_STATE_STORE
value: "s3://k8s-infra-kops-scale-tests"
- name: PROMETHEUS_SCRAPE_KUBE_PROXY
value: "true"
- name: CL2_ENABLE_DNS_PROGRAMMING
Expand All @@ -226,12 +217,12 @@ periodics:
value: "1"
- name: ENABLE_PROMETHEUS_SERVER
value: "true"
- name: TEAR_DOWN_PROMETHEUS_SERVER
value: "false"
- name: PROMETHEUS_PVC_STORAGE_CLASS
value: "io2"
- name: CLOUD_PROVIDER
value: "aws"
- name: CLUSTER_NAME
value: "scale-100.periodic.test-cncf-aws.k8s.io"
- name: KOPS_IRSA
value: "true"
resources:
Expand Down
Loading