Skip to content

Commit 2b9157c

Browse files
author
Victor Getz
committed
Update documentation and project factory version
1 parent 775c3bd commit 2b9157c

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,12 @@ Here is what we want to achieve:
4343
* Click "Create User" in the top right corner
4444
* <img src="documentation/otc-create-user-1.png" style="width: 50%; height: 25%"/>
4545
* Save the password somewhere secure and use this user for the workshop
46-
7. Adjust the .envrc file. The .envrc is needed to set environment variables which are used by terraform or by the otc-auth cli tool
46+
7. Since we will encrypt all data and disks by default add the "KMS Administrator" role to your project
47+
* Go to Identity and Access Management
48+
* Go to Agencies
49+
* Adjust EVSAccessKMS Agency like this
50+
* ![kms-agency.png](documentation%2Fkms-agency.png)
51+
8. Adjust the .envrc file. The .envrc is needed to set environment variables which are used by terraform or by the otc-auth cli tool
4752
* Set your context name under line number 2 (TF_VAR_context)
4853
* If you are not working under the region eu-de then please change line number 3 (TF_VAR_region)
4954
* replace all "REPLACE_ME" Placeholder with the correct values

documentation/kms-agency.png

108 KB
Loading

otc-cloud/dev/main.tf

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ data "opentelekomcloud_identity_project_v3" "current" {}
22

33
module "vpc" {
44
source = "registry.terraform.io/iits-consulting/project-factory/opentelekomcloud//modules/vpc"
5-
version = "5.2.1"
5+
version = "5.3.0"
66
name = "${var.context}-${var.stage}-vpc"
77
cidr_block = var.vpc_cidr
8-
enable_shared_snat = true
8+
enable_shared_snat = false
99
subnets = {
1010
"kubernetes-subnet" = cidrsubnet(var.vpc_cidr, 1, 0)
1111
}
@@ -14,37 +14,32 @@ module "vpc" {
1414

1515
module "snat" {
1616
source = "registry.terraform.io/iits-consulting/project-factory/opentelekomcloud//modules/snat"
17-
version = "5.2.1"
17+
version = "5.3.0"
1818
name_prefix = "${var.context}-${var.stage}"
1919
subnet_id = module.vpc.subnets["kubernetes-subnet"].id
2020
vpc_id = module.vpc.vpc.id
2121
tags = local.tags
2222
}
2323

2424
module "cce" {
25-
source = "registry.terraform.io/iits-consulting/project-factory/opentelekomcloud//modules/cce"
26-
version = "5.2.1"
25+
source = "registry.terraform.io/iits-consulting/project-factory/opentelekomcloud//modules/cce"
26+
version = "5.3.0"
2727

2828
name = "${var.context}-${var.stage}"
2929
cluster_vpc_id = module.vpc.vpc.id
3030
cluster_subnet_id = module.vpc.subnets["kubernetes-subnet"].id
31-
cluster_version = "v1.25"
3231
cluster_high_availability = var.cluster_config.high_availability
3332
cluster_enable_scaling = var.cluster_config.enable_scaling
3433
cluster_container_network_type = var.cluster_config.container_network_type
3534
cluster_container_cidr = var.cluster_config.container_cidr
3635
cluster_service_cidr = var.cluster_config.service_cidr
3736
cluster_public_access = true
38-
authentication_mode = "rbac"
39-
metrics_server_version = "1.3.2"
40-
autoscaler_version = "1.25.7"
41-
node_container_runtime = "containerd"
4237

43-
node_availability_zones = var.availability_zones
44-
node_count = var.cluster_config.nodes_count
45-
node_flavor = var.cluster_config.node_flavor
46-
node_storage_type = var.cluster_config.node_storage_type
47-
node_storage_size = var.cluster_config.node_storage_size
38+
node_availability_zones = var.availability_zones
39+
node_count = var.cluster_config.nodes_count
40+
node_flavor = var.cluster_config.node_flavor
41+
node_storage_type = var.cluster_config.node_storage_type
42+
node_storage_size = var.cluster_config.node_storage_size
4843
node_storage_encryption_enabled = true
4944

5045
autoscaler_node_min = var.cluster_config.nodes_count
@@ -55,7 +50,7 @@ module "cce" {
5550

5651
module "loadbalancer" {
5752
source = "registry.terraform.io/iits-consulting/project-factory/opentelekomcloud//modules/loadbalancer"
58-
version = "5.2.1"
53+
version = "5.3.0"
5954
context_name = var.context
6055
subnet_id = module.vpc.subnets["kubernetes-subnet"].subnet_id
6156
stage_name = var.stage
@@ -64,7 +59,7 @@ module "loadbalancer" {
6459

6560
module "private_dns" {
6661
source = "registry.terraform.io/iits-consulting/project-factory/opentelekomcloud//modules/private_dns"
67-
version = "5.2.1"
62+
version = "5.3.0"
6863
domain = "vpc.private"
6964
a_records = {
7065
kubernetes = [split(":", trimprefix(module.cce.cluster_private_ip, "https://"))[0]]
@@ -74,7 +69,7 @@ module "private_dns" {
7469

7570
module "public_dns" {
7671
source = "registry.terraform.io/iits-consulting/project-factory/opentelekomcloud//modules/public_dns"
77-
version = "5.2.1"
72+
version = "5.3.0"
7873
domain = var.domain_name
7974
email = var.email
8075
a_records = {
@@ -98,7 +93,7 @@ resource "opentelekomcloud_kms_key_v1" "storage_class_kms_key" {
9893
module "encyrpted_secrets_bucket" {
9994
providers = { opentelekomcloud = opentelekomcloud.top_level_project }
10095
source = "registry.terraform.io/iits-consulting/project-factory/opentelekomcloud//modules/obs_secrets_writer"
101-
version = "5.2.1"
96+
version = "5.3.0"
10297
bucket_name = replace(lower("${data.opentelekomcloud_identity_project_v3.current.name}-${var.context}-${var.stage}-stage-secrets"), "_", "-")
10398
bucket_object_key = "terraform-secrets"
10499
secrets = {

0 commit comments

Comments
 (0)