From a21e0db75fef0bb37d69b90981c47df82ad73b44 Mon Sep 17 00:00:00 2001 From: havelight-ee Date: Fri, 6 Jan 2023 09:43:18 +0900 Subject: [PATCH] kops instancegroup taint update --- .../spot_node_yaml/std/process-a.yaml | 13 +++------- .../spot_node_yaml/std/process-a2.yaml | 13 +++------- .../spot_node_yaml/std/process-b.yaml | 14 +++-------- .../spot_node_yaml/std/process-c.yaml | 13 +++------- .../spot_node_yaml/std/rel-process-a.yaml | 25 +++++++++++++++++++ .../spot_node_yaml/std/rel-process-a2.yaml | 25 +++++++++++++++++++ .../spot_node_yaml/std/rel-process-b.yaml | 25 +++++++++++++++++++ .../spot_node_yaml/std/rel-process-c.yaml | 25 +++++++++++++++++++ .../aws_kops_prod/terraform/99_variables.tf | 6 ++--- 9 files changed, 119 insertions(+), 40 deletions(-) create mode 100644 aws_kubernetes/aws_kops_prod/spot_node_yaml/std/rel-process-a.yaml create mode 100644 aws_kubernetes/aws_kops_prod/spot_node_yaml/std/rel-process-a2.yaml create mode 100644 aws_kubernetes/aws_kops_prod/spot_node_yaml/std/rel-process-b.yaml create mode 100644 aws_kubernetes/aws_kops_prod/spot_node_yaml/std/rel-process-c.yaml diff --git a/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/process-a.yaml b/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/process-a.yaml index 8f20adf..ce84ef8 100644 --- a/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/process-a.yaml +++ b/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/process-a.yaml @@ -1,26 +1,21 @@ apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: - creationTimestamp: "2022-12-13T05:21:10Z" labels: kops.k8s.io/cluster: k8s-prod.datasaker.io - name: k8s-rel-process-a + name: k8s-prod-process-a spec: image: ami-0409b7ddbc59e3222 machineType: m5a.xlarge manager: CloudGroup maxSize: 1 minSize: 1 - mixedInstancesPolicy: - onDemandAboveBase: 0 - onDemandBase: 0 - spotAllocationStrategy: capacity-optimized nodeLabels: - datasaker/group: rel-process - kops.k8s.io/instancegroup: k8s-rel-process-a + datasaker/group: process + kops.k8s.io/instancegroup: k8s-prod-process-a role: Node rootVolumeSize: 100 subnets: - ap-northeast-2a taints: - - prod/release:NoSchedule + - prod/process:NoSchedule diff --git a/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/process-a2.yaml b/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/process-a2.yaml index 9cd9617..921b4e4 100644 --- a/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/process-a2.yaml +++ b/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/process-a2.yaml @@ -1,26 +1,21 @@ apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: - creationTimestamp: "2022-12-13T05:21:10Z" labels: kops.k8s.io/cluster: k8s-prod.datasaker.io - name: k8s-rel-process-a2 + name: k8s-prod-process-a2 spec: image: ami-0409b7ddbc59e3222 machineType: m5a.xlarge manager: CloudGroup maxSize: 1 minSize: 1 - mixedInstancesPolicy: - onDemandAboveBase: 0 - onDemandBase: 0 - spotAllocationStrategy: capacity-optimized nodeLabels: - datasaker/group: rel-process - kops.k8s.io/instancegroup: k8s-rel-process-a2 + datasaker/group: process + kops.k8s.io/instancegroup: k8s-prod-process-a2 role: Node rootVolumeSize: 100 subnets: - ap-northeast-2a taints: - - prod/release:NoSchedule + - prod/process:NoSchedule diff --git a/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/process-b.yaml b/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/process-b.yaml index f516edb..74b7f5b 100644 --- a/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/process-b.yaml +++ b/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/process-b.yaml @@ -1,27 +1,21 @@ apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: - creationTimestamp: "2022-12-13T05:21:10Z" labels: kops.k8s.io/cluster: k8s-prod.datasaker.io - name: k8s-rel-process-b + name: k8s-prod-process-b spec: image: ami-0409b7ddbc59e3222 machineType: m6i.xlarge manager: CloudGroup maxSize: 1 minSize: 1 - mixedInstancesPolicy: - onDemandAboveBase: 0 - onDemandBase: 0 - spotAllocationStrategy: capacity-optimized nodeLabels: - datasaker/group: rel-process - kops.k8s.io/instancegroup: k8s-rel-process-b + datasaker/group: process + kops.k8s.io/instancegroup: k8s-prod-process-b role: Node rootVolumeSize: 100 subnets: - ap-northeast-2b taints: - - prod/release:NoSchedule - + - prod/process:NoSchedule diff --git a/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/process-c.yaml b/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/process-c.yaml index 8f69e4b..ddf42f2 100644 --- a/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/process-c.yaml +++ b/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/process-c.yaml @@ -1,26 +1,21 @@ apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: - creationTimestamp: "2022-12-13T05:21:10Z" labels: kops.k8s.io/cluster: k8s-prod.datasaker.io - name: k8s-rel-process-c + name: k8s-prod-process-c spec: image: ami-0409b7ddbc59e3222 machineType: m5a.xlarge manager: CloudGroup maxSize: 1 minSize: 1 - mixedInstancesPolicy: - onDemandAboveBase: 0 - onDemandBase: 0 - spotAllocationStrategy: capacity-optimized nodeLabels: - datasaker/group: rel-process - kops.k8s.io/instancegroup: k8s-rel-process-c + datasaker/group: process + kops.k8s.io/instancegroup: k8s-prod-process-c role: Node rootVolumeSize: 100 subnets: - ap-northeast-2c taints: - - prod/release:NoSchedule + - prod/process:NoSchedule diff --git a/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/rel-process-a.yaml b/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/rel-process-a.yaml new file mode 100644 index 0000000..5b6d293 --- /dev/null +++ b/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/rel-process-a.yaml @@ -0,0 +1,25 @@ +apiVersion: kops.k8s.io/v1alpha2 +kind: InstanceGroup +metadata: + labels: + kops.k8s.io/cluster: k8s-prod.datasaker.io + name: k8s-rel-process-a +spec: + image: ami-0409b7ddbc59e3222 + machineType: m5a.xlarge + manager: CloudGroup + maxSize: 1 + minSize: 1 + mixedInstancesPolicy: + onDemandAboveBase: 0 + onDemandBase: 0 + spotAllocationStrategy: capacity-optimized + nodeLabels: + datasaker/group: rel-process + kops.k8s.io/instancegroup: k8s-rel-process-a + role: Node + rootVolumeSize: 100 + subnets: + - ap-northeast-2a + taints: + - prod/rel-process:NoSchedule diff --git a/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/rel-process-a2.yaml b/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/rel-process-a2.yaml new file mode 100644 index 0000000..240eded --- /dev/null +++ b/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/rel-process-a2.yaml @@ -0,0 +1,25 @@ +apiVersion: kops.k8s.io/v1alpha2 +kind: InstanceGroup +metadata: + labels: + kops.k8s.io/cluster: k8s-prod.datasaker.io + name: k8s-rel-process-a2 +spec: + image: ami-0409b7ddbc59e3222 + machineType: m5a.xlarge + manager: CloudGroup + maxSize: 1 + minSize: 1 + mixedInstancesPolicy: + onDemandAboveBase: 0 + onDemandBase: 0 + spotAllocationStrategy: capacity-optimized + nodeLabels: + datasaker/group: rel-process + kops.k8s.io/instancegroup: k8s-rel-process-a2 + role: Node + rootVolumeSize: 100 + subnets: + - ap-northeast-2a + taints: + - prod/rel-process:NoSchedule diff --git a/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/rel-process-b.yaml b/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/rel-process-b.yaml new file mode 100644 index 0000000..c56a582 --- /dev/null +++ b/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/rel-process-b.yaml @@ -0,0 +1,25 @@ +apiVersion: kops.k8s.io/v1alpha2 +kind: InstanceGroup +metadata: + labels: + kops.k8s.io/cluster: k8s-prod.datasaker.io + name: k8s-rel-process-b +spec: + image: ami-0409b7ddbc59e3222 + machineType: m6i.xlarge + manager: CloudGroup + maxSize: 1 + minSize: 1 + mixedInstancesPolicy: + onDemandAboveBase: 0 + onDemandBase: 0 + spotAllocationStrategy: capacity-optimized + nodeLabels: + datasaker/group: rel-process + kops.k8s.io/instancegroup: k8s-rel-process-b + role: Node + rootVolumeSize: 100 + subnets: + - ap-northeast-2b + taints: + - prod/rel-process:NoSchedule diff --git a/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/rel-process-c.yaml b/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/rel-process-c.yaml new file mode 100644 index 0000000..c196c54 --- /dev/null +++ b/aws_kubernetes/aws_kops_prod/spot_node_yaml/std/rel-process-c.yaml @@ -0,0 +1,25 @@ +apiVersion: kops.k8s.io/v1alpha2 +kind: InstanceGroup +metadata: + labels: + kops.k8s.io/cluster: k8s-prod.datasaker.io + name: k8s-rel-process-c +spec: + image: ami-0409b7ddbc59e3222 + machineType: m5a.xlarge + manager: CloudGroup + maxSize: 1 + minSize: 1 + mixedInstancesPolicy: + onDemandAboveBase: 0 + onDemandBase: 0 + spotAllocationStrategy: capacity-optimized + nodeLabels: + datasaker/group: rel-process + kops.k8s.io/instancegroup: k8s-rel-process-c + role: Node + rootVolumeSize: 100 + subnets: + - ap-northeast-2c + taints: + - prod/rel-process:NoSchedule diff --git a/aws_kubernetes/aws_kops_prod/terraform/99_variables.tf b/aws_kubernetes/aws_kops_prod/terraform/99_variables.tf index 29904af..62cf1b1 100644 --- a/aws_kubernetes/aws_kops_prod/terraform/99_variables.tf +++ b/aws_kubernetes/aws_kops_prod/terraform/99_variables.tf @@ -8,15 +8,15 @@ variable "port_list" { #---------------------------------------------------------------# # LB 구성 후 target group 매칭 시 필요한 인스턴스 ID variable "master-2a" { - default = "i-080276c1ee1237696" + default = "i-0d3e86c594670c179" } variable "master-2b" { - default = "i-023274b3691fb2c07" + default = "i-095d625023c4d8d7e" } variable "master-2c" { - default = "i-033d278c81542933e" + default = "i-015532d6fb24f2754" } #---------------------------------------------------------------#