Skip to content

Consolidate fluentd versions #1063

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
luhring merged 1 commit into from
Jul 6, 2023
Merged

Consolidate fluentd versions #1063

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
32 changes: 0 additions & 32 deletions images/fluentd/14.tf
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions images/fluentd/15.tf
View file
Open in desktop

This file was deleted.

55 changes: 0 additions & 55 deletions images/fluentd/configs/edge.apko.yaml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion images/fluentd/configs/latest.apko.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
contents:
packages:
- ruby3.2-fluentd14
- ruby3.2-fluentd

entrypoint:
type: service-bundle
Expand Down
47 changes: 39 additions & 8 deletions images/fluentd/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,48 @@ module "tagger" {
source = "../../tflib/tagger"

depends_on = [
module.test-fourteen,
module.test-fourteen-dev,
module.test-fifteen,
module.test-fifteen-dev,
module.test-latest,
module.test-latest-dev,
]

tags = merge(
{ for t in toset(concat(["edge"], module.version-tags-15.tag_list)) : t => module.fifteen.image_ref },
{ for t in toset(concat(["edge"], module.version-tags-15.tag_list)) : "${t}-dev" => module.fifteen-dev.image_ref },
{ for t in toset(concat(["edge"], module.version-tags-latest.tag_list)) : t => module.latest.image_ref },
{ for t in toset(concat(["edge"], module.version-tags-latest.tag_list)) : "${t}-dev" => module.latest-dev.image_ref },

{ for t in toset(concat(["latest"], module.version-tags-14.tag_list)) : t => module.fourteen.image_ref },
{ for t in toset(concat(["latest"], module.version-tags-14.tag_list)) : "${t}-dev" => module.fourteen-dev.image_ref },
{ for t in toset(concat(["latest"], module.version-tags-latest.tag_list)) : t => module.latest.image_ref },
{ for t in toset(concat(["latest"], module.version-tags-latest.tag_list)) : "${t}-dev" => module.latest-dev.image_ref },
)
}

module "latest" {
source = "../../tflib/publisher"

target_repository = var.target_repository
config = file("${path.module}/configs/latest.apko.yaml")
}

module "latest-dev" {
source = "../../tflib/publisher"

target_repository = var.target_repository
# Make the dev variant an explicit extension of the
# locked original.
config = jsonencode(module.latest.config)
extra_packages = local.fluentd_dev
}

module "version-tags-latest" {
source = "../../tflib/version-tags"
package = "ruby3.2-fluentd"
config = module.latest.config
}

module "test-latest" {
source = "./tests"
digest = module.latest.image_ref
}

module "test-latest-dev" {
source = "./tests"
digest = module.latest-dev.image_ref
}