Skip to content

chore: bump helm and observabiilty versions #201

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

Merged
merged 3 commits into from
Oct 25, 2022
Merged

chore: bump helm and observabiilty versions #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18a9190
chore: update component versions
Oct 18, 2022
1e64a77
fix: updated version value for cert-manager
Oct 18, 2022
d1a0bd5
fix: update documentation for OTEL operator
Oct 24, 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
10 changes: 5 additions & 5 deletions config/pulumi/Pulumi.stackname.yaml.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ config:
# Chart name for the helm chart for kic
kic-helm:chart_name: nginx-ingress
# Chart version for the helm chart for kic
kic-helm:chart_version: 0.14.0
kic-helm:chart_version: 0.15.0
# Name of the repo to pull the kic chart from
kic-helm:helm_repo_name: nginx-stable
# URL of the chart repo to pull kic from
Expand Down Expand Up @@ -246,7 +246,7 @@ config:
# Logstore Configuration
logstore:chart_name: elasticsearch
# Chart name for the helm chart for the logstore
logstore:chart_version: 19.1.4
logstore:chart_version: 19.4.4
# Chart version for the helm chart for the logstore
logstore:helm_repo_name: bitnami
# Name of the repo to pull the logstore from
Expand Down Expand Up @@ -277,7 +277,7 @@ config:
# Cert Manager Configuration
certmgr:chart_name: cert-manager
# Chart hame for the helm chart for certmanager
certmgr:chart_version: v1.9.1
certmgr:chart_version: v1.10.0
# Chart version for the helm chart for certmanager
certmgr:certmgr_helm_repo_name: jetstack
# Name of the repo to pull the certmanager chart from
Expand All @@ -293,15 +293,15 @@ config:
# Prometheus Configuration
prometheus:chart_name: kube-prometheus-stack
# Chart name for the helm chart for prometheus
prometheus:chart_version: 39.2.1
prometheus:chart_version: 41.5.0
# Chart version for the helm chart for prometheus
prometheus:helm_repo_name: prometheus-community
# Name of the repo to pull the prometheus chart from
prometheus:helm_repo_url: https://https://prometheus-community.github.io/helm-charts
# URL of the chart repo
prometheus:statsd_chart_name: prometheus-statsd-exporter
# Name of the statsd chart (uses the same repo as the prom chart)
prometheus.statsd_chart_version: 0.5.0
prometheus.statsd_chart_version: 0.6.2
# Version of the statsd chart (uses the same repo as the prom chart)
prometheus:helm_timeout: 300
# Timeout value for helm operations in seconds
Expand Down
4 changes: 2 additions & 2 deletions pulumi/python/kubernetes/certmgr/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def add_namespace(obj):
chart_name = 'cert-manager'
chart_version = config.get('chart_version')
if not chart_version:
chart_version = 'v1.9.1'
chart_version = 'v1.10.0'
Copy link
Contributor

Choose a reason for hiding this comment

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

Not necessary to adjust in this PR, but in my opinion we should check that the user has specified versions up front and crash with a helpful error message before anything is created. Defaults help with the "plug and play" ability of the example but I think we can have the defaults encoded in the .example as above and not hidden in a python script.

Thoughts on this? Do you think it would be tough to do?

Copy link
Contributor

Choose a reason for hiding this comment

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

If we crashed here, would we wind up with any half-created state?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Definitely, if we crash out things are really pear-shaped.

The long-term plan - and I think there may be an issue with it; if not I will add one - is to remove the fallbacks in the code for versions and force them all through the config. This requires that we make sure we tell the users how to add these values, and we probably should provide a "just give me all the known working values" option.

Copy link
Contributor

Choose a reason for hiding this comment

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

Sounds like we are in agreement but we don't need to hold up this chore PR on it. I'll call this another notch to add to #140

helm_repo_name = config.get('certmgr_helm_repo_name')
if not helm_repo_name:
helm_repo_name = 'jetstack'
Expand Down Expand Up @@ -85,4 +85,4 @@ def add_namespace(obj):
certmgr_release = Release("certmgr", args=certmgr_release_args, opts=pulumi.ResourceOptions(depends_on=ns))

status = certmgr_release.status
pulumi.export("certmgr_status", status)
pulumi.export("certmgr_status", status)
2 changes: 1 addition & 1 deletion pulumi/python/kubernetes/logstore/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
chart_name = 'elasticsearch'
chart_version = config.get('chart_version')
if not chart_version:
chart_version = '19.1.4'
chart_version = '19.4.4'
helm_repo_name = config.get('helm_repo_name')
if not helm_repo_name:
helm_repo_name = 'bitnami'
Expand Down
4 changes: 2 additions & 2 deletions pulumi/python/kubernetes/nginx/ingress-controller-repo-only/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
chart_name = 'nginx-ingress'
chart_version = config.get('chart_version')
if not chart_version:
chart_version = '0.13.0'
chart_version = '0.15.0'
helm_repo_name = config.get('helm_repo_name')
if not helm_repo_name:
helm_repo_name = 'nginx-stable'
Expand All @@ -31,7 +31,7 @@
nginx_repository = "nginx/nginx-ingress"
nginx_tag = config.get('nginx_tag')
if not nginx_tag:
nginx_tag = "2.2.0"
nginx_tag = "2.4.0"
Copy link
Contributor

Choose a reason for hiding this comment

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

What does this version number correlate to? I don't see it in the version numbers modified in the .example above.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There are two paths for the NGINX IC deployment; one is in the mainline where we do everything in Python - this is the "just pull from the repo w/ the JWT" logic, and for that we need the nginx image tag (latest is 2.4.0). If you look at the NGINX version that's the most recent.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for the clarification. Ideally this lives in config somewhere but let's put that on #140

nginx_plus_flag = config.get_bool('nginx_plus_flag')
if not nginx_plus_flag:
nginx_plus_flag = False
Expand Down
2 changes: 1 addition & 1 deletion pulumi/python/kubernetes/nginx/ingress-controller/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
chart_name = 'nginx-ingress'
chart_version = config.get('chart_version')
if not chart_version:
chart_version = '0.14.0'
chart_version = '0.15.0'
helm_repo_name = config.get('helm_repo_name')
if not helm_repo_name:
helm_repo_name = 'nginx-stable'
Expand Down
4 changes: 4 additions & 0 deletions pulumi/python/kubernetes/observability/otel-operator/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ Deploys the OpenTelemetry Operator via a YAML manifest.

* [`opentelemetry-operator.yaml`](./opentelemetry-operator.yaml) This file is
used by the Pulumi code in the directory above to deploy the OTEL operator.
Note that this file is pulled from the
[OpenTelemetry Operator](https://opentelemetry.io/docs/k8s-operator/) install
documentation. It is included as a static resource in order to manage the
version within MARA.

## Notes

Expand Down
Loading