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

Stop using a named helm repo for cert-manager, link directly #1133

Merged
merged 2 commits into from
Mar 21, 2022
Merged

Stop using a named helm repo for cert-manager, link directly #1133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e770374
Stop using a named helm repo for cert-manager, link directly
consideRatio Mar 18, 2022
3ebf4a8
Our helm chart templates are not secret
consideRatio Mar 18, 2022
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
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ repos:
hooks:
- id: sops-encryption
# Add files here if they contain the word 'secret' but should not be encrypted
exclude: secrets\.md
exclude: secrets\.md|helm-charts/support/templates/prometheus-ingres-auth/secret\.yaml
Copy link
Member

@sgibson91 sgibson91 Mar 21, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this have to be a list of specific files, or can we make it the following?

any file under helm-charts/**/templates/** that has secret in its name

Like in our git-ignore?

https://github.com/2i2c-org/infrastructure/blob/master/.gitignore#L16

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This must be a python regular expression i think, so i dont think so :/

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, it can be such expression though, but a duplicated one.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not critical, just a wondering :)

25 changes: 3 additions & 22 deletions deployer/cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,36 +73,17 @@ def deploy_support(self):
cert_manager_url = "https://charts.jetstack.io"
cert_manager_version = "v1.3.1"

print_colour("Adding cert-manager chart repo...")
subprocess.check_call(
[
"helm",
"repo",
"add",
"jetstack",
cert_manager_url,
]
)

print_colour("Updating cert-manager chart repo...")
subprocess.check_call(
[
"helm",
"repo",
"update",
]
)

print_colour("Provisioning cert-manager...")
subprocess.check_call(
[
"helm",
"upgrade",
"cert-manager", # given release name (aka. installation name)
"cert-manager", # helm chart to install
f"--repo={cert_manager_url}",
"--install",
"--create-namespace",
"--namespace=cert-manager",
"cert-manager",
"jetstack/cert-manager",
f"--version={cert_manager_version}",
"--set=installCRDs=true",
]
Expand Down