delete unused config (#4571)

closes #4570
bacalhau-project · Oct 1, 2024 · 282b4b3 · 282b4b3
1 parent 329319b
commit 282b4b3
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 68 deletions.
diff --git a/pkg/config/types/compute.go b/pkg/config/types/compute.go
@@ -5,7 +5,6 @@ type Compute struct {
 	Enabled bool `yaml:"Enabled,omitempty"`
 	// Orchestrators specifies a list of orchestrator endpoints that this compute node connects to.
 	Orchestrators []string  `yaml:"Orchestrators,omitempty"`
-	TLS           TLS       `yaml:"TLS,omitempty"`
 	Heartbeat     Heartbeat `yaml:"Heartbeat,omitempty"`
 	// Labels are key-value pairs used to describe and categorize the compute node.
 	Labels            map[string]string `yaml:"Labels,omitempty"`

diff --git a/pkg/config/types/generated_constants.go b/pkg/config/types/generated_constants.go
@@ -22,14 +22,6 @@ const OrchestratorHostKey = "orchestrator.host"
 const OrchestratorPortKey = "orchestrator.port"
 const OrchestratorAdvertiseKey = "orchestrator.advertise"
 const OrchestratorAuthSecretKey = "orchestrator.authsecret"
-const OrchestratorTLSCertFileKey = "orchestrator.tls.certfile"
-const OrchestratorTLSKeyFileKey = "orchestrator.tls.keyfile"
-const OrchestratorTLSCAFileKey = "orchestrator.tls.cafile"
-const OrchestratorTLSUseTLSKey = "orchestrator.tls.usetls"
-const OrchestratorTLSInsecureKey = "orchestrator.tls.insecure"
-const OrchestratorTLSSelfSignedKey = "orchestrator.tls.selfsigned"
-const OrchestratorTLSAutoCertKey = "orchestrator.tls.autocert"
-const OrchestratorTLSAutoCertCachePathKey = "orchestrator.tls.autocertcachepath"
 const OrchestratorClusterNameKey = "orchestrator.cluster.name"
 const OrchestratorClusterHostKey = "orchestrator.cluster.host"
 const OrchestratorClusterPortKey = "orchestrator.cluster.port"
@@ -44,14 +36,6 @@ const OrchestratorEvaluationBrokerVisibilityTimeoutKey = "orchestrator.evaluatio
 const OrchestratorEvaluationBrokerMaxRetryCountKey = "orchestrator.evaluationbroker.maxretrycount"
 const ComputeEnabledKey = "compute.enabled"
 const ComputeOrchestratorsKey = "compute.orchestrators"
-const ComputeTLSCertFileKey = "compute.tls.certfile"
-const ComputeTLSKeyFileKey = "compute.tls.keyfile"
-const ComputeTLSCAFileKey = "compute.tls.cafile"
-const ComputeTLSUseTLSKey = "compute.tls.usetls"
-const ComputeTLSInsecureKey = "compute.tls.insecure"
-const ComputeTLSSelfSignedKey = "compute.tls.selfsigned"
-const ComputeTLSAutoCertKey = "compute.tls.autocert"
-const ComputeTLSAutoCertCachePathKey = "compute.tls.autocertcachepath"
 const ComputeHeartbeatInfoUpdateIntervalKey = "compute.heartbeat.infoupdateinterval"
 const ComputeHeartbeatResourceUpdateIntervalKey = "compute.heartbeat.resourceupdateinterval"
 const ComputeHeartbeatIntervalKey = "compute.heartbeat.interval"
@@ -67,9 +51,6 @@ const InputSourcesDisabledKey = "inputsources.disabled"
 const InputSourcesReadTimeoutKey = "inputsources.readtimeout"
 const InputSourcesMaxRetryCountKey = "inputsources.maxretrycount"
 const InputSourcesTypesIPFSEndpointKey = "inputsources.types.ipfs.endpoint"
-const InputSourcesTypesS3EndpointKey = "inputsources.types.s3.endpoint"
-const InputSourcesTypesS3AccessKeyKey = "inputsources.types.s3.accesskey"
-const InputSourcesTypesS3SecretKeyKey = "inputsources.types.s3.secretkey"
 const PublishersDisabledKey = "publishers.disabled"
 const PublishersTypesIPFSEndpointKey = "publishers.types.ipfs.endpoint"
 const PublishersTypesS3PreSignedURLDisabledKey = "publishers.types.s3.presignedurldisabled"

diff --git a/pkg/config/types/generated_descriptions.go b/pkg/config/types/generated_descriptions.go
diff --git a/pkg/config/types/orchestrator.go b/pkg/config/types/orchestrator.go
@@ -11,7 +11,6 @@ type Orchestrator struct {
 	Advertise string `yaml:"Advertise,omitempty"`
 	// AuthSecret key specifies the key used by compute nodes to connect to an orchestrator.
 	AuthSecret       string           `yaml:"AuthSecret,omitempty"`
-	TLS              TLS              `yaml:"TLS,omitempty"`
 	Cluster          Cluster          `yaml:"Cluster,omitempty"`
 	NodeManager      NodeManager      `yaml:"NodeManager,omitempty"`
 	Scheduler        Scheduler        `yaml:"Scheduler,omitempty"`

diff --git a/pkg/config/types/storage.go b/pkg/config/types/storage.go
@@ -19,7 +19,6 @@ type InputSourcesConfig struct {
 
 type InputSourcesTypes struct {
 	IPFS IPFSStorage `yaml:"IPFS,omitempty"`
-	S3   S3Storage   `yaml:"S3,omitempty"`
 }
 
 func (i InputSourcesConfig) IsNotDisabled(kind string) bool {
@@ -32,12 +31,3 @@ type IPFSStorage struct {
 	// Endpoint specifies the multi-address to connect to for IPFS. e.g /ip4/127.0.0.1/tcp/5001
 	Endpoint string `yaml:"Endpoint,omitempty"`
 }
-
-type S3Storage struct {
-	// Endpoint specifies the endpoint URL for the S3 input source.
-	Endpoint string `yaml:"Endpoint,omitempty"`
-	// AccessKey specifies the access key for the S3 input source.
-	AccessKey string `yaml:"AccessKey,omitempty"`
-	// SecretKey specifies the secret key for the S3 input source.
-	SecretKey string `yaml:"SecretKey,omitempty"`
-}