middleware 분배

2023-06-07 19:08:24 +09:00
parent 2005fe2a39
commit bcc62e990b
56 changed files with 3120 additions and 123 deletions
--- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-druid-b.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-druid-b.yaml
@@ -1,27 +0,0 @@
-apiVersion: kops.k8s.io/v1alpha2
-kind: InstanceGroup
-metadata:
-  creationTimestamp: "2022-12-02T09:21:53Z"
-  generation: 8
-  labels:
-    kops.k8s.io/cluster: k8s-prod.datasaker.io
-  name: k8s-prod-data-druid-b
-spec:
-  image: ami-0409b7ddbc59e3222
-  kubelet:
-    anonymousAuth: false
-    nodeLabels:
-      node-role.kubernetes.io/node: ""
-  machineType: m6i.xlarge
-  manager: CloudGroup
-  maxSize: 0
-  minSize: 0
-  nodeLabels:
-    datasaker/druid-size: small
-    datasaker/group: data-druid
-    kops.k8s.io/instancegroup: k8s-prod-data-druid-b
-  role: Node
-  subnets:
-  - ap-northeast-2b
-  taints:
-  - prod/data-druid:NoSchedule
--- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-druid-c.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-druid-c.yaml
@@ -2,12 +2,14 @@ apiVersion: kops.k8s.io/v1alpha2
 kind: InstanceGroup
 metadata:
  creationTimestamp: "2022-11-02T01:50:52Z"
-  generation: 8
+  generation: 9
  labels:
    kops.k8s.io/cluster: k8s-prod.datasaker.io
  name: k8s-prod-data-druid-c
 spec:
  image: ami-0409b7ddbc59e3222
+  instanceMetadata:
+    httpTokens: required
  kubelet:
    anonymousAuth: false
    nodeLabels:
--- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-druid-c2.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-druid-c2.yaml
@@ -1,31 +0,0 @@
-apiVersion: kops.k8s.io/v1alpha2
-kind: InstanceGroup
-metadata:
-  creationTimestamp: "2022-11-02T01:50:52Z"
-  generation: 8
-  labels:
-    kops.k8s.io/cluster: k8s-prod.datasaker.io
-  name: k8s-prod-data-druid-c2
-spec:
-  image: ami-0409b7ddbc59e3222
-  kubelet:
-    anonymousAuth: false
-    nodeLabels:
-      node-role.kubernetes.io/node: ""
-  machineType: m5a.4xlarge
-  manager: CloudGroup
-  maxSize: 0
-  minSize: 0
-  mixedInstancesPolicy:
-    onDemandAboveBase: 0
-    onDemandBase: 0
-    spotAllocationStrategy: capacity-optimized
-  nodeLabels:
-    datasaker/druid-size: large
-    datasaker/group: data-druid
-    kops.k8s.io/instancegroup: k8s-prod-data-druid-c2
-  role: Node
-  subnets:
-  - ap-northeast-2c
-  taints:
-  - prod/data-druid:NoSchedule
--- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-druid-large.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-druid-large.yaml
@@ -1,25 +1,31 @@
 apiVersion: kops.k8s.io/v1alpha2
 kind: InstanceGroup
 metadata:
+  creationTimestamp: "2023-05-26T02:27:44Z"
+  generation: 5
  labels:
    kops.k8s.io/cluster: k8s-prod.datasaker.io
  name: k8s-prod-data-druid-large
 spec:
  image: ami-0409b7ddbc59e3222
+  instanceMetadata:
+    httpTokens: required
  kubelet:
    anonymousAuth: false
    nodeLabels:
      node-role.kubernetes.io/node: ""
-  machineType: m5a.4xlarge
+  machineType: m5.4xlarge
  manager: CloudGroup
  maxSize: 2
  minSize: 2
  nodeLabels:
    datasaker/druid-size: large
    datasaker/group: data-druid
+    druid: middlemanager
    kops.k8s.io/instancegroup: k8s-prod-data-druid-large
  role: Node
  subnets:
  - ap-northeast-2c
  taints:
  - prod/data-druid:NoSchedule
+  - prod/druid-middlemanager:NoSchedule
--- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-druid-middle.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-druid-middle.yaml
@@ -2,11 +2,14 @@ apiVersion: kops.k8s.io/v1alpha2
 kind: InstanceGroup
 metadata:
  creationTimestamp: "2023-04-29T12:23:16Z"
+  generation: 1
  labels:
    kops.k8s.io/cluster: k8s-prod.datasaker.io
  name: k8s-prod-data-druid-middle
 spec:
  image: ami-0409b7ddbc59e3222
+  instanceMetadata:
+    httpTokens: required
  kubelet:
    anonymousAuth: false
    nodeLabels:
--- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-druid-small.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-druid-small.yaml
@@ -2,12 +2,14 @@ apiVersion: kops.k8s.io/v1alpha2
 kind: InstanceGroup
 metadata:
  creationTimestamp: "2023-04-29T12:23:24Z"
-  generation: 7
+  generation: 8
  labels:
    kops.k8s.io/cluster: k8s-prod.datasaker.io
  name: k8s-prod-data-druid-small
 spec:
  image: ami-0409b7ddbc59e3222
+  instanceMetadata:
+    httpTokens: required
  kubelet:
    anonymousAuth: false
    nodeLabels:
--- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-es-a.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-es-a.yaml
@@ -1,26 +0,0 @@
-apiVersion: kops.k8s.io/v1alpha2
-kind: InstanceGroup
-metadata:
-  creationTimestamp: "2022-12-02T06:42:32Z"
-  generation: 1
-  labels:
-    kops.k8s.io/cluster: k8s-prod.datasaker.io
-  name: k8s-prod-data-es-a
-spec:
-  image: ami-0409b7ddbc59e3222
-  kubelet:
-    anonymousAuth: false
-    nodeLabels:
-      node-role.kubernetes.io/node: ""
-  machineType: m5a.xlarge
-  manager: CloudGroup
-  maxSize: 0
-  minSize: 0
-  nodeLabels:
-    datasaker/group: data-es
-    kops.k8s.io/instancegroup: k8s-prod-data-es-a
-  role: Node
-  subnets:
-  - ap-northeast-2a
-  taints:
-  - prod/data-es:NoSchedule
--- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-es-b.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-es-b.yaml
@@ -1,26 +0,0 @@
-apiVersion: kops.k8s.io/v1alpha2
-kind: InstanceGroup
-metadata:
-  creationTimestamp: "2022-12-02T06:42:32Z"
-  generation: 1
-  labels:
-    kops.k8s.io/cluster: k8s-prod.datasaker.io
-  name: k8s-prod-data-es-b
-spec:
-  image: ami-0409b7ddbc59e3222
-  kubelet:
-    anonymousAuth: false
-    nodeLabels:
-      node-role.kubernetes.io/node: ""
-  machineType: m6i.xlarge
-  manager: CloudGroup
-  maxSize: 0
-  minSize: 0
-  nodeLabels:
-    datasaker/group: data-es
-    kops.k8s.io/instancegroup: k8s-prod-data-es-b
-  role: Node
-  subnets:
-  - ap-northeast-2b
-  taints:
-  - prod/data-es:NoSchedule
--- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-es-c.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-es-c.yaml
@@ -2,11 +2,14 @@ apiVersion: kops.k8s.io/v1alpha2
 kind: InstanceGroup
 metadata:
  creationTimestamp: "2022-12-02T06:42:33Z"
+  generation: 1
  labels:
    kops.k8s.io/cluster: k8s-prod.datasaker.io
  name: k8s-prod-data-es-c
 spec:
  image: ami-0409b7ddbc59e3222
+  instanceMetadata:
+    httpTokens: required
  kubelet:
    anonymousAuth: false
    nodeLabels:
--- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-es-c2.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-es-c2.yaml
@@ -2,11 +2,14 @@ apiVersion: kops.k8s.io/v1alpha2
 kind: InstanceGroup
 metadata:
  creationTimestamp: "2023-04-29T12:23:39Z"
+  generation: 1
  labels:
    kops.k8s.io/cluster: k8s-prod.datasaker.io
  name: k8s-prod-data-es-c2
 spec:
  image: ami-0409b7ddbc59e3222
+  instanceMetadata:
+    httpTokens: required
  kubelet:
    anonymousAuth: false
    nodeLabels:
--- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-es-c3.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-es-c3.yaml
@@ -2,11 +2,14 @@ apiVersion: kops.k8s.io/v1alpha2
 kind: InstanceGroup
 metadata:
  creationTimestamp: "2023-04-29T12:23:44Z"
+  generation: 1
  labels:
    kops.k8s.io/cluster: k8s-prod.datasaker.io
  name: k8s-prod-data-es-c3
 spec:
  image: ami-0409b7ddbc59e3222
+  instanceMetadata:
+    httpTokens: required
  kubelet:
    anonymousAuth: false
    nodeLabels:
--- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-es-data.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-es-data.yaml
@@ -1,27 +1,28 @@
 apiVersion: kops.k8s.io/v1alpha2
 kind: InstanceGroup
 metadata:
-  creationTimestamp: "2022-12-02T09:21:48Z"
-  generation: 9
+  creationTimestamp: "2023-06-05T06:48:41Z"
+  generation: 1
  labels:
    kops.k8s.io/cluster: k8s-prod.datasaker.io
-  name: k8s-prod-data-druid-a
+  name: k8s-prod-data-es-data
 spec:
  image: ami-0409b7ddbc59e3222
+  instanceMetadata:
+    httpTokens: required
  kubelet:
    anonymousAuth: false
    nodeLabels:
      node-role.kubernetes.io/node: ""
  machineType: m5a.2xlarge
  manager: CloudGroup
-  maxSize: 0
-  minSize: 0
+  maxSize: 2
+  minSize: 2
  nodeLabels:
-    datasaker/druid-size: middle
-    datasaker/group: data-druid
-    kops.k8s.io/instancegroup: k8s-prod-data-druid-a
+    datasaker/group: data-es-data
+    kops.k8s.io/instancegroup: k8s-prod-data-es-data
  role: Node
  subnets:
-  - ap-northeast-2a
+  - ap-northeast-2c
  taints:
-  - prod/data-druid:NoSchedule
+  - prod/data-es-data:NoSchedule
--- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-es-master.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-es-master.yaml
@@ -1,26 +1,27 @@
 apiVersion: kops.k8s.io/v1alpha2
 kind: InstanceGroup
 metadata:
-  creationTimestamp: "2022-12-02T09:26:45Z"
-  generation: 4
+  creationTimestamp: "2023-06-07T02:05:11Z"
  labels:
    kops.k8s.io/cluster: k8s-prod.datasaker.io
-  name: k8s-prod-data-kafka-c
+  name: k8s-prod-data-es-master
 spec:
  image: ami-0409b7ddbc59e3222
+  instanceMetadata:
+    httpTokens: required
  kubelet:
    anonymousAuth: false
    nodeLabels:
      node-role.kubernetes.io/node: ""
  machineType: m5a.xlarge
  manager: CloudGroup
-  maxSize: 1
-  minSize: 1
+  maxSize: 3
+  minSize: 3
  nodeLabels:
-    datasaker/group: data-kafka
-    kops.k8s.io/instancegroup: k8s-prod-data-kafka-c
+    datasaker/group: data-es-master
+    kops.k8s.io/instancegroup: k8s-prod-data-es-master
  role: Node
  subnets:
  - ap-northeast-2c
  taints:
-  - prod/data-kafka:NoSchedule
+  - prod/data-es-master:NoSchedule
--- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-kafka-a.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-kafka-a.yaml
@@ -1,26 +0,0 @@
-apiVersion: kops.k8s.io/v1alpha2
-kind: InstanceGroup
-metadata:
-  creationTimestamp: "2022-12-02T09:26:35Z"
-  generation: 5
-  labels:
-    kops.k8s.io/cluster: k8s-prod.datasaker.io
-  name: k8s-prod-data-kafka-a
-spec:
-  image: ami-0409b7ddbc59e3222
-  kubelet:
-    anonymousAuth: false
-    nodeLabels:
-      node-role.kubernetes.io/node: ""
-  machineType: m5a.xlarge
-  manager: CloudGroup
-  maxSize: 0
-  minSize: 0
-  nodeLabels:
-    datasaker/group: data-kafka
-    kops.k8s.io/instancegroup: k8s-prod-data-kafka-a
-  role: Node
-  subnets:
-  - ap-northeast-2a
-  taints:
-  - prod/data-kafka:NoSchedule
--- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-kafka-b.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-kafka-b.yaml
@@ -1,26 +0,0 @@
-apiVersion: kops.k8s.io/v1alpha2
-kind: InstanceGroup
-metadata:
-  creationTimestamp: "2022-12-02T09:26:40Z"
-  generation: 1
-  labels:
-    kops.k8s.io/cluster: k8s-prod.datasaker.io
-  name: k8s-prod-data-kafka-b
-spec:
-  image: ami-0409b7ddbc59e3222
-  kubelet:
-    anonymousAuth: false
-    nodeLabels:
-      node-role.kubernetes.io/node: ""
-  machineType: m6i.xlarge
-  manager: CloudGroup
-  maxSize: 0
-  minSize: 0
-  nodeLabels:
-    datasaker/group: data-kafka
-    kops.k8s.io/instancegroup: k8s-prod-data-kafka-b
-  role: Node
-  subnets:
-  - ap-northeast-2b
-  taints:
-  - prod/data-kafka:NoSchedule
--- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-kafka-c2.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-kafka-c2.yaml
@@ -1,23 +1,26 @@
 apiVersion: kops.k8s.io/v1alpha2
 kind: InstanceGroup
 metadata:
-  creationTimestamp: "2023-02-20T10:04:39Z"
+  creationTimestamp: "2023-06-05T06:48:34Z"
+  generation: 3
  labels:
    kops.k8s.io/cluster: k8s-prod.datasaker.io
-  name: k8s-prod-data-kafka-c2
+  name: k8s-prod-data-kafka
 spec:
-  image: ami-0409b7ddbc59e3222
+  image: ami-03a4aa6d399a5d20b
+  instanceMetadata:
+    httpTokens: required
  kubelet:
    anonymousAuth: false
    nodeLabels:
      node-role.kubernetes.io/node: ""
-  machineType: m5a.xlarge
+  machineType: m5a.2xlarge
  manager: CloudGroup
-  maxSize: 1
-  minSize: 1
+  maxSize: 3
+  minSize: 3
  nodeLabels:
    datasaker/group: data-kafka
-    kops.k8s.io/instancegroup: k8s-prod-data-kafka-c2
+    kops.k8s.io/instancegroup: k8s-prod-data-kafka
  role: Node
  subnets:
  - ap-northeast-2c
--- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-kafka-c3.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-kafka-c3.yaml
@@ -1,12 +1,15 @@
 apiVersion: kops.k8s.io/v1alpha2
 kind: InstanceGroup
 metadata:
-  creationTimestamp: "2023-02-20T10:05:05Z"
+  creationTimestamp: "2023-06-07T09:14:27Z"
+  generation: 1
  labels:
    kops.k8s.io/cluster: k8s-prod.datasaker.io
-  name: k8s-prod-data-kafka-c3
+  name: k8s-prod-data
 spec:
-  image: ami-0409b7ddbc59e3222
+  image: ami-03a4aa6d399a5d20b
+  instanceMetadata:
+    httpTokens: required
  kubelet:
    anonymousAuth: false
    nodeLabels:
@@ -16,10 +19,10 @@ spec:
  maxSize: 1
  minSize: 1
  nodeLabels:
-    datasaker/group: data-kafka
-    kops.k8s.io/instancegroup: k8s-prod-data-kafka-c3
+    datasaker/group: data
+    kops.k8s.io/instancegroup: k8s-prod-data
  role: Node
  subnets:
  - ap-northeast-2c
  taints:
-  - prod/data-kafka:NoSchedule
+  - prod/data:NoSchedule
--- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-process-a.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-process-a.yaml
@@ -1,23 +0,0 @@
-apiVersion: kops.k8s.io/v1alpha2
-kind: InstanceGroup
-metadata:
-  creationTimestamp: "2023-01-06T00:24:37Z"
-  generation: 3
-  labels:
-    kops.k8s.io/cluster: k8s-prod.datasaker.io
-  name: k8s-prod-process-a
-spec:
-  image: ami-0409b7ddbc59e3222
-  machineType: m5a.xlarge
-  manager: CloudGroup
-  maxSize: 0
-  minSize: 0
-  nodeLabels:
-    datasaker/group: process
-    kops.k8s.io/instancegroup: k8s-prod-process-a
-  role: Node
-  rootVolumeSize: 100
-  subnets:
-  - ap-northeast-2a
-  taints:
-  - prod/process:NoSchedule
--- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-process-a2.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-process-a2.yaml
@@ -1,23 +0,0 @@
-apiVersion: kops.k8s.io/v1alpha2
-kind: InstanceGroup
-metadata:
-  creationTimestamp: "2023-01-06T00:24:42Z"
-  generation: 2
-  labels:
-    kops.k8s.io/cluster: k8s-prod.datasaker.io
-  name: k8s-prod-process-a2
-spec:
-  image: ami-0409b7ddbc59e3222
-  machineType: m5a.xlarge
-  manager: CloudGroup
-  maxSize: 0
-  minSize: 0
-  nodeLabels:
-    datasaker/group: process
-    kops.k8s.io/instancegroup: k8s-prod-process-a2
-  role: Node
-  rootVolumeSize: 100
-  subnets:
-  - ap-northeast-2a
-  taints:
-  - prod/process:NoSchedule
--- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-process-c.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-process-c.yaml
@@ -1,23 +0,0 @@
-apiVersion: kops.k8s.io/v1alpha2
-kind: InstanceGroup
-metadata:
-  creationTimestamp: "2023-01-06T00:24:53Z"
-  generation: 2
-  labels:
-    kops.k8s.io/cluster: k8s-prod.datasaker.io
-  name: k8s-prod-process-c
-spec:
-  image: ami-0409b7ddbc59e3222
-  machineType: m5a.xlarge
-  manager: CloudGroup
-  maxSize: 2
-  minSize: 2
-  nodeLabels:
-    datasaker/group: process
-    kops.k8s.io/instancegroup: k8s-prod-process-c
-  role: Node
-  rootVolumeSize: 100
-  subnets:
-  - ap-northeast-2c
-  taints:
-  - prod/process:NoSchedule
--- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-process-c2.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-process-c2.yaml
@@ -1,22 +0,0 @@
-apiVersion: kops.k8s.io/v1alpha2
-kind: InstanceGroup
-metadata:
-  creationTimestamp: "2023-02-20T09:23:11Z"
-  generation: 1
-  labels:
-    kops.k8s.io/cluster: k8s-prod.datasaker.io
-  name: k8s-prod-process-c2
-spec:
-  image: ami-0409b7ddbc59e3222
-  machineType: m6i.xlarge
-  manager: CloudGroup
-  maxSize: 3
-  minSize: 2
-  nodeLabels:
-    datasaker/group: process
-    datasaker/group2: stream-process
-    kops.k8s.io/instancegroup: k8s-prod-process-c2
-  role: Node
-  rootVolumeSize: 100
-  subnets:
-  - ap-northeast-2c
--- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-process-c3.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-process-c3.yaml
@@ -1,26 +0,0 @@
-apiVersion: kops.k8s.io/v1alpha2
-kind: InstanceGroup
-metadata:
-  creationTimestamp: "2023-04-04T08:25:12Z"
-  generation: 1
-  labels:
-    kops.k8s.io/cluster: k8s-prod.datasaker.io
-  name: k8s-prod-process-c3
-spec:
-  image: ami-0409b7ddbc59e3222
-  machineType: m5a.xlarge
-  manager: CloudGroup
-  maxSize: 0
-  minSize: 0
-  mixedInstancesPolicy:
-    onDemandAboveBase: 0
-    onDemandBase: 0
-    spotAllocationStrategy: capacity-optimized
-  nodeLabels:
-    datasaker/group: process
-    datasaker/group2: stream-process
-    kops.k8s.io/instancegroup: k8s-prod-process-c3
-  role: Node
-  rootVolumeSize: 100
-  subnets:
-  - ap-northeast-2c
--- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-process-m5a.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-process-m5a.yaml
@@ -1,20 +1,21 @@
 apiVersion: kops.k8s.io/v1alpha2
 kind: InstanceGroup
 metadata:
-  creationTimestamp: "2023-04-29T12:23:54Z"
-  generation: 2
+  creationTimestamp: "2023-06-07T08:34:13Z"
  labels:
    kops.k8s.io/cluster: k8s-prod.datasaker.io
-  name: k8s-prod-process-c4
+  name: k8s-prod-process-m5a
 spec:
-  image: ami-0409b7ddbc59e3222
+  image: ami-01e58630c6fb43a44
+  instanceMetadata:
+    httpTokens: required
  machineType: m5a.xlarge
  manager: CloudGroup
-  maxSize: 1
-  minSize: 1
+  maxSize: 3
+  minSize: 3
  nodeLabels:
    datasaker/group: process
-    kops.k8s.io/instancegroup: k8s-prod-process-c4
+    kops.k8s.io/instancegroup: k8s-prod-process-m5a
  role: Node
  rootVolumeSize: 100
  subnets:
--- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-process-m6i.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-process-m6i.yaml
@@ -1,23 +1,24 @@
 apiVersion: kops.k8s.io/v1alpha2
 kind: InstanceGroup
 metadata:
-  creationTimestamp: "2023-01-06T00:24:48Z"
-  generation: 2
+  creationTimestamp: "2023-06-07T08:34:21Z"
  labels:
    kops.k8s.io/cluster: k8s-prod.datasaker.io
-  name: k8s-prod-process-b
+  name: k8s-prod-process-m6i
 spec:
-  image: ami-0409b7ddbc59e3222
+  image: ami-01e58630c6fb43a44
+  instanceMetadata:
+    httpTokens: required
  machineType: m6i.xlarge
  manager: CloudGroup
-  maxSize: 0
-  minSize: 0
+  maxSize: 3
+  minSize: 3
  nodeLabels:
    datasaker/group: process
-    kops.k8s.io/instancegroup: k8s-prod-process-b
+    kops.k8s.io/instancegroup: k8s-prod-process-m6i
  role: Node
  rootVolumeSize: 100
  subnets:
-  - ap-northeast-2b
+  - ap-northeast-2c
  taints:
  - prod/process:NoSchedule
--- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-tmp.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-tmp.yaml
@@ -1,17 +1,20 @@
 apiVersion: kops.k8s.io/v1alpha2
 kind: InstanceGroup
 metadata:
+  creationTimestamp: "2023-05-19T14:51:54Z"
+  generation: 2
  labels:
    kops.k8s.io/cluster: k8s-prod.datasaker.io
  name: k8s-prod-tmp
 spec:
  image: ami-0409b7ddbc59e3222
+  instanceMetadata:
+    httpTokens: required
  kubelet:
    anonymousAuth: false
    nodeLabels:
      node-role.kubernetes.io/node: ""
  machineType: m5a.2xlarge
-  manager: CloudGroup
  maxSize: 1
  minSize: 1
  nodeLabels:
--- a/kops/aws_kops_prod/instancegroup_backup/k8s-rel-process-a.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-rel-process-a.yaml
@@ -1,27 +0,0 @@
-apiVersion: kops.k8s.io/v1alpha2
-kind: InstanceGroup
-metadata:
-  creationTimestamp: "2023-01-06T00:25:00Z"
-  generation: 2
-  labels:
-    kops.k8s.io/cluster: k8s-prod.datasaker.io
-  name: k8s-rel-process-a
-spec:
-  image: ami-0409b7ddbc59e3222
-  machineType: m5a.xlarge
-  manager: CloudGroup
-  maxSize: 0
-  minSize: 0
-  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/kops/aws_kops_prod/instancegroup_backup/k8s-rel-process-a2.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-rel-process-a2.yaml
@@ -1,27 +0,0 @@
-apiVersion: kops.k8s.io/v1alpha2
-kind: InstanceGroup
-metadata:
-  creationTimestamp: "2023-01-06T00:25:05Z"
-  generation: 3
-  labels:
-    kops.k8s.io/cluster: k8s-prod.datasaker.io
-  name: k8s-rel-process-a2
-spec:
-  image: ami-0409b7ddbc59e3222
-  machineType: m5a.xlarge
-  manager: CloudGroup
-  maxSize: 0
-  minSize: 0
-  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/kops/aws_kops_prod/instancegroup_backup/k8s-rel-process-b.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-rel-process-b.yaml
@@ -1,27 +0,0 @@
-apiVersion: kops.k8s.io/v1alpha2
-kind: InstanceGroup
-metadata:
-  creationTimestamp: "2023-01-06T00:25:10Z"
-  generation: 3
-  labels:
-    kops.k8s.io/cluster: k8s-prod.datasaker.io
-  name: k8s-rel-process-b
-spec:
-  image: ami-0409b7ddbc59e3222
-  machineType: m6i.xlarge
-  manager: CloudGroup
-  maxSize: 0
-  minSize: 0
-  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/kops/aws_kops_prod/instancegroup_backup/k8s-rel-process-c.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/k8s-rel-process-c.yaml
@@ -2,13 +2,15 @@ apiVersion: kops.k8s.io/v1alpha2
 kind: InstanceGroup
 metadata:
  creationTimestamp: "2023-01-06T00:25:15Z"
-  generation: 3
+  generation: 6
  labels:
    kops.k8s.io/cluster: k8s-prod.datasaker.io
  name: k8s-rel-process-c
 spec:
  image: ami-0409b7ddbc59e3222
-  machineType: m5a.xlarge
+  instanceMetadata:
+    httpTokens: required
+  machineType: m6i.xlarge
  manager: CloudGroup
  maxSize: 4
  minSize: 4
--- a/kops/aws_kops_prod/instancegroup_backup/master-ap-northeast-2a.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/master-ap-northeast-2a.yaml
@@ -1,19 +0,0 @@
-apiVersion: kops.k8s.io/v1alpha2
-kind: InstanceGroup
-metadata:
-  creationTimestamp: "2022-11-01T05:36:36Z"
-  generation: 2
-  labels:
-    kops.k8s.io/cluster: k8s-prod.datasaker.io
-  name: master-ap-northeast-2a
-spec:
-  image: ami-0409b7ddbc59e3222
-  instanceMetadata:
-    httpPutResponseHopLimit: 3
-    httpTokens: required
-  machineType: c5a.large
-  maxSize: 1
-  minSize: 1
-  role: Master
-  subnets:
-  - ap-northeast-2a
--- a/kops/aws_kops_prod/instancegroup_backup/master-ap-northeast-2b.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/master-ap-northeast-2b.yaml
@@ -1,19 +0,0 @@
-apiVersion: kops.k8s.io/v1alpha2
-kind: InstanceGroup
-metadata:
-  creationTimestamp: "2022-11-01T05:36:36Z"
-  generation: 2
-  labels:
-    kops.k8s.io/cluster: k8s-prod.datasaker.io
-  name: master-ap-northeast-2b
-spec:
-  image: ami-0409b7ddbc59e3222
-  instanceMetadata:
-    httpPutResponseHopLimit: 3
-    httpTokens: required
-  machineType: c5a.large
-  maxSize: 1
-  minSize: 1
-  role: Master
-  subnets:
-  - ap-northeast-2b
--- a/kops/aws_kops_prod/instancegroup_backup/master-ap-northeast-2c.yaml
+++ b/kops/aws_kops_prod/instancegroup_backup/master-ap-northeast-2c.yaml
@@ -1,19 +0,0 @@
-apiVersion: kops.k8s.io/v1alpha2
-kind: InstanceGroup
-metadata:
-  creationTimestamp: "2022-11-01T05:36:36Z"
-  generation: 2
-  labels:
-    kops.k8s.io/cluster: k8s-prod.datasaker.io
-  name: master-ap-northeast-2c
-spec:
-  image: ami-0409b7ddbc59e3222
-  instanceMetadata:
-    httpPutResponseHopLimit: 3
-    httpTokens: required
-  machineType: c5a.large
-  maxSize: 1
-  minSize: 1
-  role: Master
-  subnets:
-  - ap-northeast-2c