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.

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

Add vars for specific validator images #12

Merged
merged 4 commits into from
Jan 27, 2025
Merged

Conversation

KyleOps
Copy link
Collaborator

@KyleOps KyleOps commented Jan 22, 2025

No description provided.

@KyleOps KyleOps requested a review from projkov January 22, 2025 23:38
Copy link

Terraform Plan Output

Click to expand
Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
  ~ update in-place

Terraform will perform the following actions:

  # helm_release.inferno will be updated in-place
  ~ resource "helm_release" "inferno" {
        id                         = "dev-inferno"
      ~ metadata                   = [
          - {
              - app_version    = "1.16.0"
              - chart          = "inferno-helmd"
              - first_deployed = 1736748538
              - last_deployed  = 1737390197
              - name           = "dev-inferno"
              - namespace      = "dev-inferno"
              - revision       = 4
              - values         = jsonencode(
                    {
                      - controller = {
                          - enabled              = false
                          - ingressClass         = "nginx"
                          - ingressClassResource = {
                              - default = false
                              - enabled = true
                              - name    = "nginx"
                            }
                          - service              = {
                              - annotations = {
                                  - "service.beta.kubernetes.io/aws-load-balancer-type" = "nlb"
                                }
                            }
                        }
                      - inferno    = {
                          - externalValidatorUrl = null
                          - imageUrl             = "ghcr.io/hl7au/au-fhir-inferno:473d92b2fbe8e78ec36f43ffdc1fb827b4f82445"
                          - terminologyServer    = "https://tx.dev.hl7.org.au/fhir"
                          - usesWrapper          = true
                        }
                      - ingress    = {
                          - hostnames = [
                              - "dev.inferno.sparked-fhir.com",
                              - "dev.inferno.hl7.org.au",
                            ]
                        }
                      - nginx      = {
                          - example          = 123
                          - platformImageUri = "ghcr.io/hl7au/au-fhir-inferno:7a99baaf50e18e201e95f7ca91477bc41da0cda8-nginx"
                        }
                      - postgresql = {
                          - containerPorts = {
                              - postgresql = 5432
                            }
                          - enabled        = false
                          - externaldbhost = "(sensitive value)"
                          - global         = {
                              - postgresql = {
                                  - auth = {
                                      - database = "inferno"
                                      - password = "(sensitive value)"
                                      - username = "(sensitive value)"
                                    }
                                }
                            }
                        }
                    }
                )
              - version        = "0.2.0"
                # (1 unchanged attribute hidden)
            },
        ] -> (known after apply)
        name                       = "dev-inferno"
      ~ values                     = [
          ~ <<-EOT
                ingress:
                  hostnames:
                    - example.inferno.sparked-fhir.com
                    - example.inferno.hl7.org.au
                
                inferno:
                  imageUrl: "ghcr.io/hl7au/au-fhir-inferno:68270162fcc1997a9ffac63c78530921bf0f32cf"
                  terminologyServer: "https://tx.dev.hl7.org.au/fhir"
                  externalValidatorUrl: null  # This can be overridden during chart deployment
              +   validatorImageUri: "pavelrozhkov/wrapper:6.3.11"
                
                controller:
                  enabled: false # Set to true to enable the ingress controller if you have not already installed it, multiple ingress controllers can be installed via https://kubernetes.github.io/ingress-nginx/user-guide/multiple-ingress/
                  ingressClass: "nginx"
                  ingressClassResource:
                    name: nginx
                    enabled: true
                    default: false
                  service:
                    annotations:
                      service.beta.kubernetes.io/aws-load-balancer-type: "nlb"
                
                postgresql:
                  enabled: false # enable if not using rds from aws-impl
                  externaldbhost: null # This can be overridden during chart deployment
                  containerPorts:
                    postgresql: 5432
                  global:
                    postgresql:
                      auth:
                        username: "postgres"
                        password: "password"
                        database: "inferno"
            EOT,
        ]
        # (25 unchanged attributes hidden)

      - set {
          - name  = "nginx.example" -> null
          - value = "123" -> null
            # (1 unchanged attribute hidden)
        }
      + set {
          + name  = "inferno.validatorImageUri"
          + value = "pavelrozhkov/wrapper:6.3.11"
            # (1 unchanged attribute hidden)
        }
      + set {
          + name  = "nginx.example"
          + value = "1234"
            # (1 unchanged attribute hidden)
        }

        # (8 unchanged blocks hidden)
    }

Plan: 0 to add, 1 to change, 0 to destroy.

Copy link

Terraform Plan Output

Click to expand
Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
  ~ update in-place

Terraform will perform the following actions:

  # helm_release.inferno will be updated in-place
  ~ resource "helm_release" "inferno" {
        id                         = "dev-inferno"
      ~ metadata                   = [
          - {
              - app_version    = "1.16.0"
              - chart          = "inferno-helmd"
              - first_deployed = 1736748538
              - last_deployed  = 1737589137
              - name           = "dev-inferno"
              - namespace      = "dev-inferno"
              - revision       = 5
              - values         = jsonencode(
                    {
                      - controller = {
                          - enabled              = false
                          - ingressClass         = "nginx"
                          - ingressClassResource = {
                              - default = false
                              - enabled = true
                              - name    = "nginx"
                            }
                          - service              = {
                              - annotations = {
                                  - "service.beta.kubernetes.io/aws-load-balancer-type" = "nlb"
                                }
                            }
                        }
                      - inferno    = {
                          - externalValidatorUrl = null
                          - imageUrl             = "ghcr.io/hl7au/au-fhir-inferno:473d92b2fbe8e78ec36f43ffdc1fb827b4f82445"
                          - terminologyServer    = "https://tx.dev.hl7.org.au/fhir"
                          - usesWrapper          = true
                          - validatorImageUri    = "pavelrozhkov/wrapper:6.3.11"
                        }
                      - ingress    = {
                          - hostnames = [
                              - "dev.inferno.sparked-fhir.com",
                              - "dev.inferno.hl7.org.au",
                            ]
                        }
                      - nginx      = {
                          - example          = 1234
                          - platformImageUri = "ghcr.io/hl7au/au-fhir-inferno:7a99baaf50e18e201e95f7ca91477bc41da0cda8-nginx"
                        }
                      - postgresql = {
                          - containerPorts = {
                              - postgresql = 5432
                            }
                          - enabled        = false
                          - externaldbhost = "(sensitive value)"
                          - global         = {
                              - postgresql = {
                                  - auth = {
                                      - database = "inferno"
                                      - password = "(sensitive value)"
                                      - username = "(sensitive value)"
                                    }
                                }
                            }
                        }
                    }
                )
              - version        = "0.2.0"
                # (1 unchanged attribute hidden)
            },
        ] -> (known after apply)
        name                       = "dev-inferno"
        # (26 unchanged attributes hidden)

      - set {
          - name  = "ingress.hostnames[1]" -> null
          - value = "dev.inferno.hl7.org.au" -> null
            # (1 unchanged attribute hidden)
        }
      + set {
          + name  = "ingress.hostnames[1]"
          + value = "inferno.dev.hl7.org.au"
            # (1 unchanged attribute hidden)
        }

        # (9 unchanged blocks hidden)
    }

Plan: 0 to add, 1 to change, 0 to destroy.

Copy link

Terraform Plan Output

Click to expand
Terraform used the selected providers to generate the following execution
plan. Resource actions are indicated with the following symbols:
  ~ update in-place

Terraform will perform the following actions:

  # helm_release.inferno will be updated in-place
  ~ resource "helm_release" "inferno" {
        id                         = "dev-inferno"
      ~ metadata                   = [
          - {
              - app_version    = "1.16.0"
              - chart          = "inferno-helmd"
              - first_deployed = 1736748538
              - last_deployed  = 1737985433
              - name           = "dev-inferno"
              - namespace      = "dev-inferno"
              - revision       = 9
              - values         = jsonencode(
                    {
                      - controller = {
                          - enabled              = false
                          - ingressClass         = "nginx"
                          - ingressClassResource = {
                              - default = false
                              - enabled = true
                              - name    = "nginx"
                            }
                          - service              = {
                              - annotations = {
                                  - "service.beta.kubernetes.io/aws-load-balancer-type" = "nlb"
                                }
                            }
                        }
                      - inferno    = {
                          - externalValidatorUrl = null
                          - imageUrl             = "ghcr.io/hl7au/au-fhir-inferno:b087ebecc0512846da5cc5465d18f4cfc423632c"
                          - terminologyServer    = "https://tx.dev.hl7.org.au/fhir"
                          - usesWrapper          = true
                        }
                      - ingress    = {
                          - hostnames = [
                              - "dev.inferno.sparked-fhir.com",
                              - "inferno.dev.hl7.org.au",
                            ]
                        }
                      - nginx      = {
                          - example          = 123
                          - platformImageUri = "ghcr.io/hl7au/au-fhir-inferno:b087ebecc0512846da5cc5465d18f4cfc423632c-nginx"
                        }
                      - postgresql = {
                          - containerPorts = {
                              - postgresql = 5432
                            }
                          - enabled        = false
                          - externaldbhost = "(sensitive value)"
                          - global         = {
                              - postgresql = {
                                  - auth = {
                                      - database = "inferno"
                                      - password = "(sensitive value)"
                                      - username = "(sensitive value)"
                                    }
                                }
                            }
                        }
                    }
                )
              - version        = "0.2.0"
                # (1 unchanged attribute hidden)
            },
        ] -> (known after apply)
        name                       = "dev-inferno"
      ~ values                     = [
          ~ <<-EOT
                ingress:
                  hostnames:
                    - example.inferno.sparked-fhir.com
                    - example.inferno.hl7.org.au
                
                inferno:
                  imageUrl: "ghcr.io/hl7au/au-fhir-inferno:68270162fcc1997a9ffac63c78530921bf0f32cf"
                  terminologyServer: "https://tx.dev.hl7.org.au/fhir"
                  externalValidatorUrl: null  # This can be overridden during chart deployment
              +   validatorImageUri: "pavelrozhkov/wrapper:6.3.11"
                
                controller:
                  enabled: false # Set to true to enable the ingress controller if you have not already installed it, multiple ingress controllers can be installed via https://kubernetes.github.io/ingress-nginx/user-guide/multiple-ingress/
                  ingressClass: "nginx"
                  ingressClassResource:
                    name: nginx
                    enabled: true
                    default: false
                  service:
                    annotations:
                      service.beta.kubernetes.io/aws-load-balancer-type: "nlb"
                
                postgresql:
                  enabled: false # enable if not using rds from aws-impl
                  externaldbhost: null # This can be overridden during chart deployment
                  containerPorts:
                    postgresql: 5432
                  global:
                    postgresql:
                      auth:
                        username: "postgres"
                        password: "password"
                        database: "inferno"
            EOT,
        ]
        # (25 unchanged attributes hidden)

      - set {
          - name  = "nginx.example" -> null
          - value = "123" -> null
            # (1 unchanged attribute hidden)
        }
      + set {
          + name  = "inferno.validatorImageUri"
          + value = "pavelrozhkov/wrapper:6.3.11"
            # (1 unchanged attribute hidden)
        }
      + set {
          + name  = "nginx.example"
          + value = "1234"
            # (1 unchanged attribute hidden)
        }

        # (8 unchanged blocks hidden)
    }

Plan: 0 to add, 1 to change, 0 to destroy.

@projkov projkov merged commit d4ab61c into master Jan 27, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants