Skip to content

Jk/cumulus 4773#243

Merged
Jkovarik merged 19 commits intocumulus-infrafrom
jk/CUMULUS-4773
Apr 9, 2026
Merged

Jk/cumulus 4773#243
Jkovarik merged 19 commits intocumulus-infrafrom
jk/CUMULUS-4773

Conversation

@Jkovarik
Copy link
Copy Markdown
Collaborator

@Jkovarik Jkovarik commented Apr 8, 2026

Merging main + CUMULUS-4773 into cumulus-infra

This will upgrade Cumulus to 21.3.2. Please note stack migration steps from Core when testing:

  • CUMULUS-4395 Core CnmResponse task lambda log group import
    • The lambda function name and log group name for this task are
      <prefix>-CnmResponse which might conflict with the non-core version of
      the task if you set that up in your terraform. In order to successfully deploy
      the core task you may need to either:

      • Delete the existing lambda and log group or
      • Import the existing lambda and/or log group to allow terraform to modify
        them.
      terraform import module.cumulus.module.ingest.module.cnm_response_task.aws_cloudwatch_log_group.cnm_response_task /aws/lambda/<prefix>-CnmResponse
      terraform import module.cumulus.module.ingest.module.cnm_response_task.aws_lambda_function.cnm_response_task arn:aws:lambda:us-east-1:<account-number>:function:<prefix>-CnmResponse
      

      NOTE: For cumulus core developer ci stacks you only need to import the log
      group, since the lambda deployed in the example/cumulus-tf directory will be
      renamed automatically.

Comment thread Dockerfile Outdated
# Terraform
RUN \
curl "https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip" -o "terraform.zip" && \
unzip terraform.zip && \
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

No -q flag?

Copy link
Copy Markdown
Collaborator Author

@Jkovarik Jkovarik Apr 9, 2026

Choose a reason for hiding this comment

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

I'm not opposed to squelching the output for more compressed logs as a general good practice.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Comment thread Dockerfile Outdated
RUN dnf install -y gcc gcc-c++ git make unzip zip jq

# Install Docker
RUN dnf install -y docker git make unzip zip jq gcc gcc-c++
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Are these redundant with 3 lines up?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Good catch - the docker redundancy and it should be resolved.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Comment thread Dockerfile Outdated
Comment thread Dockerfile Outdated
# AWS CLI
RUN \
curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-$AWS_CLI_VERSION.zip" -o "awscliv2.zip" && \
unzip awscliv2.zip && \
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Sanity dictates a -q flag 😄

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

I'm assuming the original implementer had other opinions, however I tend to agree.

b878e4a

@Jkovarik Jkovarik marked this pull request as ready for review April 9, 2026 05:54
Copy link
Copy Markdown
Collaborator

@etcart etcart left a comment

Choose a reason for hiding this comment

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

tested this and it worked on my machine

@Jkovarik Jkovarik merged commit 76df47f into cumulus-infra Apr 9, 2026
5 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.

5 participants