Skip to content

Fixes #498 - Cleanup various bits #499

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

Merged
merged 1 commit into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 9 additions & 16 deletions WORKFLOWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
| | Create an Azure Key Vault | [![README.md](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/keyvault_create_README_md.yml/badge.svg)](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/keyvault_create_README_md.yml) | 0 8 * * 2 |
| | Add a Secret to Azure Key Vault | [![README.md](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/keyvault_add-secret_README_md.yml/badge.svg)](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/keyvault_add-secret_README_md.yml) | 0 9 * * 2 |
| Azure Functions examples | Deploy a Hello World Function | [![functionapp/helloworld/README.md](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/functionapp_helloworld_README_md.yml/badge.svg)](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/functionapp_helloworld_README_md.yml) | 0 12 * * 2 |
| | Deploy a Cosmos DB output Function | [![functionapp/cosmosdb-output/README.md](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/functionapp_cosmosdb-output_README_md.yml/badge.svg)](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/functionapp_cosmosdb-output_README_md.yml) | 0 13 * * 2 |
| Azure EventHubs examples | Send an event | [![eventhubs/send-event/README.md](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/eventhubs_send-event_README_md.yml/badge.svg)](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/eventhubs_send-event_README_md.yml) | 0 14 * * 2 |
| | Receive an event | [![eventhubs/receive-event/README.md](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/eventhubs_receive-event_README_md.yml/badge.svg)](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/eventhubs_receive-event_README_md.yml) | 0 15 * * 2 |
| | Create an Azure Event Hubs namespace | [![eventhubs/create-namespace/README.md](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/eventhubs_create-namespace_README_md.yml/badge.svg)](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/eventhubs_create-namespace_README_md.yml) | 0 16 * * 2 |
Expand Down Expand Up @@ -114,27 +113,21 @@
| | Add a route | [![afd/add-route/README.md](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/afd_add-route_README_md.yml/badge.svg)](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/afd_add-route_README_md.yml) | 0 2 * * 5 |
| | Add origins to origin group | [![afd/add-origins-to-origin-group/README.md](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/afd_add-origins-to-origin-group_README_md.yml/badge.svg)](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/afd_add-origins-to-origin-group_README_md.yml) | 0 3 * * 5 |
| | Push a Hello World job image to your ACR | [![acr/helloworldjob/README.md](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/acr_helloworldjob_README_md.yml/badge.svg)](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/acr_helloworldjob_README_md.yml) | 0 12 * * 5 |
| | Push a Helidon image to your ACR | [![acr/helidon/README.md](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/acr_helidon_README_md.yml/badge.svg)](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/acr_helidon_README_md.yml) | 0 13 * * 5 |
| | Push a GraalVM image to your ACR | [![acr/graalvm/README.md](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/acr_graalvm_README_md.yml/badge.svg)](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/acr_graalvm_README_md.yml) | 0 14 * * 5 |
| | Create settings.xml using admin keys | [![acr/create-settings-xml/README.md](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/acr_create-settings-xml_README_md.yml/badge.svg)](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/acr_create-settings-xml_README_md.yml) | 0 17 * * 5 |
| | Create a Service Principal | [![acr/create-acrpull-service-principal/README.md](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/acr_create-acrpull-service-principal_README_md.yml/badge.svg)](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/acr_create-acrpull-service-principal_README_md.yml) | 0 18 * * 5 |

-->

# Azure Kubernetes Service examples

| Example | Workflow Status | Workflow Schedule |
| ----------- | --------------- | ----------------- |
| Azure Container Registry examples
| [Create and push a GraalVM application to Azure Container Registry](acr/graalvm/README.md) | [![acr/graalvm/README.md](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/acr_graalvm_README_md.yml/badge.svg)](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/acr_graalvm_README_md.yml) | 0 5 * * 0 |
| [Create and push a Helidon application to Azure Container Registry](acr/helidon/README.md) | [![acr/helidon/README.md](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/acr_helidon_README_md.yml/badge.svg)](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/acr_helidon_README_md.yml) | 0 6 * * 0 |
| Azure Kubernetes Service examples
| [Create a Kubernetes cluster](aks/create/README.md)| [![aks/create/README.md](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/aks_create_README_md.yml/badge.svg)](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/aks_create_README_md.yml) | 0 0 * * 2 |

# Azure Container Apps examples

| Example | Workflow Status | Workflow Schedule |
| ----------- | --------------- | ----------------- |
| [Deploy a Spring Boot application to Azure Container Apps](containerapp/springboot/README.md) | [![containerapp/springboot/README.md](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/containerapp_springboot_README_md.yml/badge.svg)](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/containerapp_springboot_README_md.yml) | 0 1 * * 1 |

# Azure SQL Database examples

| Example | Workflow Status | Workflow Schedule |
| ----------- | --------------- | ----------------- |
| Azure Container Apps examples
| [Deploy a Spring Boot application](containerapp/springboot/README.md) | [![containerapp/springboot/README.md](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/containerapp_springboot_README_md.yml/badge.svg)](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/containerapp_springboot_README_md.yml) | 0 1 * * 1 |
| Azure Functions examples
| [Deploy a Cosmos DB output Function](functionapp/cosmosdb-output/README.md) | [![functionapp/cosmosdb-output/README.md](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/functionapp_cosmosdb-output_README_md.yml/badge.svg)](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/functionapp_cosmosdb-output_README_md.yml) | 0 1 * * 4 |
| Azure SQL Database examples
| [Create an Azure SQL database](sql/create/README.md) | [![sql/create/README.md](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/sql_create_README_md.yml/badge.svg)](https://github.com/Azure-Samples/java-on-azure-examples/actions/workflows/sql_create_README_md.yml) | 0 0 * * 1 |
2 changes: 1 addition & 1 deletion acr/create/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
fi

-->
<!-- workflow.cron(0 0 * * 4) -->
<!-- workflow.cron(0 0 * * 0) -->
<!-- workflow.include(../../group/create/README.md) -->

This example assumes you have previously completed the following example:
Expand Down
2 changes: 1 addition & 1 deletion acr/graalvm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ This example assumes you have previously completed the following examples:
fi

-->
<!-- workflow.cron(0 14 * * 5) -->
<!-- workflow.cron(0 5 * * 0) -->
<!-- workflow.include(../create/README.md) -->

## Build the example
Expand Down
13 changes: 13 additions & 0 deletions acr/graalvm/main.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
resource "null_resource" "acr_build" {
provisioner "local-exec" {
command = <<EOT
az acr build --registry ${azurerm_container_registry.joazcr.name} --resource-group ${azurerm_resource_group.joazrg.name} --image ${var.acr_graalvm_image} .
EOT
}
depends_on = [azurerm_container_registry.example]
}

resource "local_file" "acr_graalvm_build_output" {
content = file("acr_graalvm_build_output.txt")
filename = "${path.module}/acr_graalvm_build_output.txt"
}
9 changes: 9 additions & 0 deletions acr/graalvm/outputs.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
output "acr_graalvm_image" {
description = "The name of the GraalVM image"
value = var.acr_graalvm_image
}

output "acr_graalvm_build_output" {
description = "The output of the ACR build"
value = local_file.acr_graalvm_build_output.filename
}
5 changes: 5 additions & 0 deletions acr/graalvm/variables.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
variable "acr_graalvm_image" {
description = "The name of the GraalVM image"
type = string
default = "graalvm:latest"
}
2 changes: 1 addition & 1 deletion acr/helidon/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
fi

-->
<!-- workflow.cron(0 13 * * 5) -->
<!-- workflow.cron(0 6 * * 0) -->
<!-- workflow.include(../create/README.md) -->

This example assumes you have previously completed the following examples:
Expand Down
13 changes: 13 additions & 0 deletions acr/helidon/main.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
resource "null_resource" "acr_build" {
provisioner "local-exec" {
command = <<EOT
az acr build --registry ${azurerm_container_registry.joazcr.name} --resource-group ${azurerm_resource_group.joazrg.name} --image ${var.acr_helidon_image} .
EOT
}
depends_on = [azurerm_container_registry.example]
}

resource "local_file" "acr_helidon_build_output" {
content = file("acr_helidon_build_output.txt")
filename = "${path.module}/acr_helidon_build_output.txt"
}
9 changes: 9 additions & 0 deletions acr/helidon/outputs.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
output "acr_helidon_image" {
description = "The name of the Helidon image"
value = var.acr_helidon_image
}

output "acr_helidon_build_output" {
description = "The output of the ACR build"
value = local_file.acr_helidon_build_output.filename
}
5 changes: 5 additions & 0 deletions acr/helidon/variables.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
variable "acr_helidon_image" {
description = "The name of the Helidon image"
type = string
default = "helidon:latest"
}
4 changes: 2 additions & 2 deletions functionapp/cosmosdb-output/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
<!-- workflow.run()

if [[ -z $REGION ]]; then
export REGION=eastus
export REGION=westus
fi

-->
<!-- workflow.cron(0 13 * * 2) -->
<!-- workflow.cron(0 1 * * 4) -->
<!-- workflow.include(../install-tools/README.md) -->
<!-- workflow.include(../../cosmosdb/create/README.md) -->

Expand Down
Loading