From 275954bb9acb21b9968eb78db899c4bc9e095d2d Mon Sep 17 00:00:00 2001 From: havelight-ee Date: Tue, 13 Dec 2022 14:08:46 +0900 Subject: [PATCH] node update --- prod_221108/node_yaml/druid.yaml | 12 +- prod_221108/node_yaml/es.yaml | 74 ++++ prod_221108/node_yaml/kafka.yaml | 12 +- prod_221108/node_yaml/process.yaml | 32 +- .../node_yaml/prod.datasaker.io-20221110.yaml | 411 ++++++++++++++++++ prod_221108/node_yaml/std_process.yaml | 20 + 6 files changed, 543 insertions(+), 18 deletions(-) create mode 100644 prod_221108/node_yaml/es.yaml create mode 100644 prod_221108/node_yaml/prod.datasaker.io-20221110.yaml create mode 100644 prod_221108/node_yaml/std_process.yaml diff --git a/prod_221108/node_yaml/druid.yaml b/prod_221108/node_yaml/druid.yaml index a3dece6..aa6bcb5 100644 --- a/prod_221108/node_yaml/druid.yaml +++ b/prod_221108/node_yaml/druid.yaml @@ -5,12 +5,12 @@ metadata: kops.k8s.io/cluster: k8s-prod.datasaker.io name: k8s-prod-data-druid-a spec: - image: ami-0abb33b73a78cae31 + image: ami-0409b7ddbc59e3222 kubelet: anonymousAuth: false nodeLabels: node-role.kubernetes.io/node: "" - machineType: m6i.2xlarge + machineType: m5a.2xlarge manager: CloudGroup maxSize: 1 minSize: 1 @@ -30,12 +30,12 @@ metadata: kops.k8s.io/cluster: k8s-prod.datasaker.io name: k8s-prod-data-druid-b spec: - image: ami-0abb33b73a78cae31 + image: ami-0409b7ddbc59e3222 kubelet: anonymousAuth: false nodeLabels: node-role.kubernetes.io/node: "" - machineType: m6i.2xlarge + machineType: m6i.xlarge manager: CloudGroup maxSize: 1 minSize: 1 @@ -55,12 +55,12 @@ metadata: kops.k8s.io/cluster: k8s-prod.datasaker.io name: k8s-prod-data-druid-c spec: - image: ami-0abb33b73a78cae31 + image: ami-0409b7ddbc59e3222 kubelet: anonymousAuth: false nodeLabels: node-role.kubernetes.io/node: "" - machineType: m6i.2xlarge + machineType: m5a.4xlarge manager: CloudGroup maxSize: 1 minSize: 1 diff --git a/prod_221108/node_yaml/es.yaml b/prod_221108/node_yaml/es.yaml new file mode 100644 index 0000000..c8b25dd --- /dev/null +++ b/prod_221108/node_yaml/es.yaml @@ -0,0 +1,74 @@ +apiVersion: kops.k8s.io/v1alpha2 +kind: InstanceGroup +metadata: + 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: 1 + minSize: 1 + nodeLabels: + kops.k8s.io/instancegroup: k8s-prod-data-es-a + datasaker/group: data-es + role: Node + subnets: + - ap-northeast-2a + taints: + - prod/data-es:NoSchedule +--- +apiVersion: kops.k8s.io/v1alpha2 +kind: InstanceGroup +metadata: + 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: 1 + minSize: 1 + nodeLabels: + kops.k8s.io/instancegroup: k8s-prod-data-es-b + datasaker/group: data-es + role: Node + subnets: + - ap-northeast-2b + taints: + - prod/data-es:NoSchedule +--- +apiVersion: kops.k8s.io/v1alpha2 +kind: InstanceGroup +metadata: + labels: + kops.k8s.io/cluster: k8s-prod.datasaker.io + name: k8s-prod-data-es-c +spec: + image: ami-0409b7ddbc59e3222 + kubelet: + anonymousAuth: false + nodeLabels: + node-role.kubernetes.io/node: "" + machineType: m5a.xlarge + manager: CloudGroup + maxSize: 1 + minSize: 1 + nodeLabels: + kops.k8s.io/instancegroup: k8s-prod-data-es-c + datasaker/group: data-es + role: Node + subnets: + - ap-northeast-2c + taints: + - prod/data-es:NoSchedule diff --git a/prod_221108/node_yaml/kafka.yaml b/prod_221108/node_yaml/kafka.yaml index 59dd51f..b951ab2 100644 --- a/prod_221108/node_yaml/kafka.yaml +++ b/prod_221108/node_yaml/kafka.yaml @@ -5,12 +5,12 @@ metadata: kops.k8s.io/cluster: k8s-prod.datasaker.io name: k8s-prod-data-kafka-a spec: - image: ami-0abb33b73a78cae31 + image: ami-0409b7ddbc59e3222 kubelet: anonymousAuth: false nodeLabels: node-role.kubernetes.io/node: "" - machineType: m6i.2xlarge + machineType: m5a.xlarge manager: CloudGroup maxSize: 1 minSize: 1 @@ -30,12 +30,12 @@ metadata: kops.k8s.io/cluster: k8s-prod.datasaker.io name: k8s-prod-data-kafka-b spec: - image: ami-0abb33b73a78cae31 + image: ami-0409b7ddbc59e3222 kubelet: anonymousAuth: false nodeLabels: node-role.kubernetes.io/node: "" - machineType: m6i.2xlarge + machineType: m6i.xlarge manager: CloudGroup maxSize: 1 minSize: 1 @@ -55,12 +55,12 @@ metadata: kops.k8s.io/cluster: k8s-prod.datasaker.io name: k8s-prod-data-kafka-c spec: - image: ami-0abb33b73a78cae31 + image: ami-0409b7ddbc59e3222 kubelet: anonymousAuth: false nodeLabels: node-role.kubernetes.io/node: "" - machineType: m6i.2xlarge + machineType: m5a.xlarge manager: CloudGroup maxSize: 1 minSize: 1 diff --git a/prod_221108/node_yaml/process.yaml b/prod_221108/node_yaml/process.yaml index ad9e70c..2cce48b 100644 --- a/prod_221108/node_yaml/process.yaml +++ b/prod_221108/node_yaml/process.yaml @@ -5,8 +5,8 @@ metadata: kops.k8s.io/cluster: k8s-prod.datasaker.io name: k8s-prod-process-a spec: - image: ami-0abb33b73a78cae31 - machineType: c5.xlarge + image: ami-0409b7ddbc59e3222 + machineType: m5a.xlarge manager: CloudGroup maxSize: 1 minSize: 1 @@ -20,13 +20,33 @@ spec: --- apiVersion: kops.k8s.io/v1alpha2 kind: InstanceGroup +metadata: + labels: + kops.k8s.io/cluster: k8s-prod.datasaker.io + name: k8s-prod-process-a2 +spec: + image: ami-0409b7ddbc59e3222 + machineType: m5a.xlarge + manager: CloudGroup + maxSize: 1 + minSize: 1 + nodeLabels: + datasaker/group: process + kops.k8s.io/instancegroup: k8s-prod-process-a2 + rootVolumeSize: 100 + role: Node + subnets: + - ap-northeast-2a +--- +apiVersion: kops.k8s.io/v1alpha2 +kind: InstanceGroup metadata: labels: kops.k8s.io/cluster: k8s-prod.datasaker.io name: k8s-prod-process-b spec: - image: ami-0abb33b73a78cae31 - machineType: c5.xlarge + image: ami-0409b7ddbc59e3222 + machineType: m6i.xlarge manager: CloudGroup maxSize: 1 minSize: 1 @@ -45,8 +65,8 @@ metadata: kops.k8s.io/cluster: k8s-prod.datasaker.io name: k8s-prod-process-c spec: - image: ami-0abb33b73a78cae31 - machineType: c5.xlarge + image: ami-0409b7ddbc59e3222 + machineType: m5a.xlarge manager: CloudGroup maxSize: 1 minSize: 1 diff --git a/prod_221108/node_yaml/prod.datasaker.io-20221110.yaml b/prod_221108/node_yaml/prod.datasaker.io-20221110.yaml new file mode 100644 index 0000000..d20f464 --- /dev/null +++ b/prod_221108/node_yaml/prod.datasaker.io-20221110.yaml @@ -0,0 +1,411 @@ +apiVersion: kops.k8s.io/v1alpha2 +kind: Cluster +metadata: + creationTimestamp: "2022-11-01T05:36:36Z" + generation: 5 + name: k8s-prod.datasaker.io +spec: + api: + loadBalancer: + class: Network + type: Public + authorization: + rbac: {} + channel: stable + cloudProvider: aws + configBase: s3://clusters.prod.datasaker.io/k8s-prod.datasaker.io + containerRuntime: containerd + etcdClusters: + - cpuRequest: 200m + etcdMembers: + - encryptedVolume: true + instanceGroup: master-ap-northeast-2a + name: a + - encryptedVolume: true + instanceGroup: master-ap-northeast-2b + name: b + - encryptedVolume: true + instanceGroup: master-ap-northeast-2c + name: c + memoryRequest: 100Mi + name: main + - cpuRequest: 100m + etcdMembers: + - encryptedVolume: true + instanceGroup: master-ap-northeast-2a + name: a + - encryptedVolume: true + instanceGroup: master-ap-northeast-2b + name: b + - encryptedVolume: true + instanceGroup: master-ap-northeast-2c + name: c + memoryRequest: 100Mi + name: events + iam: + allowContainerRegistry: true + legacy: false + kubelet: + anonymousAuth: false + kubernetesApiAccess: + - 0.0.0.0/0 + - ::/0 + kubernetesVersion: 1.25.2 + masterInternalName: api.internal.k8s-prod.datasaker.io + masterPublicName: api.k8s-prod.datasaker.io + networkCIDR: 172.24.0.0/19 + networkID: vpc-00ba2b0e9ad59f0ed + networking: + calico: {} + nonMasqueradeCIDR: 100.64.0.0/10 + sshAccess: + - 0.0.0.0/0 + - ::/0 + subnets: + - cidr: 172.24.8.0/23 + id: subnet-024f0deda82039fa4 + name: ap-northeast-2a + type: Private + zone: ap-northeast-2a + - cidr: 172.24.10.0/23 + id: subnet-050d942fa1c46540a + name: ap-northeast-2b + type: Private + zone: ap-northeast-2b + - cidr: 172.24.12.0/23 + id: subnet-0946eb806af7377be + name: ap-northeast-2c + type: Private + zone: ap-northeast-2c + - cidr: 172.24.0.0/24 + id: subnet-00c363356f133411d + name: utility-ap-northeast-2a + type: Utility + zone: ap-northeast-2a + - cidr: 172.24.1.0/24 + id: subnet-07aa5e879a262014d + name: utility-ap-northeast-2b + type: Utility + zone: ap-northeast-2b + - cidr: 172.24.2.0/24 + id: subnet-0073a61bc56a68a3e + name: utility-ap-northeast-2c + type: Utility + zone: ap-northeast-2c + topology: + dns: + type: Public + masters: private + nodes: private + +--- + +apiVersion: kops.k8s.io/v1alpha2 +kind: InstanceGroup +metadata: + creationTimestamp: "2022-11-02T01:50:52Z" + generation: 2 + labels: + kops.k8s.io/cluster: k8s-prod.datasaker.io + name: k8s-prod-data-druid-a +spec: + image: ami-0409b7ddbc59e3222 + kubelet: + anonymousAuth: false + nodeLabels: + node-role.kubernetes.io/node: "" + machineType: m6i.large + manager: CloudGroup + maxSize: 1 + minSize: 1 + nodeLabels: + datasaker/group: data-druid + kops.k8s.io/instancegroup: k8s-prod-data-druid-a + role: Node + subnets: + - ap-northeast-2a + taints: + - prod/data-druid:NoSchedule + +--- + +apiVersion: kops.k8s.io/v1alpha2 +kind: InstanceGroup +metadata: + creationTimestamp: "2022-11-02T01:50:52Z" + generation: 2 + 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.large + manager: CloudGroup + maxSize: 1 + minSize: 1 + nodeLabels: + datasaker/group: data-druid + kops.k8s.io/instancegroup: k8s-prod-data-druid-b + role: Node + subnets: + - ap-northeast-2b + taints: + - prod/data-druid:NoSchedule + +--- + +apiVersion: kops.k8s.io/v1alpha2 +kind: InstanceGroup +metadata: + creationTimestamp: "2022-11-02T01:50:52Z" + generation: 2 + labels: + kops.k8s.io/cluster: k8s-prod.datasaker.io + name: k8s-prod-data-druid-c +spec: + image: ami-0409b7ddbc59e3222 + kubelet: + anonymousAuth: false + nodeLabels: + node-role.kubernetes.io/node: "" + machineType: m6i.large + manager: CloudGroup + maxSize: 1 + minSize: 1 + nodeLabels: + datasaker/group: data-druid + kops.k8s.io/instancegroup: k8s-prod-data-druid-c + role: Node + subnets: + - ap-northeast-2c + taints: + - prod/data-druid:NoSchedule + +--- + +apiVersion: kops.k8s.io/v1alpha2 +kind: InstanceGroup +metadata: + creationTimestamp: "2022-11-02T01:51:35Z" + generation: 3 + 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: m6i.xlarge + manager: CloudGroup + maxSize: 1 + minSize: 1 + 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 + +--- + +apiVersion: kops.k8s.io/v1alpha2 +kind: InstanceGroup +metadata: + creationTimestamp: "2022-11-02T01:51:35Z" + generation: 2 + 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: 1 + minSize: 1 + 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 + +--- + +apiVersion: kops.k8s.io/v1alpha2 +kind: InstanceGroup +metadata: + creationTimestamp: "2022-11-02T01:51:35Z" + generation: 3 + labels: + kops.k8s.io/cluster: k8s-prod.datasaker.io + name: k8s-prod-data-kafka-c +spec: + image: ami-0409b7ddbc59e3222 + kubelet: + anonymousAuth: false + nodeLabels: + node-role.kubernetes.io/node: "" + machineType: m6i.xlarge + manager: CloudGroup + maxSize: 1 + minSize: 1 + nodeLabels: + datasaker/group: data-kafka + kops.k8s.io/instancegroup: k8s-prod-data-kafka-c + role: Node + subnets: + - ap-northeast-2c + taints: + - prod/data-kafka:NoSchedule + +--- + +apiVersion: kops.k8s.io/v1alpha2 +kind: InstanceGroup +metadata: + creationTimestamp: "2022-11-02T01:51:49Z" + generation: 3 + labels: + kops.k8s.io/cluster: k8s-prod.datasaker.io + name: k8s-prod-process-a +spec: + image: ami-0409b7ddbc59e3222 + machineType: c5.large + manager: CloudGroup + maxSize: 1 + minSize: 1 + nodeLabels: + datasaker/group: process + kops.k8s.io/instancegroup: k8s-prod-process-a + role: Node + rootVolumeSize: 100 + subnets: + - ap-northeast-2a + +--- + +apiVersion: kops.k8s.io/v1alpha2 +kind: InstanceGroup +metadata: + creationTimestamp: "2022-11-02T01:51:49Z" + generation: 3 + labels: + kops.k8s.io/cluster: k8s-prod.datasaker.io + name: k8s-prod-process-b +spec: + image: ami-0409b7ddbc59e3222 + machineType: c5.large + manager: CloudGroup + maxSize: 1 + minSize: 1 + nodeLabels: + datasaker/group: process + kops.k8s.io/instancegroup: k8s-prod-process-b + role: Node + rootVolumeSize: 100 + subnets: + - ap-northeast-2b + +--- + +apiVersion: kops.k8s.io/v1alpha2 +kind: InstanceGroup +metadata: + creationTimestamp: "2022-11-02T01:51:49Z" + generation: 3 + labels: + kops.k8s.io/cluster: k8s-prod.datasaker.io + name: k8s-prod-process-c +spec: + image: ami-0409b7ddbc59e3222 + machineType: c5.large + manager: CloudGroup + maxSize: 1 + minSize: 1 + nodeLabels: + datasaker/group: process + kops.k8s.io/instancegroup: k8s-prod-process-c + role: Node + rootVolumeSize: 100 + subnets: + - ap-northeast-2c + +--- + +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 + +--- + +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 + +--- + +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 diff --git a/prod_221108/node_yaml/std_process.yaml b/prod_221108/node_yaml/std_process.yaml new file mode 100644 index 0000000..367efed --- /dev/null +++ b/prod_221108/node_yaml/std_process.yaml @@ -0,0 +1,20 @@ +apiVersion: kops.k8s.io/v1alpha2 +kind: InstanceGroup +metadata: + labels: + kops.k8s.io/cluster: k8s-prod.datasaker.io + name: k8s-prod-process-a +spec: + image: ami-0409b7ddbc59e3222 + machineType: c5.xlarge + manager: CloudGroup + maxSize: 1 + minSize: 1 + nodeLabels: + datasaker/group: process + kops.k8s.io/instancegroup: k8s-prod-process-a + rootVolumeSize: 100 + role: Node + subnets: + - ap-northeast-2a +