automated commit

Signed-off-by: Public copy <41898282+github-actions[bot]@users.noreply.github.com>
chainguard-images · Nov 11, 2024 · 2b450df · 2b450df
1 parent 2587c4e
commit 2b450df
Show file tree

Hide file tree

Showing 14 changed files with 39 additions and 33 deletions.
diff --git a/images/datadog-agent/config/agent/main.tf b/images/datadog-agent/config/agent/main.tf
@@ -32,7 +32,7 @@ output "config" {
       "CURL_CA_BUNDLE" : "/opt/datadog-agent/embedded/ssl/certs/cacert.pem",
       "DD_SECRET_BACKEND_COMMAND_ALLOW_GROUP_EXEC_PERM" : "true",
       "PATH" : "/opt/datadog-agent/bin/agent/:/opt/datadog-agent/embedded/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-11-openjdk/bin",
-      "PYTHONPATH" : "/usr/share/datadog-agent/lib/python3.11/site-packages",
+      "PYTHONPATH" : "/opt/datadog-agent/embedded/lib/python3.11/site-packages",
       "S6-LOGGING" : "0",
       "S6_BEHAVIOR_IF_STAGE2_FAILS" : "2",
       "S6_KEEP_ENV" : "1",

diff --git a/images/doppler-kubernetes-operator/README.md b/images/doppler-kubernetes-operator/README.md
@@ -1,19 +1,19 @@
 <!--monopod:start-->
-# images/doppler-kubernetes-operator
+# doppler-kubernetes-operator
 | | |
 | - | - |
-| **OCI Reference** | `cgr.dev/chainguard/images/doppler-kubernetes-operator` |
+| **OCI Reference** | `cgr.dev/chainguard/doppler-kubernetes-operator` |
 
 
-* [View Image in the Chainguard Images Directory](https://images.chainguard.dev/directory/image/images/doppler-kubernetes-operator/overview).
+* [View Image in the Chainguard Images Directory](https://images.chainguard.dev/directory/image/doppler-kubernetes-operator/overview).
 * [View the Image Catalog](https://console.chainguard.dev/images/catalog) for a full list of available tags.
 * [Contact Chainguard](https://www.chainguard.dev/chainguard-images) for enterprise support, SLAs, and access to older tags.
 
 ---
 <!--monopod:end-->
 
 <!--overview:start-->
-# Chainguard Image for images/doppler-kubernetes-operator
+# Chainguard Image for doppler-kubernetes-operator
 
 Automatically sync secrets from Doppler to Kubernetes and auto-reload deployments when secrets change.
 
@@ -25,7 +25,7 @@ Chainguard Images are regularly-updated, minimal container images with low-to-ze
 This image is available on `cgr.dev`:
 
 ```
-docker pull cgr.dev/ORGANIZATION/images/doppler-kubernetes-operator:latest
+docker pull cgr.dev/ORGANIZATION/doppler-kubernetes-operator:latest
 ```
 
 Be sure to replace the `ORGANIZATION` placeholder with the name used for your organization's private repository within the Chainguard registry.

diff --git a/images/doppler-kubernetes-operator/metadata.yaml b/images/doppler-kubernetes-operator/metadata.yaml
@@ -1,4 +1,4 @@
-name: images/doppler-kubernetes-operator
+name: doppler-kubernetes-operator
 image: cgr.dev/chainguard/images/doppler-kubernetes-operator
 logo: https://storage.googleapis.com/chainguard-academy/logos/images/doppler-kubernetes-operator.svg
 endoflife: ""

diff --git a/images/gitlab-exporter/README.md b/images/gitlab-exporter/README.md
@@ -1,19 +1,19 @@
 <!--monopod:start-->
-# gitalb-exporter
+# gitlab-exporter
 | | |
 | - | - |
-| **OCI Reference** | `cgr.dev/chainguard/gitalb-exporter` |
+| **OCI Reference** | `cgr.dev/chainguard/gitlab-exporter` |
 
 
-* [View Image in the Chainguard Images Directory](https://images.chainguard.dev/directory/image/gitalb-exporter/overview).
+* [View Image in the Chainguard Images Directory](https://images.chainguard.dev/directory/image/gitlab-exporter/overview).
 * [View the Image Catalog](https://console.chainguard.dev/images/catalog) for a full list of available tags.
 * [Contact Chainguard](https://www.chainguard.dev/chainguard-images) for enterprise support, SLAs, and access to older tags.
 
 ---
 <!--monopod:end-->
 
 <!--overview:start-->
-# Chainguard Image for gitalb-exporter
+# Chainguard Image for gitlab-exporter
 
 Measure various GitLab metrics pulled from Redis and the database in Linux package instances.
 
@@ -25,7 +25,7 @@ Chainguard Images are regularly-updated, minimal container images with low-to-ze
 This image is available on `cgr.dev`:
 
 ```
-docker pull cgr.dev/ORGANIZATION/gitalb-exporter:latest
+docker pull cgr.dev/ORGANIZATION/gitlab-exporter:latest
 ```
 
 Be sure to replace the `ORGANIZATION` placeholder with the name used for your organization's private repository within the Chainguard registry.

diff --git a/images/gitlab-exporter/metadata.yaml b/images/gitlab-exporter/metadata.yaml
@@ -1,4 +1,4 @@
-name: gitalb-exporter
+name: gitlab-exporter
 image: cgr.dev/chainguard-private/gitlab-exporter
 logo: https://storage.googleapis.com/chainguard-academy/logos/gitlab.svg
 endoflife: ""

diff --git a/images/gitlab-pages/README.md b/images/gitlab-pages/README.md
@@ -1,19 +1,19 @@
 <!--monopod:start-->
-# gitalb-pages
+# gitlab-pages
 | | |
 | - | - |
-| **OCI Reference** | `cgr.dev/chainguard/gitalb-pages` |
+| **OCI Reference** | `cgr.dev/chainguard/gitlab-pages` |
 
 
-* [View Image in the Chainguard Images Directory](https://images.chainguard.dev/directory/image/gitalb-pages/overview).
+* [View Image in the Chainguard Images Directory](https://images.chainguard.dev/directory/image/gitlab-pages/overview).
 * [View the Image Catalog](https://console.chainguard.dev/images/catalog) for a full list of available tags.
 * [Contact Chainguard](https://www.chainguard.dev/chainguard-images) for enterprise support, SLAs, and access to older tags.
 
 ---
 <!--monopod:end-->
 
 <!--overview:start-->
-# Chainguard Image for gitalb-pages
+# Chainguard Image for gitlab-pages
 
 Publish static websites directly from a repository in GitLab.
 
@@ -25,7 +25,7 @@ Chainguard Images are regularly-updated, minimal container images with low-to-ze
 This image is available on `cgr.dev`:
 
 ```
-docker pull cgr.dev/ORGANIZATION/gitalb-pages:latest
+docker pull cgr.dev/ORGANIZATION/gitlab-pages:latest
 ```
 
 Be sure to replace the `ORGANIZATION` placeholder with the name used for your organization's private repository within the Chainguard registry.

diff --git a/images/gitlab-pages/metadata.yaml b/images/gitlab-pages/metadata.yaml
@@ -1,4 +1,4 @@
-name: gitalb-pages
+name: gitlab-pages
 image: cgr.dev/chainguard-private/gitlab-pages
 logo: https://storage.googleapis.com/chainguard-academy/logos/gitlab.svg
 endoflife: ""

diff --git a/images/gitlab-shell/README.md b/images/gitlab-shell/README.md
@@ -105,4 +105,4 @@ That being said, it’s worth noting that `-dev` variants of Chainguard Images a
 
 ## Learn More
 
-To better understand how to work with Chainguard Images, we encourage you to visit [Chainguard Academy](https://edu.chainguard.dev/), our documentation and education platform.
+To better understand how to work with Chainguard Images, we encourage you to visit [Chainguard Academy](https://edu.chainguard.dev/), our documentation and education platform.
diff --git a/images/istio/tests/main.tf b/images/istio/tests/main.tf
@@ -17,6 +17,11 @@ variable "digests" {
   })
 }
 
+variable "warn_on_failure" {
+  description = "Whether to fail or warn if the test fails. Used only for EOL images."
+  default     = false
+}
+
 variable "k3s_harness_image" {
   description = "The image to use for the k3s harness."
   # null specifically so it picks the provider default
@@ -180,9 +185,10 @@ module "helm_install-cni" {
 }
 
 resource "imagetest_feature" "this" {
-  harness     = module.cluster_harness.harness
-  name        = "istio"
-  description = "Test istio functionality of the various istio helm charts."
+  harness         = module.cluster_harness.harness
+  name            = "istio"
+  description     = "Test istio functionality of the various istio helm charts."
+  warn_on_failure = var.warn_on_failure
 
   steps = [
     {

diff --git a/images/node-feature-discovery/README.md b/images/node-feature-discovery/README.md
@@ -1,19 +1,19 @@
 <!--monopod:start-->
-# node-feature-directory
+# node-feature-discovery
 | | |
 | - | - |
-| **OCI Reference** | `cgr.dev/chainguard/node-feature-directory` |
+| **OCI Reference** | `cgr.dev/chainguard/node-feature-discovery` |
 
 
-* [View Image in the Chainguard Images Directory](https://images.chainguard.dev/directory/image/node-feature-directory/overview).
+* [View Image in the Chainguard Images Directory](https://images.chainguard.dev/directory/image/node-feature-discovery/overview).
 * [View the Image Catalog](https://console.chainguard.dev/images/catalog) for a full list of available tags.
 * [Contact Chainguard](https://www.chainguard.dev/chainguard-images) for enterprise support, SLAs, and access to older tags.
 
 ---
 <!--monopod:end-->
 
 <!--overview:start-->
-# Chainguard Image for node-feature-directory
+# Chainguard Image for node-feature-discovery
 
 A minimal wolfi-based image for node-feature-discovery, Node feature discovery for Kubernetes
 
@@ -25,7 +25,7 @@ Chainguard Images are regularly-updated, minimal container images with low-to-ze
 This image is available on `cgr.dev`:
 
 ```
-docker pull cgr.dev/ORGANIZATION/node-feature-directory:latest
+docker pull cgr.dev/ORGANIZATION/node-feature-discovery:latest
 ```
 
 Be sure to replace the `ORGANIZATION` placeholder with the name used for your organization's private repository within the Chainguard registry.

diff --git a/images/node-feature-discovery/metadata.yaml b/images/node-feature-discovery/metadata.yaml
@@ -1,5 +1,5 @@
-name: node-feature-directory
-image: cgr.dev/chainguard/node-feature-directory
+name: node-feature-discovery
+image: cgr.dev/chainguard/node-feature-discovery
 logo: https://storage.googleapis.com/chainguard-academy/logos/node-feature-discovery.svg
 endoflife: ""
 console_summary: ""

diff --git a/images/prometheus/main.tf b/images/prometheus/main.tf
@@ -18,7 +18,7 @@ module "latest" {
 
 module "test-latest" {
   source            = "./tests"
-  digest            = { for k, v in module.latest : k => v.image_ref }
+  digest            = module.latest.image_ref
   target_repository = var.target_repository
 }
 

diff --git a/images/rust/README.md b/images/rust/README.md
@@ -153,4 +153,4 @@ That being said, it’s worth noting that `-dev` variants of Chainguard Images a
 
 ## Learn More
 
-To better understand how to work with Chainguard Images, we encourage you to visit [Chainguard Academy](https://edu.chainguard.dev/), our documentation and education platform.
+To better understand how to work with Chainguard Images, we encourage you to visit [Chainguard Academy](https://edu.chainguard.dev/), our documentation and education platform.
diff --git a/images/tomcat/config/main.tf b/images/tomcat/config/main.tf
@@ -13,7 +13,7 @@ terraform {
 }
 
 variable "extra_packages" {
-  default     = ["tomcat-10.1-openjdk-17"]
+  default     = ["tomcat-11.0-openjdk-17"]
   description = "The additional packages to install (e.g. tomcat-10)."
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -105,4 +105,4 @@ That being said, it’s worth noting that `-dev` variants of Chainguard Images a

		## Learn More

		To better understand how to work with Chainguard Images, we encourage you to visit [Chainguard Academy](https://edu.chainguard.dev/), our documentation and education platform.
		To better understand how to work with Chainguard Images, we encourage you to visit [Chainguard Academy](https://edu.chainguard.dev/), our documentation and education platform.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -153,4 +153,4 @@ That being said, it’s worth noting that `-dev` variants of Chainguard Images a

		## Learn More

		To better understand how to work with Chainguard Images, we encourage you to visit [Chainguard Academy](https://edu.chainguard.dev/), our documentation and education platform.
		To better understand how to work with Chainguard Images, we encourage you to visit [Chainguard Academy](https://edu.chainguard.dev/), our documentation and education platform.