diff --git a/config/src/genesis_config.rs b/config/src/genesis_config.rs index 01ca7a7a0a..6be6f114af 100644 --- a/config/src/genesis_config.rs +++ b/config/src/genesis_config.rs @@ -815,9 +815,7 @@ pub static G_DEV_CONFIG: Lazy = Lazy::new(|| { }); pub static G_HALLEY_BOOT_NODES: Lazy> = Lazy::new(|| { - vec!["/dns4/halley1.seed.starcoin.org/tcp/9840/p2p/12D3KooW9yQoKZrByqrUjmmPHXtR23qCXRQvF5KowYgoqypuhuCn".parse().expect("parse multi addr should be ok"), - "/dns4/halley2.seed.starcoin.org/tcp/9840/p2p/12D3KooWCqWbB2Abp6co6vMGG7VcEC9yYJU3yB1VhVYvpRQAr3sv".parse().expect("parse multi addr should be ok"), - "/dns4/halley3.seed.starcoin.org/tcp/9840/p2p/12D3KooWRiF6ZtUouCHgrgoCJ2jL4LCzzTEwopPbzVvTTRY3c2mf".parse().expect("parse multi addr should be ok"), ] + vec!["/dns4/halley1.seed.starcoin.org/tcp/9840/p2p/12D3KooW9yQoKZrByqrUjmmPHXtR23qCXRQvF5KowYgoqypuhuCn".parse().expect("parse multi addr should be ok"), ] }); pub static G_HALLEY_CONFIG: Lazy = Lazy::new(|| { @@ -872,8 +870,6 @@ pub static G_HALLEY_CONFIG: Lazy = Lazy::new(|| { pub static G_PROXIMA_BOOT_NODES: Lazy> = Lazy::new(|| { vec!["/dns4/proxima1.seed.starcoin.org/tcp/9840/p2p/12D3KooWFvCKQ1n2JkSQpn8drqGwU27vTPkKx264zD4CFbgaKDJU".parse().expect("parse multi addr should be ok"), - "/dns4/proxima2.seed.starcoin.org/tcp/9840/p2p/12D3KooWAua4KokJMiCodGPEF2n4yN42B2Q26KgwrQTntnrCDRHd".parse().expect("parse multi addr should be ok"), - "/dns4/proxima3.seed.starcoin.org/tcp/9840/p2p/12D3KooW9vHQJk9o69tZPMM2viQ3eWpgp6veDBRz8tTvDFDBejwk".parse().expect("parse multi addr should be ok"), ] }); @@ -932,9 +928,6 @@ pub static G_PROXIMA_CONFIG: Lazy = Lazy::new(|| { pub static G_BARNARD_BOOT_NODES: Lazy> = Lazy::new(|| { vec![ - "/dns4/barnard1.seed.starcoin.org/tcp/9840/p2p/12D3KooWJcsd9JQngZFsHgYgkHymk7anN8fKqBtD1x8jEbq64QET".parse().expect("parse multi addr should be ok"), - "/dns4/barnard2.seed.starcoin.org/tcp/9840/p2p/12D3KooWMKgVbWRQain4Sbw4DUnAJMykjdFanAcePn5xsTZihGTo".parse().expect("parse multi addr should be ok"), - "/dns4/barnard3.seed.starcoin.org/tcp/9840/p2p/12D3KooWAcg5cxPnnLNUcYR9WdyTBL1Sotr7W1Suq8b48x2F33Vx".parse().expect("parse multi addr should be ok"), "/dns4/barnard4.seed.starcoin.org/tcp/9840/p2p/12D3KooWRUQ4CZ6tiy2kZo5vVjm27ksYJAqMwB2QPfqpB5WEfzy4".parse().expect("parse multi addr should be ok"), "/dns4/barnard5.seed.starcoin.org/tcp/9840/p2p/12D3KooWPwRSY555ycvo8BNiEqWqaJRvgtkv7BfJhq9JWHty6e2R".parse().expect("parse multi addr should be ok"), "/dns4/barnard6.seed.starcoin.org/tcp/9840/p2p/12D3KooWSMJRCgT4inuEZNxvjSCHY1d3DwVX3SQ6qrvqAZCLLMwJ".parse().expect("parse multi addr should be ok"), diff --git a/kube/manifest/aws/cluster-autoscaler-policy.json b/kube/manifest/aws/cluster-autoscaler-policy.json index fc5fd82733..0ae8eea7ba 100644 --- a/kube/manifest/aws/cluster-autoscaler-policy.json +++ b/kube/manifest/aws/cluster-autoscaler-policy.json @@ -1,25 +1,28 @@ { - "Version": "2012-10-17", - "Statement": [ - { - "Effect": "Allow", - "Action": [ - "autoscaling:DescribeAutoScalingGroups", - "autoscaling:DescribeAutoScalingInstances", - "autoscaling:DescribeLaunchConfigurations", - "autoscaling:DescribeTags", - "ec2:DescribeInstanceTypes", - "ec2:DescribeLaunchTemplateVersions" - ], - "Resource": ["*"] - }, - { - "Effect": "Allow", - "Action": [ - "autoscaling:SetDesiredCapacity", - "autoscaling:TerminateInstanceInAutoScalingGroup" - ], - "Resource": ["*"] - } - ] - } \ No newline at end of file + "Version": "2012-10-17", + "Statement": [ + { + "Effect": "Allow", + "Action": [ + "autoscaling:DescribeAutoScalingGroups", + "autoscaling:DescribeAutoScalingInstances", + "autoscaling:DescribeLaunchConfigurations", + "autoscaling:DescribeTags", + "ec2:DescribeInstanceTypes", + "ec2:DescribeLaunchTemplateVersions" + ], + "Resource": ["*"] + }, + { + "Effect": "Allow", + "Action": [ + "autoscaling:SetDesiredCapacity", + "autoscaling:TerminateInstanceInAutoScalingGroup", + "ec2:DescribeImages", + "ec2:GetInstanceTypesFromInstanceRequirements", + "eks:DescribeNodegroup" + ], + "Resource": ["*"] + } + ] +} \ No newline at end of file diff --git a/kube/manifest/aws/deploy_auto_scaler.sh b/kube/manifest/aws/deploy_auto_scaler.sh index be11e1ed20..967629e516 100755 --- a/kube/manifest/aws/deploy_auto_scaler.sh +++ b/kube/manifest/aws/deploy_auto_scaler.sh @@ -14,4 +14,4 @@ kubectl -n kube-system edit deployment.apps/cluster-autoscaler kubectl set image deployment cluster-autoscaler \ -n kube-system \ - cluster-autoscaler=k8s.gcr.io/autoscaling/cluster-autoscaler:v1.19.1 + cluster-autoscaler=k8s.gcr.io/autoscaling/cluster-autoscaler:v1.23.0 diff --git a/kube/manifest/aws/load_balancer.sh b/kube/manifest/aws/load_balancer.sh index b7b9e212a4..a85037e895 100755 --- a/kube/manifest/aws/load_balancer.sh +++ b/kube/manifest/aws/load_balancer.sh @@ -1,4 +1,4 @@ -curl -o iam_policy.json https://raw.githubusercontent.com/kubernetes-sigs/aws-load-balancer-controller/v2.1.3/docs/install/iam_policy.json +curl -o iam_policy.json https://raw.githubusercontent.com/kubernetes-sigs/aws-load-balancer-controller/v2.4.5/docs/install/iam_policy.json aws iam create-policy \ --policy-name AWSLoadBalancerControllerIAMPolicy \ diff --git a/kube/manifest/runner/runner.yaml b/kube/manifest/runner/runner.yaml index 4c1b1f4a30..37905624c3 100644 --- a/kube/manifest/runner/runner.yaml +++ b/kube/manifest/runner/runner.yaml @@ -50,7 +50,7 @@ spec: scaleTargetRef: name: starcoin-runner-deployment minReplicas: 0 - maxReplicas: 6 + maxReplicas: 3 scaleDownDelaySecondsAfterScaleOut: 120 scaleUpTriggers: - githubEvent: @@ -60,5 +60,5 @@ spec: checkRun: types: ["created"] status: "queued" - amount: 2 + amount: 3 duration: "2m" diff --git a/kube/manifest/service-barnard.yaml b/kube/manifest/service-barnard.yaml index 44a0e11209..8c6de622bc 100644 --- a/kube/manifest/service-barnard.yaml +++ b/kube/manifest/service-barnard.yaml @@ -39,6 +39,7 @@ kind: Service metadata: annotations: service.beta.kubernetes.io/aws-load-balancer-type: nlb-ip + service.beta.kubernetes.io/aws-load-balancer-internal: "false" labels: app: starcoin network: barnard @@ -83,6 +84,7 @@ kind: Service metadata: annotations: service.beta.kubernetes.io/aws-load-balancer-type: nlb-ip + service.beta.kubernetes.io/aws-load-balancer-internal: "false" labels: app: starcoin network: barnard @@ -126,6 +128,7 @@ kind: Service metadata: annotations: service.beta.kubernetes.io/aws-load-balancer-type: nlb-ip + service.beta.kubernetes.io/aws-load-balancer-internal: "false" labels: app: starcoin network: barnard diff --git a/kube/manifest/service-halley.yaml b/kube/manifest/service-halley.yaml index 71f8274480..b21feabaec 100644 --- a/kube/manifest/service-halley.yaml +++ b/kube/manifest/service-halley.yaml @@ -35,6 +35,7 @@ kind: Service metadata: annotations: service.beta.kubernetes.io/aws-load-balancer-type: nlb-ip + service.beta.kubernetes.io/aws-load-balancer-internal: "false" labels: app: starcoin network: halley @@ -67,82 +68,4 @@ spec: app: starcoin network: halley statefulset.kubernetes.io/pod-name: starcoin-0 - type: LoadBalancer ---- -apiVersion: v1 -kind: Service -metadata: - annotations: - service.beta.kubernetes.io/aws-load-balancer-type: nlb-ip - labels: - app: starcoin - network: halley - statefulset.kubernetes.io/pod-name: starcoin-1 - name: starcoin-1 - namespace: starcoin-halley -spec: - ports: - - port: 9840 - name: node - protocol: TCP - targetPort: 9840 - - port: 9850 - name: http-rpc - protocol: TCP - targetPort: 9850 - - port: 9860 - name: tcp-rpc - protocol: TCP - targetPort: 9860 - - port: 9870 - name: ws-rpc - protocol: TCP - targetPort: 9870 - - port: 9101 - name: metrics - protocol: TCP - targetPort: 9101 - selector: - app: starcoin - network: halley - statefulset.kubernetes.io/pod-name: starcoin-1 - type: LoadBalancer ---- -apiVersion: v1 -kind: Service -metadata: - annotations: - service.beta.kubernetes.io/aws-load-balancer-type: nlb-ip - labels: - app: starcoin - network: halley - statefulset.kubernetes.io/pod-name: starcoin-2 - name: starcoin-2 - namespace: starcoin-halley -spec: - ports: - - port: 9840 - name: node - protocol: TCP - targetPort: 9840 - - port: 9850 - name: http-rpc - protocol: TCP - targetPort: 9850 - - port: 9860 - name: tcp-rpc - protocol: TCP - targetPort: 9860 - - port: 9870 - name: ws-rpc - protocol: TCP - targetPort: 9870 - - port: 9101 - name: metrics - protocol: TCP - targetPort: 9101 - selector: - app: starcoin - network: halley - statefulset.kubernetes.io/pod-name: starcoin-2 type: LoadBalancer \ No newline at end of file diff --git a/kube/manifest/service-main.yaml b/kube/manifest/service-main.yaml index 16718f6dae..a143b9d915 100644 --- a/kube/manifest/service-main.yaml +++ b/kube/manifest/service-main.yaml @@ -35,6 +35,7 @@ kind: Service metadata: annotations: service.beta.kubernetes.io/aws-load-balancer-type: nlb-ip + service.beta.kubernetes.io/aws-load-balancer-internal: "false" labels: app: starcoin network: main @@ -74,6 +75,7 @@ kind: Service metadata: annotations: service.beta.kubernetes.io/aws-load-balancer-type: nlb-ip + service.beta.kubernetes.io/aws-load-balancer-internal: "false" labels: app: starcoin network: main @@ -113,6 +115,7 @@ kind: Service metadata: annotations: service.beta.kubernetes.io/aws-load-balancer-type: nlb-ip + service.beta.kubernetes.io/aws-load-balancer-internal: "false" labels: app: starcoin network: main @@ -152,6 +155,7 @@ kind: Service metadata: annotations: service.beta.kubernetes.io/aws-load-balancer-type: nlb-ip + service.beta.kubernetes.io/aws-load-balancer-internal: "false" labels: app: starcoin network: main @@ -191,6 +195,7 @@ kind: Service metadata: annotations: service.beta.kubernetes.io/aws-load-balancer-type: nlb-ip + service.beta.kubernetes.io/aws-load-balancer-internal: "false" labels: app: starcoin network: main @@ -230,6 +235,7 @@ kind: Service metadata: annotations: service.beta.kubernetes.io/aws-load-balancer-type: nlb-ip + service.beta.kubernetes.io/aws-load-balancer-internal: "false" labels: app: starcoin network: main @@ -269,6 +275,7 @@ kind: Service metadata: annotations: service.beta.kubernetes.io/aws-load-balancer-type: nlb-ip + service.beta.kubernetes.io/aws-load-balancer-internal: "false" labels: app: starcoin network: main @@ -308,6 +315,7 @@ kind: Service metadata: annotations: service.beta.kubernetes.io/aws-load-balancer-type: nlb-ip + service.beta.kubernetes.io/aws-load-balancer-internal: "false" labels: app: starcoin network: main @@ -347,6 +355,7 @@ kind: Service metadata: annotations: service.beta.kubernetes.io/aws-load-balancer-type: nlb-ip + service.beta.kubernetes.io/aws-load-balancer-internal: "false" labels: app: starcoin network: main diff --git a/kube/manifest/service-proxima.yaml b/kube/manifest/service-proxima.yaml index ebbb034f31..10d77beec9 100644 --- a/kube/manifest/service-proxima.yaml +++ b/kube/manifest/service-proxima.yaml @@ -35,6 +35,7 @@ kind: Service metadata: annotations: service.beta.kubernetes.io/aws-load-balancer-type: nlb-ip + service.beta.kubernetes.io/aws-load-balancer-internal: "false" labels: app: starcoin network: proxima @@ -67,82 +68,4 @@ spec: app: starcoin network: proxima statefulset.kubernetes.io/pod-name: starcoin-0 - type: LoadBalancer ---- -apiVersion: v1 -kind: Service -metadata: - annotations: - service.beta.kubernetes.io/aws-load-balancer-type: nlb-ip - labels: - app: starcoin - network: proxima - statefulset.kubernetes.io/pod-name: starcoin-1 - name: starcoin-1 - namespace: starcoin-proxima -spec: - ports: - - port: 9840 - name: node - protocol: TCP - targetPort: 9840 - - port: 9850 - name: http-rpc - protocol: TCP - targetPort: 9850 - - port: 9860 - name: tcp-rpc - protocol: TCP - targetPort: 9860 - - port: 9870 - name: ws-rpc - protocol: TCP - targetPort: 9870 - - port: 9101 - name: metrics - protocol: TCP - targetPort: 9101 - selector: - app: starcoin - network: proxima - statefulset.kubernetes.io/pod-name: starcoin-1 - type: LoadBalancer ---- -apiVersion: v1 -kind: Service -metadata: - annotations: - service.beta.kubernetes.io/aws-load-balancer-type: nlb-ip - labels: - app: starcoin - network: proxima - statefulset.kubernetes.io/pod-name: starcoin-2 - name: starcoin-2 - namespace: starcoin-proxima -spec: - ports: - - port: 9840 - name: node - protocol: TCP - targetPort: 9840 - - port: 9850 - name: http-rpc - protocol: TCP - targetPort: 9850 - - port: 9860 - name: tcp-rpc - protocol: TCP - targetPort: 9860 - - port: 9870 - name: ws-rpc - protocol: TCP - targetPort: 9870 - - port: 9101 - name: metrics - protocol: TCP - targetPort: 9101 - selector: - app: starcoin - network: proxima - statefulset.kubernetes.io/pod-name: starcoin-2 - type: LoadBalancer + type: LoadBalancer \ No newline at end of file diff --git a/kube/manifest/starcoin-barnard.yaml b/kube/manifest/starcoin-barnard.yaml index 416353c68a..c822d79915 100644 --- a/kube/manifest/starcoin-barnard.yaml +++ b/kube/manifest/starcoin-barnard.yaml @@ -11,7 +11,7 @@ spec: matchLabels: app: starcoin serviceName: starcoin-svc - replicas: 6 + replicas: 3 template: metadata: name: starcoin @@ -23,7 +23,7 @@ spec: starcoin/node-pool: seed-pool containers: - name: starcoin - image: starcoin/starcoin:v1.12.6 + image: starcoin/starcoin:v1.12.7 imagePullPolicy: Always command: - bash @@ -92,4 +92,4 @@ spec: accessModes: [ "ReadWriteOnce" ] resources: requests: - storage: 50Gi + storage: 300Gi diff --git a/kube/manifest/starcoin-halley.yaml b/kube/manifest/starcoin-halley.yaml index feaa849f2a..8c34ce657c 100644 --- a/kube/manifest/starcoin-halley.yaml +++ b/kube/manifest/starcoin-halley.yaml @@ -11,7 +11,7 @@ spec: matchLabels: app: starcoin serviceName: starcoin-svc - replicas: 3 + replicas: 1 template: metadata: name: starcoin diff --git a/kube/manifest/starcoin-main.yaml b/kube/manifest/starcoin-main.yaml index 8f727a0db7..9bfe1c1756 100644 --- a/kube/manifest/starcoin-main.yaml +++ b/kube/manifest/starcoin-main.yaml @@ -23,7 +23,7 @@ spec: starcoin/node-pool: seed-pool containers: - name: starcoin - image: starcoin/starcoin:v1.12.6 + image: starcoin/starcoin:v1.12.7 imagePullPolicy: Always command: - bash @@ -81,4 +81,4 @@ spec: accessModes: [ "ReadWriteOnce" ] resources: requests: - storage: 100Gi + storage: 300Gi diff --git a/kube/manifest/starcoin-proxima.yaml b/kube/manifest/starcoin-proxima.yaml index 5c5883b699..c5582a45b8 100644 --- a/kube/manifest/starcoin-proxima.yaml +++ b/kube/manifest/starcoin-proxima.yaml @@ -11,7 +11,7 @@ spec: matchLabels: app: starcoin serviceName: starcoin-svc - replicas: 3 + replicas: 1 template: metadata: name: starcoin @@ -23,7 +23,7 @@ spec: starcoin/node-pool: seed-pool containers: - name: starcoin - image: starcoin/starcoin:update_move + image: starcoin/starcoin:update_move_5 imagePullPolicy: Always command: - bash diff --git a/scripts/prometheus_conf/prometheus.yml b/scripts/prometheus_conf/prometheus.yml index 85ffa38f3a..9c4162e7ac 100644 --- a/scripts/prometheus_conf/prometheus.yml +++ b/scripts/prometheus_conf/prometheus.yml @@ -21,13 +21,13 @@ rule_files: scrape_configs: - job_name: 'halley' static_configs: - - targets: ['halley1.seed.starcoin.org:9101', 'halley2.seed.starcoin.org:9101', 'halley3.seed.starcoin.org:9101'] + - targets: ['halley1.seed.starcoin.org:9101'] - job_name: 'proxima' static_configs: - - targets: [ 'proxima1.seed.starcoin.org:9101', 'proxima2.seed.starcoin.org:9101', 'proxima3.seed.starcoin.org:9101' ] + - targets: ['proxima1.seed.starcoin.org:9101'] - job_name: 'barnard' static_configs: - - targets: [ 'barnard1.seed.starcoin.org:9101', 'barnard2.seed.starcoin.org:9101', 'barnard3.seed.starcoin.org:9101','barnard4.seed.starcoin.org:9101', 'barnard5.seed.starcoin.org:9101', 'barnard6.seed.starcoin.org:9101' ] + - targets: ['barnard4.seed.starcoin.org:9101', 'barnard5.seed.starcoin.org:9101', 'barnard6.seed.starcoin.org:9101' ] - job_name: 'main' static_configs: - targets: [ 'main1.seed.starcoin.org:9101', 'main2.seed.starcoin.org:9101', 'main3.seed.starcoin.org:9101','main4.seed.starcoin.org:9101', 'main5.seed.starcoin.org:9101', 'main6.seed.starcoin.org:9101','main7.seed.starcoin.org:9101', 'main8.seed.starcoin.org:9101', 'main9.seed.starcoin.org:9101' ]