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.

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

Branch v2.21.0 existing network #22

Merged
merged 11 commits into from
Mar 2, 2023
Merged

Branch v2.21.0 existing network #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
10da9a7
try to make terraform use existing network
zonca Mar 1, 2023
ee21e66
test network auto for master node
zonca Mar 1, 2023
5e0a2cd
install only nginx
zonca Feb 24, 2023
67459f2
Revert "test network auto for master node"
zonca Mar 1, 2023
4c5ecaa
use auto allocated network, bypass port creation.
zonca Mar 2, 2023
6893da9
for k8s_node: use auto allocated network, bypass port creation
zonca Mar 2, 2023
4f9a3ee
associate security groups to instance
zonca Mar 2, 2023
2de9c39
Revert "associate security groups to instance"
zonca Mar 2, 2023
16767b6
Revert "for k8s_node: use auto allocated network, bypass port creation"
zonca Mar 2, 2023
43ff268
Revert "use auto allocated network, bypass port creation."
zonca Mar 2, 2023
3096853
now dns unnecessary
zonca Mar 2, 2023
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
10 changes: 4 additions & 6 deletions contrib/terraform/openstack/modules/network/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,16 @@ data "openstack_networking_router_v2" "k8s" {
count = var.use_neutron == 1 && var.router_id != null ? 1 : 0
}

resource "openstack_networking_network_v2" "k8s" {
data "openstack_networking_network_v2" "k8s" {
name = var.network_name
count = var.use_neutron
dns_domain = var.network_dns_domain != null ? var.network_dns_domain : null
admin_state_up = "true"
port_security_enabled = var.port_security_enabled
count = 1

}

resource "openstack_networking_subnet_v2" "k8s" {
name = "${var.cluster_name}-internal-network"
count = var.use_neutron
network_id = openstack_networking_network_v2.k8s[count.index].id
network_id = data.openstack_networking_network_v2.k8s[count.index].id
subnetpool_id = var.subnetpool_id
ip_version = 4
dns_nameservers = var.dns_nameservers
Expand Down
2 changes: 1 addition & 1 deletion contrib/terraform/openstack/modules/network/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ output "router_id" {
}

output "network_id" {
value = element(concat(openstack_networking_network_v2.k8s.*.id, [""]),0)
value = element(concat(data.openstack_networking_network_v2.k8s.*.id, [""]),0)
}

output "router_internal_port_id" {
Expand Down
10 changes: 8 additions & 2 deletions inventory/kubejetstream/cluster.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,19 @@ k8s_allowed_remote_ips = ["0.0.0.0/0"]
# have Kubernetes traffic use the internal IP
use_access_ip = 0

# Uncomment below and edit to set dns-domain network property (the initial tg- is not necessary anymore)
# network_dns_domain = "xxxxxxxxx.projects.jetstream-cloud.org."
# This is now un-necessary because we use the auto_allocated_network which is preconfigured
# network_dns_domain = "xxx000000.projects.jetstream-cloud.org."

# Reuse the auto allocated router, we do not want to waste floating IPs by having un-necessary routers
# openstack router list, find the ID (first column) of the `auto_allocated_router`
router_id = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"

# networking
network_name = "auto_allocated_network"

# Use a existing network with the name of network_name. Set to false to create a network with name of network_name.
use_existing_network = true

# Default subnetpool ID for JetStream2; Let neutron (openstack) do the CIDR
# book-keeping for you
subnetpool_id = "be988956-1bfb-4828-b511-a58229fbd4ac"
2 changes: 1 addition & 1 deletion inventory/kubejetstream/terraform_apply.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
terraform apply -auto-approve -var-file=cluster.tfvars -var="cluster_name=$CLUSTER" -var="network_name=${CLUSTER}-network" ../../contrib/terraform/openstack
terraform apply -var-file=cluster.tfvars -var="cluster_name=$CLUSTER" ../../contrib/terraform/openstack
2 changes: 1 addition & 1 deletion inventory/kubejetstream/terraform_destroy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
terraform destroy -var-file=cluster.tfvars -var="cluster_name=$CLUSTER" -var="network_name=${CLUSTER}-network" ../../contrib/terraform/openstack
terraform destroy -var-file=cluster.tfvars -var="cluster_name=$CLUSTER" ../../contrib/terraform/openstack
1 change: 1 addition & 0 deletions k8s_install_nginx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ansible-playbook --become -i inventory/$CLUSTER/hosts cluster.yml -b -v --limit "${CLUSTER}*" --tags apps,ingress-nginx,ingress-controller