Repository navigation
fix(blueprints): apply fedramp-high/gitlab GKE control plane and node settings - #345
Merged
aghassemlouei merged 2 commits intoOct 27, 2026
Merged
Conversation
digitalresistor
force-pushed
the
fix/fedramp-gitlab-gke-attrs
branch
from
October 23, 2026 16:51
af49624 to
1422e5a
Compare
18 of 19 tasks
12 of 19 tasks
aghassemlouei
left a comment
Member
There was a problem hiding this comment.
Thank you for moving 10.203.0.0/16 into access_config.ip_access.authorized_ranges, cleaning up default_nodepool, and wiring confidential_nodes on module.gke-node-pool. While testing blueprints/fedramp-high/gitlab against the GKE API and inspecting the planned attributes, we found two node pool configuration items to address alongside the rebase after #344.
… settings The cluster call passed attributes that the gke-cluster-standard module does not declare, and Terraform discarded them without an error: - vpc_config.master_authorized_ranges never reached the cluster, so the control plane had authorized networks enabled with no ranges. The 10.203.0.0/16 range now goes through access_config.ip_access.authorized_ranges, which the module renders as master_authorized_networks_config cidr_blocks. - default_nodepool.remove_default_node_pool duplicated remove_pool, which already removes the default node pool. - node_config.machine_type and node_config.confidential_nodes have no cluster input. The gke-node-pool module call already sets the n2d-standard-2 machine type, which supports Confidential GKE Nodes. The gke-node-pool module call now sets node_config.confidential_nodes, the optional gke-nodepool module input that the il5/gke-hardened fix for google#315 adds, so the GitLab nodes run as Confidential GKE Nodes. This change needs that module input and merges after it. Existing clusters see an in-place update of the authorized networks. With google provider 6.31.0 or later, the provider updates the node pool confidential_nodes setting in place and GKE recreates the nodes. With a lock file on a 6.21.0 to 6.30.x provider, the setting is ForceNew and Terraform replaces the node pool. Fixes google#314.
… node pool The GKE API rejects Confidential GKE Nodes on a 10 GB boot disk with "Disk_size_gb must be greater than 15", and the node pool passed no metadata, so it lacked block-project-ssh-keys (CIS GKE 4.3). - Raise the node pool disk_size_gb to 30. - Set block-project-ssh-keys on the node pool metadata; the gke-nodepool module now adds disable-legacy-endpoints to it. - Extend the node hardening test to the gitlab node pool.
digitalresistor
force-pushed
the
fix/fedramp-gitlab-gke-attrs
branch
from
October 27, 2026 15:37
55420a6 to
dc474f7
Compare
digitalresistor
marked this pull request as ready for review
October 27, 2026 15:37
aghassemlouei
approved these changes
Oct 27, 2026
aghassemlouei
left a comment
Member
There was a problem hiding this comment.
Thank you for updating disk_size_gb = 30, adding block-project-ssh-keys = "true", and adding unit coverage in tests/test_gke_node_hardening.py. Everything looks ready to merge.
Merged
Closed
12 of 19 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
The
blueprints/fedramp-high/gitlab/blueprint now authorizes the internal10.203.0.0/16range on the private GKE control plane endpoint and runs its node pool as Confidential GKE Nodes, as the cluster call always intended. The cluster call inmain.tfpassed attributes that themodules/gke-cluster-standard/module does not declare, and Terraform discarded them without an error.vpc_config.master_authorized_rangesattribute never reached the cluster. The plan on themainbranch enables authorized networks with no CIDR blocks, so only the node subnet primary range reaches the endpoint. The range now goes through theaccess_config.ip_access.authorized_rangesinput, which the module renders asmaster_authorized_networks_configCIDR blocks.default_nodepool.remove_default_node_poolattribute duplicated the declaredremove_poolattribute, which already removes the default node pool. The change drops the duplicate.node_config.machine_typeattribute has no cluster input. Thegke-node-poolmodule call already sets the samen2d-standard-2machine type, so the change drops the duplicate.node_config.confidential_nodesattribute has no cluster input either. The change drops it from the cluster call and sets thenode_config.confidential_nodesinput from fix(blueprints): apply il5/gke-hardened CIS node settings #344 on thegke-node-poolmodule call instead.The node pool also needed two more settings that a test against the GKE API found.
disk_size_gbinput rises from 10 to 30.block-project-ssh-keysmetadata key for CIS GKE 4.3, and thegke-nodepoolmodule from fix(blueprints): apply il5/gke-hardened CIS node settings #344 addsdisable-legacy-endpointsto it.Confidential GKE Nodes need no other setting in this blueprint.
n2d-standard-2machine type supports AMD SEV, the default confidential instance type for the N2D series.shielded_instance_configinput.pd-balanceddisk type work with Confidential VMs, once the disk is larger than 15 GB.confidential_nodessetting, which would force every node pool in the cluster onto confidential machine types. Thegke-cluster-standardmodule leaves that cluster setting unset.Every other attribute that the blueprint passes to the
gke-cluster-standardandgke-nodepoolmodules matches a declared input.The draft PR #311 syncs upstream Fabric v59 and sets
authorized_ranges = {}in the same block. After this PR merges, that draft PR keeps the10.203.0.0/16entry instead of the empty map.#344 merged and added the
node_config.confidential_nodesinput and the metadata merge to themodules/gke-nodepool/module, which this fix uses, so the branch now carries only the #314 commits.Fixes #314
Type of Change
Deployment & Compliance Impact
Breaking Changes
Existing deployments replace the
nodesnode pool on the next apply.disk_size_gbandmetadatanode pool settings are ForceNew on every supported google provider version, so Terraform destroys and recreates thenodesnode pool, and GitLab workloads lose their nodes until the new pool is ready.confidential_nodesblock is ForceNew as well.Checklist
Code Quality & Reusability
modules/orfast/stages-aw/can be leveraged for this change.docs/naming-convention.md.Documentation
README.mdof the modified module or blueprint.The blueprint README does not describe these settings, and the change adds no variables or outputs. #344 documented the new
gke-nodepoolmodule input in that module README.Security
Testing
Testing Performed
A temporary Terraform test with mocked
google,google-betaandtlsproviders planned the blueprint without credentials, using placeholder inputs. Temporary outputs in scratch copies of thegke-cluster-standardandgke-nodepoolmodules exposed the planned resource attributes. The PR contains none of these temporary files.terraform fmt -check,terraform init -backend=falseandterraform validatein the blueprint directory pass. The init resolves google provider 6.50.0.terraform testwithcommand = planpasses three assertions.master_authorized_networks_configblock lists exactly the10.203.0.0/16CIDR block.remove_default_node_poolattribute istrue.nodesnode pool plansconfidential_nodeswithenabled = true.mainbranch fails. The plan there has onemaster_authorized_networks_configblock with zero CIDR blocks and noconfidential_nodesblock on the node pool.node_config.gofile marks theconfidential_nodesblock and itsenabledfield asForceNew. Since v6.31.0, the provider dropsForceNewand updates the field through theUpdateNodePoolAPI, which the provider changelog lists for 6.31.0. Version 6.50.0 keeps that update path.bash tools/lint.shpasses every check except Terraform lint, which fails only because the local machine lacks thetflintbinary. The CItflintjob runs that check.