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

Minor Bugfixes around GH token and Certbot handling #42

Merged
merged 1 commit into from
Sep 6, 2023
Merged

Minor Bugfixes around GH token and Certbot handling #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 neon_diana_utils/configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ def configure_backend(username: str = None,
gh_username = click.prompt("GitHub username", type=str)
gh_token = click.prompt("GitHub Token with `read:packages` "
"permission", type=str)
gh_secret_path = join(output_path, "templates",
gh_secret_path = join(output_path, "diana-backend", "templates",
"secret_gh_token.yaml")
create_github_secret(gh_username, gh_token, gh_secret_path)
click.echo(f"Generated GH secret at {gh_secret_path}")
Expand Down
7 changes: 4 additions & 3 deletions neon_diana_utils/helm_charts/diana-backend/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ configSecret: diana-config
# Note: Changes here need to be reflected in all MQ containers

letsencrypt:
sslSecret: letsencrypt-ssl
# Note: This should match `diana-http.ingress.tlsSecretName
sslSecret: &ssl_secret letsencrypt-private-key
# Note: This MUST match `diana-http.ingress.certIssuer
server: https://acme-staging-v02.api.letsencrypt.org/directory
email: [email protected]
# TODO: Update server and email to valid options
Expand All @@ -38,7 +38,8 @@ rabbitmq:
diana-http:
domain: *domain
ingress:
tlsSecretName: letsencrypt-ssl
certIssuer: *ssl_secret
tlsSecretName: letsencrypt-tls-secret
extraRules:
- host: mqadmin
serviceName: *name_rmq
Expand Down
2 changes: 1 addition & 1 deletion neon_diana_utils/helm_charts/http-services/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
name: ingress-diana-http
annotations:
kubernetes.io/ingress.class: {{ .Values.ingress.ingressClassName }}
cert-manager.io/issuer: {{ .Values.ingress.tlsSecretName }}
cert-manager.io/issuer: {{ .Values.ingress.certIssuer }}
spec:
tls:
- secretName: {{ .Values.ingress.tlsSecretName }}
Expand Down
1 change: 1 addition & 0 deletions neon_diana_utils/helm_charts/http-services/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ ingress:
enabled: True
ingressClassName: nginx
tlsSecretName: tls-letsencrypt-prod
certIssuer: letsencrypt-private-key
rules:
- host: *host_libretranslate
serviceName: libretranslate
Expand Down
Loading