From b88ec82d081f0ca3bf66c0505de5bda854cc99a1 Mon Sep 17 00:00:00 2001
From: Fabian Seidl <fabian.seidl@h-da.de>
Date: Mon, 1 Jul 2024 11:43:35 +0000
Subject: [PATCH] Resolve "Update outdated config files"
See merge request danet/quant!164
---
config/goKMS/example01.yaml | 1 -
config/goKMS/example02.yaml | 1 -
config/goKMS/example03.yaml | 1 -
config/goKMS/example04.yaml | 1 -
config/goKMS/small_kms_1.yaml | 1 -
config/goKMS/small_kms_2.yaml | 1 -
goKMS/config/config.go | 1 -
integration-tests/config/kms/kms_1.yaml | 1 -
integration-tests/config/kms/kms_2.yaml | 1 -
9 files changed, 9 deletions(-)
diff --git a/config/goKMS/example01.yaml b/config/goKMS/example01.yaml
index a80bf823..e3b91826 100644
--- a/config/goKMS/example01.yaml
+++ b/config/goKMS/example01.yaml
@@ -2,7 +2,6 @@ Id: "0ff33c82-7fe1-482b-a0ca-67565806ee4b"
Name: kms01
InterComAddr: 172.100.20.10:50910
QuantumAddr: 172.100.20.10:50911
-GRPCAddr: 172.100.20.10:50900
AkmsURL: "http://172.100.20.22:4444/api/v1/keys/push_ksa_key"
AkmsCkmsServerPort: "9696"
KmsTLS:
diff --git a/config/goKMS/example02.yaml b/config/goKMS/example02.yaml
index d6f01e59..d1d37160 100644
--- a/config/goKMS/example02.yaml
+++ b/config/goKMS/example02.yaml
@@ -2,7 +2,6 @@ Id: "5e41c291-6121-4335-84f6-41e04b8bdaa2"
Name: kms02
InterComAddr: 172.100.20.11:50910
QuantumAddr: 172.100.20.11:50911
-GRPCAddr: 172.100.20.11:50900
KmsTLS:
TLS: false
CAFile: "ssl/ca.crt"
diff --git a/config/goKMS/example03.yaml b/config/goKMS/example03.yaml
index 23502a3e..f1a31603 100644
--- a/config/goKMS/example03.yaml
+++ b/config/goKMS/example03.yaml
@@ -2,7 +2,6 @@ Id: "f80db2c0-2480-46b9-b7d1-b63f954e8227"
Name: kms03
InterComAddr: 172.100.20.12:50910
QuantumAddr: 172.100.20.12:50911
-GRPCAddr: 172.100.20.12:50900
KmsTLS:
TLS: false
CAFile: "ssl/ca.crt"
diff --git a/config/goKMS/example04.yaml b/config/goKMS/example04.yaml
index 3d739741..7e6b79b5 100644
--- a/config/goKMS/example04.yaml
+++ b/config/goKMS/example04.yaml
@@ -2,7 +2,6 @@ Id: "968fd594-b0e7-41f0-ba4b-de259047a933"
Name: kms04
InterComAddr: 172.100.20.13:50910
QuantumAddr: 172.100.20.13:50911
-GRPCAddr: 172.100.20.13:50900
AkmsURL: "http://172.100.20.23:4444/api/v1/keys/push_ksa_key"
AkmsCkmsServerPort: "9696"
KmsTLS:
diff --git a/config/goKMS/small_kms_1.yaml b/config/goKMS/small_kms_1.yaml
index 538ad6f8..d72c9c7f 100644
--- a/config/goKMS/small_kms_1.yaml
+++ b/config/goKMS/small_kms_1.yaml
@@ -1,7 +1,6 @@
Id: '0ff33c82-7fe1-482b-a0ca-67565806ee4b'
Name: kms_1
InterComAddr: 0.0.0.0:50910
-GRPCAddr: 0.0.0.0:50900
QuantumAddr: 0.0.0.0:50911
AkmsURL: "http://akms-simulator_1:4444/api/v1/keys/push_ksa_key"
AkmsCkmsServerPort: "9696"
diff --git a/config/goKMS/small_kms_2.yaml b/config/goKMS/small_kms_2.yaml
index e85e3563..98644c38 100644
--- a/config/goKMS/small_kms_2.yaml
+++ b/config/goKMS/small_kms_2.yaml
@@ -2,7 +2,6 @@ Id: '5e41c291-6121-4335-84f6-41e04b8bdaa2'
Name: kms_2
InterComAddr: 0.0.0.0:50910
GRPCAddr: 0.0.0.0:50900
-QuantumAddr: 0.0.0.0:50911
AkmsURL: "http://akms-simulator_2:4444/api/v1/keys/push_ksa_key"
AkmsCkmsServerPort: "9696"
Peers:
diff --git a/goKMS/config/config.go b/goKMS/config/config.go
index a9ae1d6a..c8baeca6 100644
--- a/goKMS/config/config.go
+++ b/goKMS/config/config.go
@@ -7,7 +7,6 @@ type Config struct {
Name string `yaml:"Name"`
InterComAddr string `yaml:"InterComAddr"`
QuantumAddr string `yaml:"QuantumAddr"`
- GRPCAddr string `yaml:"GRPCAddr"`
AkmsURL string `yaml:"AkmsURL"`
AkmsCkmsServerPort string `yaml:"AkmsCkmsServerPort"`
GnmiBindAddress string `yaml:"GnmiBindAddress"`
diff --git a/integration-tests/config/kms/kms_1.yaml b/integration-tests/config/kms/kms_1.yaml
index e9a119b8..489cf28a 100644
--- a/integration-tests/config/kms/kms_1.yaml
+++ b/integration-tests/config/kms/kms_1.yaml
@@ -2,7 +2,6 @@ Id: '0ff33c82-7fe1-482b-a0ca-67565806ee4b'
Name: kms_1
InterComAddr: 0.0.0.0:50910
QuantumAddr: 0.0.0.0:50911
-GRPCAddr: 0.0.0.0:50900
AkmsURL: "http://akms-simulator_1:4444/api/v1/keys/push_ksa_key"
AkmsCkmsServerPort: "9696"
KmsTLS:
diff --git a/integration-tests/config/kms/kms_2.yaml b/integration-tests/config/kms/kms_2.yaml
index 595ca285..87bbde32 100644
--- a/integration-tests/config/kms/kms_2.yaml
+++ b/integration-tests/config/kms/kms_2.yaml
@@ -2,7 +2,6 @@ Id: '5e41c291-6121-4335-84f6-41e04b8bdaa2'
Name: kms_2
InterComAddr: 0.0.0.0:50910
QuantumAddr: 0.0.0.0:50911
-GRPCAddr: 0.0.0.0:50900
AkmsURL: "http://akms-simulator_2:4444/api/v1/keys/push_ksa_key"
AkmsCkmsServerPort: "9696"
KmsTLS:
--
GitLab