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.

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

prow: match prow-build-trusted nodepool to prow-build #2479

Merged
merged 1 commit into from
Aug 6, 2021

Conversation

spiffxp
Copy link
Member

@spiffxp spiffxp commented Aug 6, 2021

the motivating factor here is trying to run the triage job on this
cluster, which asks for more memory than an n1-standard-8 can provide

but in general I can't think of a good reason to restrict this cluster
to less resources than the regular prow-build cluster, while having it
match the cluster would create less surprises when transferring a job
from one to the other for whatever reason

the motivating factor here is trying to run the triage job on this
cluster, which asks for more memory than an n1-standard-8 can provide

but in general I can't think of a good reason to restrict this cluster
to less resources than the regular prow-build cluster, while having it
match the cluster would create less surprises when transferring a job
from one to the other for whatever reason
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 6, 2021
@k8s-ci-robot k8s-ci-robot added area/infra Infrastructure management, infrastructure design, code in infra/ area/prow Setting up or working with prow in general, prow.k8s.io, prow build clusters area/terraform Terraform modules, testing them, writing more of them, code in infra/gcp/clusters/ sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels Aug 6, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: spiffxp

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added wg/k8s-infra approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 6, 2021
@ameukam
Copy link
Member

ameukam commented Aug 6, 2021

/lgtm
/hold
Remove hold when ready to deploy.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 6, 2021
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 6, 2021
@ameukam
Copy link
Member

ameukam commented Aug 6, 2021

FYI #2438.

@spiffxp
Copy link
Member Author

spiffxp commented Aug 6, 2021

I'd rather tackle changing instance type later, achieving parity is my goal for now

@spiffxp
Copy link
Member Author

spiffxp commented Aug 6, 2021

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 6, 2021
@k8s-ci-robot k8s-ci-robot merged commit 7d7493b into kubernetes:main Aug 6, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.23 milestone Aug 6, 2021
@spiffxp spiffxp deleted the raise-trusted-nodepool branch August 6, 2021 15:21
@spiffxp
Copy link
Member Author

spiffxp commented Aug 6, 2021

Uh... why did it not change any of the nodepool settings?

Terraform used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols:
  ~ update in-place

Terraform will perform the following actions:

  # module.prow_build_nodepool.google_container_node_pool.node_pool will be updated in-place
  ~ resource "google_container_node_pool" "node_pool" {
        id                  = "projects/k8s-infra-prow-build-trusted/locations/us-central1/clusters/prow-build-trusted/nodePools/trusted-pool1-20200430235251092500000001"
        name                = "trusted-pool1-20200430235251092500000001"
        # (9 unchanged attributes hidden)

      ~ autoscaling {
          ~ max_node_count = 3 -> 6
            # (1 unchanged attribute hidden)
        }



        # (3 unchanged blocks hidden)
    }

Plan: 0 to add, 1 to change, 0 to destroy.

@spiffxp
Copy link
Member Author

spiffxp commented Aug 6, 2021

OK, I figured out why, PR is here: #2480

Going to apply with that change

Terraform used the selected providers to generate the following execution plan. Resource actions are indicated with the following symbols:
+/- create replacement and then destroy

Terraform will perform the following actions:

  # module.prow_build_nodepool.google_container_node_pool.node_pool must be replaced
+/- resource "google_container_node_pool" "node_pool" {
      ~ id                  = "projects/k8s-infra-prow-build-trusted/locations/us-central1/clusters/prow-build-trusted/nodePools/trusted-pool1-20200430235251092500000001" -> (known after apply)
      ~ instance_group_urls = [
          - "https://www.googleapis.com/compute/v1/projects/k8s-infra-prow-build-trusted/zones/us-central1-a/instanceGroupManagers/gke-prow-build-trust-trusted-pool1-20-fd38017e-grp",
          - "https://www.googleapis.com/compute/v1/projects/k8s-infra-prow-build-trusted/zones/us-central1-f/instanceGroupManagers/gke-prow-build-trust-trusted-pool1-20-caef7902-grp",
          - "https://www.googleapis.com/compute/v1/projects/k8s-infra-prow-build-trusted/zones/us-central1-b/instanceGroupManagers/gke-prow-build-trust-trusted-pool1-20-5e50b276-grp",
        ] -> (known after apply)
      + max_pods_per_node   = (known after apply)
      ~ name                = "trusted-pool1-20200430235251092500000001" -> (known after apply)
      ~ node_count          = 1 -> (known after apply)
      ~ node_locations      = [
          - "us-central1-a",
          - "us-central1-b",
          - "us-central1-f",
        ] -> (known after apply)
      + operation           = (known after apply)
      ~ version             = "1.20.8-gke.900" -> (known after apply)
        # (5 unchanged attributes hidden)



      ~ node_config {
          ~ disk_type         = "pd-standard" -> "pd-ssd" # forces replacement
          ~ guest_accelerator = [] -> (known after apply)
          ~ image_type        = "COS" -> "UBUNTU_CONTAINERD"
          ~ labels            = {} -> (known after apply)
          ~ local_ssd_count   = 0 -> (known after apply)
          ~ machine_type      = "n1-standard-8" -> "n1-highmem-8" # forces replacement
          - tags              = [] -> null
            # (6 unchanged attributes hidden)

          ~ shielded_instance_config {
              ~ enable_integrity_monitoring = true -> (known after apply)
              ~ enable_secure_boot          = false -> (known after apply)
            }

            # (1 unchanged block hidden)
        }

      ~ upgrade_settings {
          ~ max_surge       = 1 -> (known after apply)
          ~ max_unavailable = 0 -> (known after apply)
        }
        # (2 unchanged blocks hidden)
    }

@spiffxp
Copy link
Member Author

spiffxp commented Aug 6, 2021

Apply complete! Resources: 1 added, 0 changed, 1 destroyed.

@ameukam
Copy link
Member

ameukam commented Aug 6, 2021

💸 💸

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/infra Infrastructure management, infrastructure design, code in infra/ area/prow Setting up or working with prow in general, prow.k8s.io, prow build clusters area/terraform Terraform modules, testing them, writing more of them, code in infra/gcp/clusters/ cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants