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

Ec2 imagebuilder updates #866

Merged
merged 47 commits into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
38c7d26
Merge branch '2.1.7-fixes' into uat
nickchadwick-noaa Aug 23, 2024
7cf3316
Bandaid: Injects code to remove invalid HAND FIM geometries
shawncrawley Aug 26, 2024
7952317
Merge branch 'uat' into 2.1.7-fixes
nickchadwick-noaa Aug 26, 2024
b81a71a
updated sql files that were previously looking for a 'version' colume…
nickchadwick-noaa Aug 26, 2024
7866fec
Remove QC FIM layers from public srf prvi fim service
shawncrawley Aug 26, 2024
7ddd5ff
Merge branch '2.1.7-fixes' of github.com:NOAA-OWP/hydrovis into 2.1.7…
shawncrawley Aug 26, 2024
5ea546e
Fix fim_version column in queries
shawncrawley Aug 26, 2024
0d42232
renamed some misspelled folders
nickchadwick-noaa Aug 27, 2024
e66dc35
update egis-servers image builder base os Win2022 and ArcGIS v11.3
DrixTabligan-NOAA Aug 29, 2024
2cb7f0f
Merge branch 'refs/heads/ti' into ec2-imagebuilder-updates
DrixTabligan-NOAA Aug 29, 2024
ea5f07a
Quick attempt to fix alaska service oid issues
shawncrawley Aug 30, 2024
63575eb
Tweaks from QA/QC of alaska services
shawncrawley Sep 3, 2024
55b67b9
Fixes bug in mapx file
shawncrawley Sep 3, 2024
3906377
Enables feature service on mrf_nbm_10day_max_inundation_extent
shawncrawley Sep 4, 2024
1826d17
Modifies symbology of ana_high_flow_magnitude_prvi
shawncrawley Sep 4, 2024
025cdaa
Implements public version of stage_based_catfim
shawncrawley Sep 4, 2024
3a601de
Add public stage_based_catfim entry to sd file creation script
shawncrawley Sep 4, 2024
b19efc3
Uniquely renames sublayers
shawncrawley Sep 4, 2024
121ecab
Merge remote-tracking branch 'refs/remotes/upstream/ti' into ec2-imag…
DrixTabligan-NOAA Sep 6, 2024
deefa78
Fixes a handful of services
shawncrawley Sep 6, 2024
2aa4b8f
Removes clipping from public_fim_domain subsetting
shawncrawley Sep 6, 2024
ec8b1ba
Changed the Alaska domain 15-hr Accum Precip service mapx layer from …
KatherinePowell-NOAA Sep 9, 2024
9318d4a
update to push images to Shared Services to use as base images for Hy…
DrixTabligan-NOAA Sep 9, 2024
2b65849
added dependency to Viz EC2 so that it generates the list of services…
nickchadwick-noaa Sep 12, 2024
a0f0264
Bandaid: Injects code to remove invalid HAND FIM geometries
shawncrawley Aug 26, 2024
fc7f49f
Remove QC FIM layers from public srf prvi fim service
shawncrawley Aug 26, 2024
c208a15
updated sql files that were previously looking for a 'version' colume…
nickchadwick-noaa Aug 26, 2024
ae6f087
Fix fim_version column in queries
shawncrawley Aug 26, 2024
6127414
renamed some misspelled folders
nickchadwick-noaa Aug 27, 2024
bb95d2b
Quick attempt to fix alaska service oid issues
shawncrawley Aug 30, 2024
1c4ca39
Tweaks from QA/QC of alaska services
shawncrawley Sep 3, 2024
c2bd3f4
Fixes bug in mapx file
shawncrawley Sep 3, 2024
0168d4b
Enables feature service on mrf_nbm_10day_max_inundation_extent
shawncrawley Sep 4, 2024
2982042
Modifies symbology of ana_high_flow_magnitude_prvi
shawncrawley Sep 4, 2024
a343be8
Implements public version of stage_based_catfim
shawncrawley Sep 4, 2024
cd7698a
Add public stage_based_catfim entry to sd file creation script
shawncrawley Sep 4, 2024
2f7e3a4
Uniquely renames sublayers
shawncrawley Sep 4, 2024
96b27b5
Fixes a handful of services
shawncrawley Sep 6, 2024
2a29311
Removes clipping from public_fim_domain subsetting
shawncrawley Sep 6, 2024
5f21557
Changed the Alaska domain 15-hr Accum Precip service mapx layer from …
KatherinePowell-NOAA Sep 9, 2024
4efc5f2
added dependency to Viz EC2 so that it generates the list of services…
nickchadwick-noaa Sep 12, 2024
8e2a53b
update egis-servers image builder base os Win2022 and ArcGIS v11.3
DrixTabligan-NOAA Aug 29, 2024
fb41946
Fixes misnamed sublayer
shawncrawley Jul 26, 2024
eb5d55f
added product config yml and service mapx and yml files
KatherinePowell-NOAA Aug 26, 2024
20c855d
making AK flowlines service private
nickchadwick-noaa Aug 29, 2024
2370dea
update to push images to Shared Services to use as base images for Hy…
DrixTabligan-NOAA Sep 9, 2024
b69239f
Merge branch 'ec2-imagebuilder-updates' of https://github.com/DrixTab…
DrixTabligan-NOAA Sep 12, 2024
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
198 changes: 91 additions & 107 deletions Core/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Core/EC2/viz/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,8 @@ resource "aws_ssm_parameter" "latest_deployed_github_repo_commit" {
name = "latest_deployed_github_repo_commit"
type = "String"
value = data.external.github_repo_commit.result.output

depends_on = [aws_instance.viz_pipeline]
}

data "cloudinit_config" "pipeline_setup" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ resource "aws_imagebuilder_image_pipeline" "arcgis_enterprise" {

resource "aws_imagebuilder_image_recipe" "arcgisenterprise_recipe" {
name = "arcgisenterprise-${local.arcgisVersionName}-recipe"
parent_image = "arn:aws:imagebuilder:${var.region}:aws:image/windows-server-2019-english-full-base-x86/x.x.x"
parent_image = "arn:aws:imagebuilder:${var.region}:aws:image/windows-server-2022-english-full-base-x86/x.x.x"
version = local.image_version
tags = local.shared_tags

Expand Down Expand Up @@ -105,15 +105,12 @@ resource "aws_imagebuilder_image_recipe" "arcgisenterprise_recipe" {
resource "aws_imagebuilder_distribution_configuration" "arcgisenterprise-distribution" {
name = "arcgisenterprise-${local.arcgisVersionName}-distribution"

dynamic "distribution" {
for_each = local.destination_aws_regions
content {
region = distribution.value
ami_distribution_configuration {
name = "arcgisenterprise-${local.arcgisVersionName}-{{ imagebuilder:buildDate }}"
target_account_ids = var.ami_sharing_account_ids
ami_tags = merge(data.aws_default_tags.default.tags, { Name = "arcgisenterprise-${local.arcgisVersionName}-distribution" }, local.shared_tags)
}
distribution {
region = "us-east-1"
ami_distribution_configuration {
name = "arcgisenterprise-${local.arcgisVersionName}-{{ imagebuilder:buildDate }}"
target_account_ids = ["226711853580"]
ami_tags = merge(data.aws_default_tags.default.tags, { Name = "arcgisenterprise-${local.arcgisVersionName}-distribution" }, local.shared_tags)
}
}
}
17 changes: 7 additions & 10 deletions Core/ImageBuilder/Pipelines/egis-servers/arcgisserver-pipeline.tf
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ resource "aws_imagebuilder_image_pipeline" "arcgis_server" {

resource "aws_imagebuilder_image_recipe" "arcgisserver_recipe" {
name = "arcgisserver-${local.arcgisVersionName}-recipe"
parent_image = "arn:aws:imagebuilder:${var.region}:aws:image/windows-server-2019-english-full-base-x86/x.x.x"
parent_image = "arn:aws:imagebuilder:${var.region}:aws:image/windows-server-2022-english-full-base-x86/x.x.x"
version = local.image_version
tags = local.shared_tags

Expand Down Expand Up @@ -105,15 +105,12 @@ resource "aws_imagebuilder_image_recipe" "arcgisserver_recipe" {
resource "aws_imagebuilder_distribution_configuration" "arcgisserver-distribution" {
name = "arcgisserver-${local.arcgisVersionName}-distribution"

dynamic "distribution" {
for_each = local.destination_aws_regions
content {
region = distribution.value
ami_distribution_configuration {
name = "arcgisserver-${local.arcgisVersionName}-{{ imagebuilder:buildDate }}"
target_account_ids = var.ami_sharing_account_ids
ami_tags = merge(data.aws_default_tags.default.tags, { Name = "arcgisserver-${local.arcgisVersionName}-distribution" }, local.shared_tags)
}
distribution {
region = "us-east-1"
ami_distribution_configuration {
name = "arcgisserver-${local.arcgisVersionName}-{{ imagebuilder:buildDate }}"
target_account_ids = ["226711853580"]
ami_tags = merge(data.aws_default_tags.default.tags, { Name = "arcgisserver-${local.arcgisVersionName}-distribution" }, local.shared_tags)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"arcgis": {
"version": "11.1",
"version": "11.3",
"run_as_user": "arcgis",
"run_as_password": "p@@ssw0rd!123",
"configure_windows_firewall": true,
Expand All @@ -16,7 +16,7 @@
},
"web_adaptor": {
"install_system_requirements": true,
"dotnet_setup_path": "C:\\software\\dotnet-hosting-6.0.9-win.exe",
"dotnet_setup_path": "C:\\software\\dotnet-hosting-8.0.8-win.exe",
"web_deploy_setup_path": "C:\\software\\WebDeploy_amd64_en-US.msi",
"admin_access": true,
"reindex_portal_content": false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"arcgis": {
"version": "11.1",
"version": "11.3",
"run_as_user": "arcgis",
"run_as_password": "p@@ssw0rd!123",
"configure_windows_firewall": true,
"repository": {
"local_archives": "C:\\software",
"archives": "C:\\software",
"archives": "C:\\software",
"setups": "C:\\software"
},
"server": {
Expand All @@ -16,7 +16,7 @@
},
"web_adaptor": {
"install_system_requirements": true,
"dotnet_setup_path": "C:\\software\\dotnet-hosting-6.0.9-win.exe",
"dotnet_setup_path": "C:\\software\\dotnet-hosting-8.0.8-win.exe",
"web_deploy_setup_path": "C:\\software\\WebDeploy_amd64_en-US.msi",
"admin_access": true,
"reindex_portal_content": false
Expand Down
Loading
Loading