Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: TLS configuration for ESS #7

Merged
merged 4 commits into from
Nov 3, 2023
Merged

feat: TLS configuration for ESS #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e891316
Enable ESS
jaylevin Nov 1, 2023
62773f3
secret store TLS internals
jaylevin Nov 3, 2023
eb9529f
update provider to latest tf version, fix ESS
jaylevin Nov 3, 2023
e21e552
Merge branch 'main' into chore/enable-ess
jaylevin Nov 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ export TERRAFORM_VERSION ?= 1.3.3

export TERRAFORM_PROVIDER_SOURCE := confluentinc/confluent
export TERRAFORM_PROVIDER_REPO := https://github.com/confluentinc/terraform-provider-confluent
export TERRAFORM_PROVIDER_VERSION := 1.28.0
export TERRAFORM_PROVIDER_VERSION := 1.55.0
export TERRAFORM_PROVIDER_DOWNLOAD_NAME := terraform-provider-confluent
export TERRAFORM_PROVIDER_DOWNLOAD_URL_PREFIX ?= $(TERRAFORM_PROVIDER_REPO)/releases/download/v$(TERRAFORM_PROVIDER_VERSION)
export TERRAFORM_NATIVE_PROVIDER_BINARY := terraform-provider-confluent_1.28.0
export TERRAFORM_NATIVE_PROVIDER_BINARY := terraform-provider-confluent_1.55.0
export TERRAFORM_DOCS_PATH := docs/resources

PLATFORMS ?= linux_amd64 linux_arm64
Expand Down Expand Up @@ -127,6 +127,7 @@ pull-docs:
@git -C "$(WORK_DIR)/$(TERRAFORM_PROVIDER_SOURCE)" sparse-checkout set "$(TERRAFORM_DOCS_PATH)"
generate.init: $(TERRAFORM_PROVIDER_SCHEMA) pull-docs


.PHONY: $(TERRAFORM_PROVIDER_SCHEMA) pull-docs
# ====================================================================================
# Targets
Expand Down
32 changes: 32 additions & 0 deletions apis/confluent/v1alpha1/zz_cluster_types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

105 changes: 105 additions & 0 deletions apis/confluent/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/provider/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func main() {
o.SecretStoreConfigGVK = &v1alpha1.StoreConfigGroupVersionKind
log.Info("Alpha feature enabled", "flag", features.EnableAlphaExternalSecretStores)

o.ESSOptions = &xpcontroller.ESSOptions{}
o.ESSOptions = &tjcontroller.ESSOptions{}
if *essTLSCertsPath != "" {
log.Info("ESS TLS certificates path is set. Loading mTLS configuration.")
tCfg, err := certificates.LoadMTLSConfig(filepath.Join(*essTLSCertsPath, "ca.crt"), filepath.Join(*essTLSCertsPath, "tls.crt"), filepath.Join(*essTLSCertsPath, "tls.key"), false)
Expand Down
Loading
Loading