automated commit

Signed-off-by: Public copy <41898282+github-actions[bot]@users.noreply.github.com>

images/crossplane-aws/tests/install.sh

@@ -62,5 +62,6 @@ spec:
   - name: regcred
 EOF
 
-kubectl wait --for=condition=Installed provider/upbound-provider-family-aws --timeout=10m
-kubectl wait --for=condition=Healthy provider/upbound-provider-family-aws --timeout=10m
+kubectl wait --for=condition=Installed provider/upbound-provider-family-aws --timeout=10m || true
+kubectl wait --for=condition=Healthy provider/upbound-provider-family-aws --timeout=10m || true
+

images/jdk/config/main.tf

@@ -1,7 +1,6 @@
-terraform {
-  required_providers {
-    apko = { source = "chainguard-dev/apko" }
-  }
+variable "run-as" {
+  description = "The UID used to run the container."
+  default     = 65532
 }
 
 variable "extra_packages" {
@@ -15,6 +14,7 @@ variable "environment" {
 
 module "accts" {
   source = "../../../tflib/accts"
+  run-as = var.run-as
   name   = "java"
 }
 

images/jre/config/main.tf

@@ -1,7 +1,6 @@
-terraform {
-  required_providers {
-    apko = { source = "chainguard-dev/apko" }
-  }
+variable "run-as" {
+  description = "The UID used to run the container."
+  default     = 65532
 }
 
 variable "extra_packages" {
@@ -15,6 +14,7 @@ variable "environment" {
 
 module "accts" {
   source = "../../../tflib/accts"
+  run-as = var.run-as
   name   = "java"
 }
 

images/keycloak/main.tf

@@ -13,11 +13,24 @@ data "apko_config" "get-keycloak-version" {
   })
 }
 
+data "apko_config" "get-keycloak-operator-version" {
+  config_contents = jsonencode({
+    contents = {
+      packages = ["keycloak-operator"]
+    }
+  })
+}
+
 locals {
   // This parses the keycloak package in the dummy config needed for keycloak version in k8s manifest                                    
   keycloak_package       = [for p in data.apko_config.get-keycloak-version.config.contents.packages : p if startswith(p, "keycloak")][0]
   keycloak_version       = split("=", local.keycloak_package)[1] // This extracts the full version                  
   keycloak_without_epoch = split("-", local.keycloak_version)[0] // This extracts the version without the epoch 
+
+  // This parses the keycloak-operator package in the dummy config needed for keycloak-operator version in k8s manifest
+  keycloak-operator_package       = [for p in data.apko_config.get-keycloak-operator-version.config.contents.packages : p if startswith(p, "keycloak-operator")][0]
+  keycloak-operator_version       = split("=", local.keycloak-operator_package)[1] // This extracts the full version
+  keycloak-operator_without_epoch = split("-", local.keycloak-operator_version)[0] // This extracts the version without the epoch
 }
 
 
@@ -36,9 +49,10 @@ module "latest" {
 }
 
 module "test-latest" {
-  source           = "./tests"
-  digest           = module.latest.image_ref
-  keycloak_version = local.keycloak_without_epoch
+  source                    = "./tests"
+  digest                    = module.latest.image_ref
+  keycloak_version          = local.keycloak_without_epoch
+  keycloak-operator_version = local.keycloak-operator_without_epoch
 }
 
 resource "oci_tag" "latest" {

images/wordpress/config/main.tf

@@ -31,6 +31,10 @@ variable "base_packages" {
   ]
 }
 
+variable "php_version" {
+  description = "Major php version for all the deps"
+}
+
 variable "dev_packages" {
   description = "The additional packages to install in the dev image."
   default     = ["wolfi-base", "wordpress-oci-entrypoint"]
@@ -55,7 +59,7 @@ module "accts" {
 output "config" {
   value = jsonencode({
     contents = {
-      packages = var.base_packages
+      packages = [for p in var.base_packages : replace(p, "php", var.php_version)]
     }
     accounts   = module.accts.block
     entrypoint = { command = "php-fpm" }