Skip to content

feat: bump to helm v3 #787

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
Sep 11, 2025
Merged

feat: bump to helm v3 #787

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
5e1d1a1
feat: bump to helm v3
kierramarie Sep 5, 2025
8f5c328
test: add update ignore for kube-audit helm
kierramarie Sep 11, 2025
0da4d01
Merge branch 'main' into ks-helmv3
kierramarie Sep 11, 2025
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 examples/advanced/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ module "trusted_profile" {
module "logs_agents" {
depends_on = [module.kube_audit]
source = "terraform-ibm-modules/logs-agent/ibm"
version = "1.2.2"
version = "1.7.0"
cluster_id = module.ocp_base.cluster_id
cluster_resource_group_id = module.resource_group.resource_group_id
logs_agent_trusted_profile_id = module.trusted_profile.trusted_profile.id
Expand Down
6 changes: 3 additions & 3 deletions examples/advanced/provider.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ provider "kubernetes" {
}

provider "helm" {
kubernetes {
kubernetes = {
host = data.ibm_container_cluster_config.cluster_config.host
token = data.ibm_container_cluster_config.cluster_config.token
cluster_ca_certificate = data.ibm_container_cluster_config.cluster_config.ca_certificate
}
# IBM Cloud credentials are required to authenticate to the helm repo
registry {
registries = [{
url = "oci://icr.io/ibm/observe/logs-agent-helm"
username = "iamapikey"
password = var.ibmcloud_api_key
}
}]
}
2 changes: 1 addition & 1 deletion examples/advanced/version.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ terraform {
}
helm = {
source = "hashicorp/helm"
version = ">= 2.15.0"
version = ">= 3.0.0, <4.0.0"
}
}
}
4 changes: 2 additions & 2 deletions examples/multiple_mzr_clusters/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ module "monitoring_agent_1" {
helm = helm.helm_cluster_1
}
source = "terraform-ibm-modules/monitoring-agent/ibm"
version = "1.6.3"
version = "1.7.4"
cluster_id = module.ocp_base_cluster_1.cluster_id
cluster_resource_group_id = module.resource_group.resource_group_id
access_key = module.monitoring_instance.access_key
Expand All @@ -202,7 +202,7 @@ module "monitoring_agent_2" {
helm = helm.helm_cluster_2
}
source = "terraform-ibm-modules/monitoring-agent/ibm"
version = "1.6.3"
version = "1.7.4"
cluster_id = module.ocp_base_cluster_2.cluster_id
cluster_resource_group_id = module.resource_group.resource_group_id
access_key = module.monitoring_instance.access_key
Expand Down
4 changes: 2 additions & 2 deletions examples/multiple_mzr_clusters/provider.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ provider "ibm" {

provider "helm" {
alias = "helm_cluster_1"
kubernetes {
kubernetes = {
host = data.ibm_container_cluster_config.cluster_config_c1.host
token = data.ibm_container_cluster_config.cluster_config_c1.token
cluster_ca_certificate = data.ibm_container_cluster_config.cluster_config_c1.ca_certificate
Expand All @@ -18,7 +18,7 @@ provider "helm" {

provider "helm" {
alias = "helm_cluster_2"
kubernetes {
kubernetes = {
host = data.ibm_container_cluster_config.cluster_config_c2.host
token = data.ibm_container_cluster_config.cluster_config_c2.token
cluster_ca_certificate = data.ibm_container_cluster_config.cluster_config_c2.ca_certificate
Expand Down
2 changes: 1 addition & 1 deletion examples/multiple_mzr_clusters/version.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ terraform {
}
helm = {
source = "hashicorp/helm"
version = ">= 2.8.0"
version = ">= 3.0.0, <4.0.0"
}
}
}
2 changes: 1 addition & 1 deletion modules/kube-audit/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ module "kube_audit" {
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >=1.9.0 |
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 2.15.0, <3.0.0 |
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 3.0.0, <4.0.0 |
| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.78.2, <2.0.0 |
| <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.2.1, < 4.0.0 |
| <a name="requirement_time"></a> [time](#requirement\_time) | >= 0.9.1, < 1.0.0 |
Expand Down
44 changes: 22 additions & 22 deletions modules/kube-audit/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,28 +48,28 @@ resource "helm_release" "kube_audit" {
recreate_pods = true
force_update = true

set {
name = "metadata.name"
type = "string"
value = var.audit_deployment_name
}

set {
name = "metadata.namespace"
type = "string"
value = var.audit_namespace
}
set {
name = "image.name"
type = "string"
value = var.audit_webhook_listener_image
}

set {
name = "image.tag"
type = "string"
value = var.audit_webhook_listener_image_tag_digest
}
set = [
{
name = "metadata.name"
type = "string"
value = var.audit_deployment_name
},
{
name = "metadata.namespace"
type = "string"
value = var.audit_namespace
},
{
name = "image.name"
type = "string"
value = var.audit_webhook_listener_image
},
{
name = "image.tag"
type = "string"
value = var.audit_webhook_listener_image_tag_digest
}
]

provisioner "local-exec" {
command = "${path.module}/scripts/confirm-rollout-status.sh ${var.audit_deployment_name} ${var.audit_namespace}"
Expand Down
2 changes: 1 addition & 1 deletion modules/kube-audit/version.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ terraform {
}
helm = {
source = "hashicorp/helm"
version = ">= 2.15.0, <3.0.0"
version = ">= 3.0.0, <4.0.0"
}
}
}
2 changes: 1 addition & 1 deletion solutions/fully-configurable/provider.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ provider "ibm" {
}

provider "helm" {
kubernetes {
kubernetes = {
host = data.ibm_container_cluster_config.cluster_config[0].host
token = data.ibm_container_cluster_config.cluster_config[0].token
cluster_ca_certificate = data.ibm_container_cluster_config.cluster_config[0].ca_certificate
Expand Down
2 changes: 1 addition & 1 deletion solutions/fully-configurable/version.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ terraform {
}
helm = {
source = "hashicorp/helm"
version = "2.17.0"
version = "3.0.0"
}
kubernetes = {
source = "hashicorp/kubernetes"
Expand Down
2 changes: 2 additions & 0 deletions tests/pr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,8 @@ func TestRunUpgradeFullyConfigurable(t *testing.T) {
DeleteWorkspaceOnFail: false,
})

options.IgnoreUpdates = testhelper.Exemptions{List: []string{"module.kube_audit[0].helm_release.kube_audit"}}

options.TerraformVars = []testschematic.TestSchematicTerraformVar{
{Name: "ibmcloud_api_key", Value: options.RequiredEnvironmentVars["TF_VAR_ibmcloud_api_key"], DataType: "string", Secure: true},
{Name: "prefix", Value: options.Prefix, DataType: "string"},
Expand Down