From 9a68f4ec9e1f12552f9f375f56e169feca68c734 Mon Sep 17 00:00:00 2001 From: havelight-ee Date: Wed, 27 Sep 2023 12:14:32 +0900 Subject: [PATCH] =?UTF-8?q?es=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../k8s-prod-data-es-c.yaml | 28 ------------------- .../k8s-prod-data-es-c2.yaml | 28 ------------------- .../k8s-prod-data-es-c3.yaml | 28 ------------------- ...aml => k8s-prod-data-opensearch-data.yaml} | 12 ++++---- ...l => k8s-prod-data-opensearch-master.yaml} | 11 ++++---- 5 files changed, 10 insertions(+), 97 deletions(-) delete mode 100644 kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-es-c.yaml delete mode 100644 kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-es-c2.yaml delete mode 100644 kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-es-c3.yaml rename kops/aws_kops_prod/instancegroup_backup/{k8s-prod-data-es-data.yaml => k8s-prod-data-opensearch-data.yaml} (62%) rename kops/aws_kops_prod/instancegroup_backup/{k8s-prod-data-es-master.yaml => k8s-prod-data-opensearch-master.yaml} (63%) diff --git 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 deleted file mode 100644 index 7424de8..0000000 --- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-es-c.yaml +++ /dev/null @@ -1,28 +0,0 @@ -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: - node-role.kubernetes.io/node: "" - machineType: m5a.xlarge - manager: CloudGroup - maxSize: 1 - minSize: 1 - nodeLabels: - datasaker/group: data-es - kops.k8s.io/instancegroup: k8s-prod-data-es-c - role: Node - subnets: - - ap-northeast-2c - taints: - - prod/data-es:NoSchedule diff --git 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 deleted file mode 100644 index 63a905a..0000000 --- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-es-c2.yaml +++ /dev/null @@ -1,28 +0,0 @@ -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: - node-role.kubernetes.io/node: "" - machineType: m5a.xlarge - manager: CloudGroup - maxSize: 1 - minSize: 1 - nodeLabels: - datasaker/group: data-es - kops.k8s.io/instancegroup: k8s-prod-data-es-c2 - role: Node - subnets: - - ap-northeast-2c - taints: - - prod/data-es:NoSchedule diff --git 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 deleted file mode 100644 index 17311e8..0000000 --- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-es-c3.yaml +++ /dev/null @@ -1,28 +0,0 @@ -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: - node-role.kubernetes.io/node: "" - machineType: m6i.xlarge - manager: CloudGroup - maxSize: 1 - minSize: 1 - nodeLabels: - datasaker/group: data-es - kops.k8s.io/instancegroup: k8s-prod-data-es-c3 - role: Node - subnets: - - ap-northeast-2c - taints: - - prod/data-es:NoSchedule diff --git a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-es-data.yaml b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-opensearch-data.yaml similarity index 62% rename from kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-es-data.yaml rename to kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-opensearch-data.yaml index 3b62f40..17a1623 100644 --- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-es-data.yaml +++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-opensearch-data.yaml @@ -1,13 +1,11 @@ apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: - creationTimestamp: "2023-06-05T06:48:41Z" - generation: 1 labels: kops.k8s.io/cluster: k8s-prod.datasaker.io - name: k8s-prod-data-es-data + name: k8s-prod-data-opensearch-data spec: - image: ami-0409b7ddbc59e3222 + image: ami-01e58630c6fb43a44 instanceMetadata: httpTokens: required kubelet: @@ -19,10 +17,10 @@ spec: maxSize: 2 minSize: 2 nodeLabels: - datasaker/group: data-es-data - kops.k8s.io/instancegroup: k8s-prod-data-es-data + opensearch-group: opensearch-data + kops.k8s.io/instancegroup: k8s-prod-data-opensearch-data role: Node subnets: - ap-northeast-2c taints: - - prod/data-es-data:NoSchedule + - opensearch-data:NoSchedule diff --git a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-es-master.yaml b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-opensearch-master.yaml similarity index 63% rename from kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-es-master.yaml rename to kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-opensearch-master.yaml index b1d53d7..f6d0166 100644 --- a/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-es-master.yaml +++ b/kops/aws_kops_prod/instancegroup_backup/k8s-prod-data-opensearch-master.yaml @@ -1,12 +1,11 @@ apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup metadata: - creationTimestamp: "2023-06-07T02:05:11Z" labels: kops.k8s.io/cluster: k8s-prod.datasaker.io - name: k8s-prod-data-es-master + name: k8s-prod-data-opensearch-master spec: - image: ami-0409b7ddbc59e3222 + image: ami-01e58630c6fb43a44 instanceMetadata: httpTokens: required kubelet: @@ -18,10 +17,10 @@ spec: maxSize: 3 minSize: 3 nodeLabels: - datasaker/group: data-es-master - kops.k8s.io/instancegroup: k8s-prod-data-es-master + opensearch-group: opensearch-master + kops.k8s.io/instancegroup: k8s-prod-data-opensearch-master role: Node subnets: - ap-northeast-2c taints: - - prod/data-es-master:NoSchedule + - opensearch-master:NoSchedule