Skip to content

Commit

Permalink
Remove defaultTLS option
Browse files Browse the repository at this point in the history
  • Loading branch information
HomayoonAlimohammadi authored and addyess committed Nov 22, 2024
1 parent e27d1e5 commit 7233a6d
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 13 deletions.
9 changes: 0 additions & 9 deletions charms/worker/k8s/charmcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -218,15 +218,6 @@ config:
default: false
description: |
Determines if the ingress feature should be enabled.
ingress-default-tls-secret:
type: string
default: ""
description: |
Sets the name of the kubernetes secret to be used for providing default encryption to
ingresses.
This secret should be in the `kube-system` namespace.
Ingresses can specify another TLS secret in their resource definitions,
in which case the default secret won't be used.
ingress-enable-proxy-protocol:
type: boolean
default: false
Expand Down
1 change: 0 additions & 1 deletion charms/worker/k8s/src/charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,6 @@ def _assemble_cluster_config(self) -> UserFacingClusterConfig:

ingress = IngressConfig(
enabled=self.config.get("ingress-enabled"),
default_tls_secret=self.config.get("ingress-default-tls-secret"),
enable_proxy_protocol=self.config.get("ingress-enable-proxy-protocol"),
)

Expand Down
3 changes: 0 additions & 3 deletions charms/worker/k8s/tests/unit/test_config_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,10 @@ def test_configure_ingress_options(harness):

enabled = True
proxy_protocol_enabled = True
default_tls_secret = "my-secret"

harness.update_config({"ingress-enabled": enabled})
harness.update_config({"ingress-enable-proxy-protocol": proxy_protocol_enabled})
harness.update_config({"ingress-default-tls-secret": default_tls_secret})

ufcg = harness.charm._assemble_cluster_config()
assert ufcg.ingress.enabled == enabled
assert ufcg.ingress.enable_proxy_protocol == proxy_protocol_enabled
assert ufcg.ingress.default_tls_secret == default_tls_secret

0 comments on commit 7233a6d

Please sign in to comment.