kops instancegroup taint update

2023-01-06 09:43:18 +09:00
parent fa9a7cff54
commit a21e0db75f
9 changed files with 119 additions and 40 deletions
--- 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    
--- 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    
--- 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    
--- 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    
--- 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
@@ -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    
--- 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
@@ -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    
--- 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
@@ -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    
--- 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
@@ -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    
--- 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"
 }

 #---------------------------------------------------------------#