diff --git a/src/lib.rs b/src/lib.rs index 1acf569..e630eab 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -221,13 +221,6 @@ impl StacksDevnetApiK8sManager { ) .await?; - self.deploy_stacks_signer( - &config, - SignerIdx::Signer1, - "530d9f61984c888536871c6573073bdfc0058896dc1adfe9a6a10dfacadc209101", - ) - .await?; - if !config.disable_stacks_api { self.deploy_stacks_blockchain_api(&config).await?; } @@ -1316,11 +1309,6 @@ impl StacksDevnetApiK8sManager { get_service_port(StacksDevnetService::StacksSigner0, ServicePort::Event) .unwrap(), ), - SignerIdx::Signer1 => ( - get_service_url(namespace, StacksDevnetService::StacksSigner1), - get_service_port(StacksDevnetService::StacksSigner1, ServicePort::Event) - .unwrap(), - ), }; stacks_conf.push_str(&format!( @@ -1478,24 +1466,18 @@ impl StacksDevnetApiK8sManager { SignerIdx::Signer0 => { get_service_port(StacksDevnetService::StacksSigner0, ServicePort::Event).unwrap() } - SignerIdx::Signer1 => { - get_service_port(StacksDevnetService::StacksSigner1, ServicePort::Event).unwrap() - } }; let configmap = match signer_idx { SignerIdx::Signer0 => StacksDevnetConfigmap::StacksSigner0, - SignerIdx::Signer1 => StacksDevnetConfigmap::StacksSigner1, }; let sts = match signer_idx { SignerIdx::Signer0 => StacksDevnetStatefulSet::StacksSigner0, - SignerIdx::Signer1 => StacksDevnetStatefulSet::StacksSigner1, }; let service = match signer_idx { SignerIdx::Signer0 => StacksDevnetService::StacksSigner0, - SignerIdx::Signer1 => StacksDevnetService::StacksSigner1, }; // configmap env vars for api conatainer diff --git a/src/resources/configmap.rs b/src/resources/configmap.rs index f319826..c73542c 100644 --- a/src/resources/configmap.rs +++ b/src/resources/configmap.rs @@ -8,7 +8,6 @@ pub enum StacksDevnetConfigmap { StacksBlockchainApi, StacksBlockchainApiPg, StacksSigner0, - StacksSigner1, DeploymentPlan, Devnet, ProjectDir, @@ -23,7 +22,6 @@ impl fmt::Display for StacksDevnetConfigmap { StacksDevnetConfigmap::StacksBlockchainApi => write!(f, "stacks-blockchain-api"), StacksDevnetConfigmap::StacksBlockchainApiPg => write!(f, "stacks-blockchain-api-pg"), StacksDevnetConfigmap::StacksSigner0 => write!(f, "stacks-signer-0"), - StacksDevnetConfigmap::StacksSigner1 => write!(f, "stacks-signer-1"), StacksDevnetConfigmap::DeploymentPlan => write!(f, "deployment-plan"), StacksDevnetConfigmap::Devnet => write!(f, "devnet"), StacksDevnetConfigmap::ProjectDir => write!(f, "project-dir"), diff --git a/src/resources/pod.rs b/src/resources/pod.rs index e927b0c..8c7d458 100644 --- a/src/resources/pod.rs +++ b/src/resources/pod.rs @@ -7,7 +7,6 @@ pub enum StacksDevnetPod { StacksBlockchain, StacksBlockchainApi, StacksSigner0, - StacksSigner1, } impl fmt::Display for StacksDevnetPod { @@ -17,7 +16,6 @@ impl fmt::Display for StacksDevnetPod { StacksDevnetPod::StacksBlockchain => write!(f, "stacks-blockchain"), StacksDevnetPod::StacksBlockchainApi => write!(f, "stacks-blockchain-api"), StacksDevnetPod::StacksSigner0 => write!(f, "stacks-signer-0"), - StacksDevnetPod::StacksSigner1 => write!(f, "stacks-signer-1"), } } } diff --git a/src/resources/pvc.rs b/src/resources/pvc.rs index 3fec70b..d6e224e 100644 --- a/src/resources/pvc.rs +++ b/src/resources/pvc.rs @@ -5,7 +5,6 @@ use strum::EnumIter; pub enum StacksDevnetPvc { StacksBlockchainApiPg, StacksSigner0, - StacksSigner1, } impl fmt::Display for StacksDevnetPvc { @@ -13,7 +12,6 @@ impl fmt::Display for StacksDevnetPvc { match self { StacksDevnetPvc::StacksBlockchainApiPg => write!(f, "stacks-blockchain-api"), StacksDevnetPvc::StacksSigner0 => write!(f, "stacks-signer-0"), - StacksDevnetPvc::StacksSigner1 => write!(f, "stacks-signer-1"), } } } diff --git a/src/resources/service.rs b/src/resources/service.rs index 8277938..8d2e177 100644 --- a/src/resources/service.rs +++ b/src/resources/service.rs @@ -7,7 +7,6 @@ pub enum StacksDevnetService { StacksBlockchain, StacksBlockchainApi, StacksSigner0, - StacksSigner1, } pub enum ServicePort { @@ -27,7 +26,6 @@ impl fmt::Display for StacksDevnetService { StacksDevnetService::StacksBlockchain => write!(f, "stacks-blockchain"), StacksDevnetService::StacksBlockchainApi => write!(f, "stacks-blockchain-api"), StacksDevnetService::StacksSigner0 => write!(f, "stacks-signer-0"), - StacksDevnetService::StacksSigner1 => write!(f, "stacks-signer-1"), } } } @@ -43,10 +41,7 @@ pub fn get_service_port(service: StacksDevnetService, port_type: ServicePort) -> (StacksDevnetService::StacksBlockchainApi, ServicePort::API) => Some("3999".into()), (StacksDevnetService::StacksBlockchainApi, ServicePort::Event) => Some("3700".into()), (StacksDevnetService::StacksBlockchainApi, ServicePort::DB) => Some("5432".into()), - ( - StacksDevnetService::StacksSigner0 | StacksDevnetService::StacksSigner1, - ServicePort::Event, - ) => Some("30001".into()), + (StacksDevnetService::StacksSigner0, ServicePort::Event) => Some("30001".into()), (_, _) => None, } } @@ -57,7 +52,7 @@ pub fn get_user_facing_port(service: StacksDevnetService) -> Option { get_service_port(service, ServicePort::RPC) } StacksDevnetService::StacksBlockchainApi => get_service_port(service, ServicePort::API), - StacksDevnetService::StacksSigner0 | StacksDevnetService::StacksSigner1 => None, + StacksDevnetService::StacksSigner0 => None, } } @@ -71,7 +66,6 @@ pub fn get_service_from_path_part(path_part: &str) -> Option Some(StacksDevnetService::StacksBlockchain), "stacks-blockchain-api" => Some(StacksDevnetService::StacksBlockchainApi), "stacks-signer-0" => Some(StacksDevnetService::StacksSigner0), - "stacks-signer-1" => Some(StacksDevnetService::StacksSigner1), _ => None, } } diff --git a/src/resources/stateful_set.rs b/src/resources/stateful_set.rs index 3ad7f70..b8ae2e0 100644 --- a/src/resources/stateful_set.rs +++ b/src/resources/stateful_set.rs @@ -5,7 +5,6 @@ use strum::EnumIter; pub enum StacksDevnetStatefulSet { StacksBlockchainApi, StacksSigner0, - StacksSigner1, } impl fmt::Display for StacksDevnetStatefulSet { @@ -13,7 +12,6 @@ impl fmt::Display for StacksDevnetStatefulSet { match self { StacksDevnetStatefulSet::StacksBlockchainApi => write!(f, "stacks-blockchain-api"), StacksDevnetStatefulSet::StacksSigner0 => write!(f, "stacks-signer-0"), - StacksDevnetStatefulSet::StacksSigner1 => write!(f, "stacks-signer-1"), } } } @@ -21,14 +19,12 @@ impl fmt::Display for StacksDevnetStatefulSet { #[derive(EnumIter, Debug, Clone)] pub enum SignerIdx { Signer0, - Signer1, } impl fmt::Display for SignerIdx { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { SignerIdx::Signer0 => write!(f, "0"), - SignerIdx::Signer1 => write!(f, "1"), } } } diff --git a/src/resources/tests.rs b/src/resources/tests.rs index 9d8ef7d..f3b32e5 100644 --- a/src/resources/tests.rs +++ b/src/resources/tests.rs @@ -11,7 +11,6 @@ use test_case::test_case; #[test_case(StacksDevnetConfigmap::StacksBlockchainApi => is equal_to "stacks-blockchain-api"; "for StacksBlockchainApi")] #[test_case(StacksDevnetConfigmap::StacksBlockchainApiPg => is equal_to "stacks-blockchain-api-pg"; "for StacksBlockchainApiPg")] #[test_case(StacksDevnetConfigmap::StacksSigner0 => is equal_to "stacks-signer-0"; "for StacksSigner0")] -#[test_case(StacksDevnetConfigmap::StacksSigner1 => is equal_to "stacks-signer-1"; "for StacksSigner1")] #[test_case(StacksDevnetConfigmap::DeploymentPlan => is equal_to "deployment-plan"; "for DeploymentPlan")] #[test_case(StacksDevnetConfigmap::Devnet => is equal_to "devnet"; "for Devnet")] #[test_case(StacksDevnetConfigmap::ProjectDir => is equal_to "project-dir"; "for ProjectDir")] @@ -35,7 +34,6 @@ fn it_prints_correct_name_for_deployment(deployment: StacksDevnetDeployment) -> #[test_case(StacksDevnetStatefulSet::StacksBlockchainApi => is equal_to "stacks-blockchain-api"; "for StacksBlockchainApi")] #[test_case(StacksDevnetStatefulSet::StacksSigner0 => is equal_to "stacks-signer-0"; "for StacksSigner0")] -#[test_case(StacksDevnetStatefulSet::StacksSigner1 => is equal_to "stacks-signer-1"; "for StacksSigner1")] fn it_prints_correct_name_for_stateful_set(pod: StacksDevnetStatefulSet) -> String { pod.to_string() } @@ -44,7 +42,6 @@ fn it_prints_correct_name_for_stateful_set(pod: StacksDevnetStatefulSet) -> Stri #[test_case(StacksDevnetService::StacksBlockchain => is equal_to "stacks-blockchain"; "for StacksBlockchain")] #[test_case(StacksDevnetService::StacksBlockchainApi => is equal_to "stacks-blockchain-api"; "for StacksBlockchainApi")] #[test_case(StacksDevnetService::StacksSigner0 => is equal_to "stacks-signer-0"; "for StacksSigner0")] -#[test_case(StacksDevnetService::StacksSigner1 => is equal_to "stacks-signer-1"; "for StacksSigner1")] fn it_prints_correct_name_for_service(service: StacksDevnetService) -> String { service.to_string() } @@ -59,7 +56,6 @@ fn it_prints_correct_name_for_service(service: StacksDevnetService) -> String { #[test_case(StacksDevnetService::StacksBlockchainApi, ServicePort::Event => is equal_to Some("3700".to_string()); "for StacksBlockchainApi Event port")] #[test_case(StacksDevnetService::StacksBlockchainApi, ServicePort::DB => is equal_to Some("5432".to_string()); "for StacksBlockchainApi DB port")] #[test_case(StacksDevnetService::StacksSigner0, ServicePort::Event => is equal_to Some("30001".to_string()); "for StacksSigner0 Event port")] -#[test_case(StacksDevnetService::StacksSigner1, ServicePort::Event => is equal_to Some("30001".to_string()); "for StacksSigner1 Event port")] #[test_case(StacksDevnetService::StacksBlockchainApi, ServicePort::RPC => is equal_to None; "invalid service port combination")] fn it_gets_correct_port_for_service( service: StacksDevnetService, @@ -72,7 +68,6 @@ fn it_gets_correct_port_for_service( #[test_case("stacks-blockchain" => is equal_to Some(StacksDevnetService::StacksBlockchain); "for stacks-blockchain")] #[test_case("stacks-blockchain-api" => is equal_to Some(StacksDevnetService::StacksBlockchainApi); "for stacks-blockchain-api")] #[test_case("stacks-signer-0" => is equal_to Some(StacksDevnetService::StacksSigner0); "for stacks-signer-0")] -#[test_case("stacks-signer-1" => is equal_to Some(StacksDevnetService::StacksSigner1); "for stacks-signer-1")] #[test_case("invalid" => is equal_to None; "returning None for invalid paths")] fn it_prints_service_from_path_part(path_part: &str) -> Option { get_service_from_path_part(path_part) @@ -82,7 +77,6 @@ fn it_prints_service_from_path_part(path_part: &str) -> Option is equal_to Some("20443".to_string()); "for StacksBlockchain")] #[test_case(StacksDevnetService::StacksBlockchainApi => is equal_to Some("3999".to_string()); "for StacksBlockchainApi")] #[test_case(StacksDevnetService::StacksSigner0 => is equal_to None; "for StacksSigner0")] -#[test_case(StacksDevnetService::StacksSigner1 => is equal_to None; "for StacksSigner1")] fn it_gets_user_facing_port_for_service(service: StacksDevnetService) -> Option { get_user_facing_port(service) } diff --git a/src/template_parser.rs b/src/template_parser.rs index d158444..eca1bcd 100644 --- a/src/template_parser.rs +++ b/src/template_parser.rs @@ -58,14 +58,5 @@ pub fn get_yaml_from_resource(resource: StacksDevnetResource) -> &'static str { StacksDevnetResource::Configmap(StacksDevnetConfigmap::StacksSigner0) => { include_str!("../templates/configmaps/stacks-signer-0.template.yaml") } - StacksDevnetResource::StatefulSet(StacksDevnetStatefulSet::StacksSigner1) => { - include_str!("../templates/stateful-sets/stacks-signer-1.template.yaml") - } - StacksDevnetResource::Service(StacksDevnetService::StacksSigner1) => { - include_str!("../templates/services/stacks-signer-1.template.yaml") - } - StacksDevnetResource::Configmap(StacksDevnetConfigmap::StacksSigner1) => { - include_str!("../templates/configmaps/stacks-signer-1.template.yaml") - } } } diff --git a/src/tests/fixtures/left.txt b/src/tests/fixtures/left.txt index cacb9fe..8c3f213 100644 --- a/src/tests/fixtures/left.txt +++ b/src/tests/fixtures/left.txt @@ -187,6 +187,7 @@ devnet_settings: epoch_2_4: 105 epoch_2_5: 105 epoch_3_0: 121 + epoch_3_1: 122 use_docker_gateway_routing: false docker_platform: linux/amd64 " diff --git a/src/tests/fixtures/right.txt b/src/tests/fixtures/right.txt index ad113a1..3a34c72 100644 --- a/src/tests/fixtures/right.txt +++ b/src/tests/fixtures/right.txt @@ -189,6 +189,7 @@ devnet_settings: epoch_2_4: 105 epoch_2_5: 105 epoch_3_0: 121 + epoch_3_1: 122 use_docker_gateway_routing: false docker_platform: linux/amd64 " diff --git a/templates/configmaps/stacks-signer-1.template.yaml b/templates/configmaps/stacks-signer-1.template.yaml deleted file mode 100644 index 96b76a7..0000000 --- a/templates/configmaps/stacks-signer-1.template.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -data: - Signer.toml: "{data}" -kind: ConfigMap -metadata: - name: stacks-signer-1 - namespace: "{namespace}" - labels: - app.kubernetes.io/managed-by: stacks-devnet-api - app.kubernetes.io/name: stacks-signer-1 - app.kubernetes.io/component: stacks-signer-1 - argocd.argoproj.io/instance: platform-user-resources.platform \ No newline at end of file diff --git a/templates/services/stacks-signer-1.template.yaml b/templates/services/stacks-signer-1.template.yaml deleted file mode 100644 index 5cdf09b..0000000 --- a/templates/services/stacks-signer-1.template.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app.kubernetes.io/component: stacks-signer-1 - app.kubernetes.io/instance: "{user_id}" - app.kubernetes.io/managed-by: stacks-devnet-api - app.kubernetes.io/name: stacks-signer-1 - argocd.argoproj.io/instance: platform-user-resources.platform - name: stacks-signer-1 - namespace: "{namespace}" -spec: - ports: - - name: http-signer-event - port: 30001 - protocol: TCP - targetPort: 30001 - selector: - app.kubernetes.io/component: stacks-signer-1 - app.kubernetes.io/instance: "{user_id}" - app.kubernetes.io/managed-by: stacks-devnet-api - app.kubernetes.io/name: stacks-signer-1 diff --git a/templates/stateful-sets/stacks-signer-1.template.yaml b/templates/stateful-sets/stacks-signer-1.template.yaml deleted file mode 100644 index bb4fdd1..0000000 --- a/templates/stateful-sets/stacks-signer-1.template.yaml +++ /dev/null @@ -1,79 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - labels: - app.kubernetes.io/component: stacks-signer-1 - app.kubernetes.io/instance: "{user_id}" - app.kubernetes.io/managed-by: stacks-devnet-api - app.kubernetes.io/name: stacks-signer-1 - argocd.argoproj.io/instance: platform-user-resources.platform - name: stacks-signer-1 - namespace: "{namespace}" -spec: - replicas: 1 - serviceName: stacks-signer-1 - selector: - matchLabels: - app.kubernetes.io/component: stacks-signer-1 - app.kubernetes.io/instance: "{user_id}" - app.kubernetes.io/managed-by: stacks-devnet-api - app.kubernetes.io/name: stacks-signer-1 - template: - metadata: - labels: - app.kubernetes.io/component: stacks-signer-1 - app.kubernetes.io/instance: "{user_id}" - app.kubernetes.io/managed-by: stacks-devnet-api - app.kubernetes.io/name: stacks-signer-1 - spec: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: cloud.google.com/gke-preemptible - operator: DoesNotExist - containers: - - name: stacks-signer-1 - command: - - stacks-signer - - run - - --config=/src/stacks-signer-1/Signer.toml - image: quay.io/hirosystems/stacks-signer:devnet-3.1 - imagePullPolicy: IfNotPresent - ports: - - containerPort: 30001 - name: signer-event - protocol: TCP - resources: - requests: - cpu: 250m - memory: 750Mi # todo: revisit allocation - limits: - memory: 750Mi # todo: revisit allocation - volumeMounts: - - mountPath: /chainstate/ - name: signer-db - - mountPath: /src/stacks-signer-1 - name: stacks-signer-1 - readOnly: true - resources: - requests: - cpu: 250m - memory: 750Mi # todo: revisit allocation - limits: - memory: 750Mi # todo: revisit allocation - volumes: - - configMap: - name: stacks-signer-1 - name: stacks-signer-1 - volumeClaimTemplates: - - metadata: - name: signer-db - spec: - accessModes: - - ReadWriteOnce - storageClassName: premium-rwo - resources: - requests: - storage: 1Gi