From adce4e24c480d6780f4a731d5fdd3986e3d4afb2 Mon Sep 17 00:00:00 2001 From: michaelkedar Date: Mon, 13 Jul 2026 07:00:17 +0000 Subject: [PATCH] can we fix it? --- .../gke-workers/base/{ => core}/exporter.yaml | 0 .../gke-workers/base/{ => core}/gitter.yaml | 0 .../base/{ => core}/importer-deleter.yaml | 0 .../base/{ => core}/importer-reconciler.yaml | 0 .../gke-workers/base/{ => core}/importer.yaml | 0 .../gke-workers/base/core/kustomization.yaml | 10 +++++ .../base/{ => core}/record-checker.yaml | 0 .../base/{ => core}/recoverer.yaml | 0 .../gke-workers/base/{ => core}/scaler.yaml | 0 .../gke-workers/base/{ => core}/workers.yaml | 0 .../gke-workers/base/{ => extra}/backup.yaml | 0 .../base/{ => extra}/custommetrics.yaml | 0 .../base/{ => extra}/generate-sitemap.yaml | 0 .../gke-workers/base/extra/kustomization.yaml | 8 ++++ .../base/{ => extra}/relations.yaml | 0 .../base/{ => extra}/vanir-signatures.yaml | 0 .../base/{ => extra}/workers-cves.yaml | 0 .../base/{ => extra}/workers-reimport.yaml | 0 .../base/{ => feeds}/alpine-cve-convert.yaml | 0 .../base/{ => feeds}/combine-to-osv.yaml | 0 .../base/{ => feeds}/cpe-repo-gen.yaml | 0 .../base/{ => feeds}/cve5-to-osv.yaml | 0 .../base/{ => feeds}/debian-convert.yaml | 0 .../{ => feeds}/debian-copyright-mirror.yaml | 0 .../base/{ => feeds}/debian-cve-convert.yaml | 0 .../{ => feeds}/debian-first-version.yaml | 0 .../gke-workers/base/feeds/kustomization.yaml | 11 ++++++ .../base/{ => feeds}/nvd-cve-osv.yaml | 0 .../base/{ => feeds}/nvd-mirror.yaml | 0 .../{ => ksm}/ksm_cluster_pod_monitoring.yaml | 0 .../base/{ => ksm}/ksm_cluster_role.yaml | 0 .../{ => ksm}/ksm_cluster_role_binding.yaml | 0 .../ksm_horizontal_pod_autoscaler.yaml | 0 .../base/{ => ksm}/ksm_pod_monitoring.yaml | 0 .../base/{ => ksm}/ksm_service.yaml | 0 .../base/{ => ksm}/ksm_service_account.yaml | 0 .../base/{ => ksm}/ksm_stateful_set.yaml | 0 .../gke-workers/base/ksm/kustomization.yaml | 9 +++++ .../gke-workers/base/kustomization.yaml | 39 ++----------------- .../environments/private/kustomization.yaml | 12 +----- .../environments/oss-vdb-test/main.tf | 2 +- .../terraform/environments/oss-vdb/main.tf | 2 +- docs/data.md | 2 +- vulnfeeds/cmd/combine-to-osv/README.md | 2 +- 44 files changed, 48 insertions(+), 49 deletions(-) rename deployment/clouddeploy/gke-workers/base/{ => core}/exporter.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => core}/gitter.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => core}/importer-deleter.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => core}/importer-reconciler.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => core}/importer.yaml (100%) create mode 100644 deployment/clouddeploy/gke-workers/base/core/kustomization.yaml rename deployment/clouddeploy/gke-workers/base/{ => core}/record-checker.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => core}/recoverer.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => core}/scaler.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => core}/workers.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => extra}/backup.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => extra}/custommetrics.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => extra}/generate-sitemap.yaml (100%) create mode 100644 deployment/clouddeploy/gke-workers/base/extra/kustomization.yaml rename deployment/clouddeploy/gke-workers/base/{ => extra}/relations.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => extra}/vanir-signatures.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => extra}/workers-cves.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => extra}/workers-reimport.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => feeds}/alpine-cve-convert.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => feeds}/combine-to-osv.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => feeds}/cpe-repo-gen.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => feeds}/cve5-to-osv.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => feeds}/debian-convert.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => feeds}/debian-copyright-mirror.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => feeds}/debian-cve-convert.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => feeds}/debian-first-version.yaml (100%) create mode 100644 deployment/clouddeploy/gke-workers/base/feeds/kustomization.yaml rename deployment/clouddeploy/gke-workers/base/{ => feeds}/nvd-cve-osv.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => feeds}/nvd-mirror.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => ksm}/ksm_cluster_pod_monitoring.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => ksm}/ksm_cluster_role.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => ksm}/ksm_cluster_role_binding.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => ksm}/ksm_horizontal_pod_autoscaler.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => ksm}/ksm_pod_monitoring.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => ksm}/ksm_service.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => ksm}/ksm_service_account.yaml (100%) rename deployment/clouddeploy/gke-workers/base/{ => ksm}/ksm_stateful_set.yaml (100%) create mode 100644 deployment/clouddeploy/gke-workers/base/ksm/kustomization.yaml diff --git a/deployment/clouddeploy/gke-workers/base/exporter.yaml b/deployment/clouddeploy/gke-workers/base/core/exporter.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/exporter.yaml rename to deployment/clouddeploy/gke-workers/base/core/exporter.yaml diff --git a/deployment/clouddeploy/gke-workers/base/gitter.yaml b/deployment/clouddeploy/gke-workers/base/core/gitter.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/gitter.yaml rename to deployment/clouddeploy/gke-workers/base/core/gitter.yaml diff --git a/deployment/clouddeploy/gke-workers/base/importer-deleter.yaml b/deployment/clouddeploy/gke-workers/base/core/importer-deleter.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/importer-deleter.yaml rename to deployment/clouddeploy/gke-workers/base/core/importer-deleter.yaml diff --git a/deployment/clouddeploy/gke-workers/base/importer-reconciler.yaml b/deployment/clouddeploy/gke-workers/base/core/importer-reconciler.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/importer-reconciler.yaml rename to deployment/clouddeploy/gke-workers/base/core/importer-reconciler.yaml diff --git a/deployment/clouddeploy/gke-workers/base/importer.yaml b/deployment/clouddeploy/gke-workers/base/core/importer.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/importer.yaml rename to deployment/clouddeploy/gke-workers/base/core/importer.yaml diff --git a/deployment/clouddeploy/gke-workers/base/core/kustomization.yaml b/deployment/clouddeploy/gke-workers/base/core/kustomization.yaml new file mode 100644 index 00000000000..34d762fe095 --- /dev/null +++ b/deployment/clouddeploy/gke-workers/base/core/kustomization.yaml @@ -0,0 +1,10 @@ +resources: +- exporter.yaml +- gitter.yaml +- importer.yaml +- importer-deleter.yaml +- importer-reconciler.yaml +- record-checker.yaml +- recoverer.yaml +- scaler.yaml +- workers.yaml diff --git a/deployment/clouddeploy/gke-workers/base/record-checker.yaml b/deployment/clouddeploy/gke-workers/base/core/record-checker.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/record-checker.yaml rename to deployment/clouddeploy/gke-workers/base/core/record-checker.yaml diff --git a/deployment/clouddeploy/gke-workers/base/recoverer.yaml b/deployment/clouddeploy/gke-workers/base/core/recoverer.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/recoverer.yaml rename to deployment/clouddeploy/gke-workers/base/core/recoverer.yaml diff --git a/deployment/clouddeploy/gke-workers/base/scaler.yaml b/deployment/clouddeploy/gke-workers/base/core/scaler.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/scaler.yaml rename to deployment/clouddeploy/gke-workers/base/core/scaler.yaml diff --git a/deployment/clouddeploy/gke-workers/base/workers.yaml b/deployment/clouddeploy/gke-workers/base/core/workers.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/workers.yaml rename to deployment/clouddeploy/gke-workers/base/core/workers.yaml diff --git a/deployment/clouddeploy/gke-workers/base/backup.yaml b/deployment/clouddeploy/gke-workers/base/extra/backup.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/backup.yaml rename to deployment/clouddeploy/gke-workers/base/extra/backup.yaml diff --git a/deployment/clouddeploy/gke-workers/base/custommetrics.yaml b/deployment/clouddeploy/gke-workers/base/extra/custommetrics.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/custommetrics.yaml rename to deployment/clouddeploy/gke-workers/base/extra/custommetrics.yaml diff --git a/deployment/clouddeploy/gke-workers/base/generate-sitemap.yaml b/deployment/clouddeploy/gke-workers/base/extra/generate-sitemap.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/generate-sitemap.yaml rename to deployment/clouddeploy/gke-workers/base/extra/generate-sitemap.yaml diff --git a/deployment/clouddeploy/gke-workers/base/extra/kustomization.yaml b/deployment/clouddeploy/gke-workers/base/extra/kustomization.yaml new file mode 100644 index 00000000000..0c7ed6c7a58 --- /dev/null +++ b/deployment/clouddeploy/gke-workers/base/extra/kustomization.yaml @@ -0,0 +1,8 @@ +resources: +- backup.yaml +- custommetrics.yaml +- generate-sitemap.yaml +- relations.yaml +- vanir-signatures.yaml +- workers-cves.yaml +- workers-reimport.yaml diff --git a/deployment/clouddeploy/gke-workers/base/relations.yaml b/deployment/clouddeploy/gke-workers/base/extra/relations.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/relations.yaml rename to deployment/clouddeploy/gke-workers/base/extra/relations.yaml diff --git a/deployment/clouddeploy/gke-workers/base/vanir-signatures.yaml b/deployment/clouddeploy/gke-workers/base/extra/vanir-signatures.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/vanir-signatures.yaml rename to deployment/clouddeploy/gke-workers/base/extra/vanir-signatures.yaml diff --git a/deployment/clouddeploy/gke-workers/base/workers-cves.yaml b/deployment/clouddeploy/gke-workers/base/extra/workers-cves.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/workers-cves.yaml rename to deployment/clouddeploy/gke-workers/base/extra/workers-cves.yaml diff --git a/deployment/clouddeploy/gke-workers/base/workers-reimport.yaml b/deployment/clouddeploy/gke-workers/base/extra/workers-reimport.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/workers-reimport.yaml rename to deployment/clouddeploy/gke-workers/base/extra/workers-reimport.yaml diff --git a/deployment/clouddeploy/gke-workers/base/alpine-cve-convert.yaml b/deployment/clouddeploy/gke-workers/base/feeds/alpine-cve-convert.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/alpine-cve-convert.yaml rename to deployment/clouddeploy/gke-workers/base/feeds/alpine-cve-convert.yaml diff --git a/deployment/clouddeploy/gke-workers/base/combine-to-osv.yaml b/deployment/clouddeploy/gke-workers/base/feeds/combine-to-osv.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/combine-to-osv.yaml rename to deployment/clouddeploy/gke-workers/base/feeds/combine-to-osv.yaml diff --git a/deployment/clouddeploy/gke-workers/base/cpe-repo-gen.yaml b/deployment/clouddeploy/gke-workers/base/feeds/cpe-repo-gen.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/cpe-repo-gen.yaml rename to deployment/clouddeploy/gke-workers/base/feeds/cpe-repo-gen.yaml diff --git a/deployment/clouddeploy/gke-workers/base/cve5-to-osv.yaml b/deployment/clouddeploy/gke-workers/base/feeds/cve5-to-osv.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/cve5-to-osv.yaml rename to deployment/clouddeploy/gke-workers/base/feeds/cve5-to-osv.yaml diff --git a/deployment/clouddeploy/gke-workers/base/debian-convert.yaml b/deployment/clouddeploy/gke-workers/base/feeds/debian-convert.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/debian-convert.yaml rename to deployment/clouddeploy/gke-workers/base/feeds/debian-convert.yaml diff --git a/deployment/clouddeploy/gke-workers/base/debian-copyright-mirror.yaml b/deployment/clouddeploy/gke-workers/base/feeds/debian-copyright-mirror.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/debian-copyright-mirror.yaml rename to deployment/clouddeploy/gke-workers/base/feeds/debian-copyright-mirror.yaml diff --git a/deployment/clouddeploy/gke-workers/base/debian-cve-convert.yaml b/deployment/clouddeploy/gke-workers/base/feeds/debian-cve-convert.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/debian-cve-convert.yaml rename to deployment/clouddeploy/gke-workers/base/feeds/debian-cve-convert.yaml diff --git a/deployment/clouddeploy/gke-workers/base/debian-first-version.yaml b/deployment/clouddeploy/gke-workers/base/feeds/debian-first-version.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/debian-first-version.yaml rename to deployment/clouddeploy/gke-workers/base/feeds/debian-first-version.yaml diff --git a/deployment/clouddeploy/gke-workers/base/feeds/kustomization.yaml b/deployment/clouddeploy/gke-workers/base/feeds/kustomization.yaml new file mode 100644 index 00000000000..0b555254a67 --- /dev/null +++ b/deployment/clouddeploy/gke-workers/base/feeds/kustomization.yaml @@ -0,0 +1,11 @@ +resources: +- alpine-cve-convert.yaml +- combine-to-osv.yaml +- cpe-repo-gen.yaml +- cve5-to-osv.yaml +- debian-convert.yaml +- debian-copyright-mirror.yaml +- debian-cve-convert.yaml +- debian-first-version.yaml +- nvd-cve-osv.yaml +- nvd-mirror.yaml diff --git a/deployment/clouddeploy/gke-workers/base/nvd-cve-osv.yaml b/deployment/clouddeploy/gke-workers/base/feeds/nvd-cve-osv.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/nvd-cve-osv.yaml rename to deployment/clouddeploy/gke-workers/base/feeds/nvd-cve-osv.yaml diff --git a/deployment/clouddeploy/gke-workers/base/nvd-mirror.yaml b/deployment/clouddeploy/gke-workers/base/feeds/nvd-mirror.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/nvd-mirror.yaml rename to deployment/clouddeploy/gke-workers/base/feeds/nvd-mirror.yaml diff --git a/deployment/clouddeploy/gke-workers/base/ksm_cluster_pod_monitoring.yaml b/deployment/clouddeploy/gke-workers/base/ksm/ksm_cluster_pod_monitoring.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/ksm_cluster_pod_monitoring.yaml rename to deployment/clouddeploy/gke-workers/base/ksm/ksm_cluster_pod_monitoring.yaml diff --git a/deployment/clouddeploy/gke-workers/base/ksm_cluster_role.yaml b/deployment/clouddeploy/gke-workers/base/ksm/ksm_cluster_role.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/ksm_cluster_role.yaml rename to deployment/clouddeploy/gke-workers/base/ksm/ksm_cluster_role.yaml diff --git a/deployment/clouddeploy/gke-workers/base/ksm_cluster_role_binding.yaml b/deployment/clouddeploy/gke-workers/base/ksm/ksm_cluster_role_binding.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/ksm_cluster_role_binding.yaml rename to deployment/clouddeploy/gke-workers/base/ksm/ksm_cluster_role_binding.yaml diff --git a/deployment/clouddeploy/gke-workers/base/ksm_horizontal_pod_autoscaler.yaml b/deployment/clouddeploy/gke-workers/base/ksm/ksm_horizontal_pod_autoscaler.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/ksm_horizontal_pod_autoscaler.yaml rename to deployment/clouddeploy/gke-workers/base/ksm/ksm_horizontal_pod_autoscaler.yaml diff --git a/deployment/clouddeploy/gke-workers/base/ksm_pod_monitoring.yaml b/deployment/clouddeploy/gke-workers/base/ksm/ksm_pod_monitoring.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/ksm_pod_monitoring.yaml rename to deployment/clouddeploy/gke-workers/base/ksm/ksm_pod_monitoring.yaml diff --git a/deployment/clouddeploy/gke-workers/base/ksm_service.yaml b/deployment/clouddeploy/gke-workers/base/ksm/ksm_service.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/ksm_service.yaml rename to deployment/clouddeploy/gke-workers/base/ksm/ksm_service.yaml diff --git a/deployment/clouddeploy/gke-workers/base/ksm_service_account.yaml b/deployment/clouddeploy/gke-workers/base/ksm/ksm_service_account.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/ksm_service_account.yaml rename to deployment/clouddeploy/gke-workers/base/ksm/ksm_service_account.yaml diff --git a/deployment/clouddeploy/gke-workers/base/ksm_stateful_set.yaml b/deployment/clouddeploy/gke-workers/base/ksm/ksm_stateful_set.yaml similarity index 100% rename from deployment/clouddeploy/gke-workers/base/ksm_stateful_set.yaml rename to deployment/clouddeploy/gke-workers/base/ksm/ksm_stateful_set.yaml diff --git a/deployment/clouddeploy/gke-workers/base/ksm/kustomization.yaml b/deployment/clouddeploy/gke-workers/base/ksm/kustomization.yaml new file mode 100644 index 00000000000..c40d46ab661 --- /dev/null +++ b/deployment/clouddeploy/gke-workers/base/ksm/kustomization.yaml @@ -0,0 +1,9 @@ +resources: +- ksm_cluster_pod_monitoring.yaml +- ksm_cluster_role.yaml +- ksm_cluster_role_binding.yaml +- ksm_horizontal_pod_autoscaler.yaml +- ksm_pod_monitoring.yaml +- ksm_service.yaml +- ksm_service_account.yaml +- ksm_stateful_set.yaml diff --git a/deployment/clouddeploy/gke-workers/base/kustomization.yaml b/deployment/clouddeploy/gke-workers/base/kustomization.yaml index d58e81525ee..8785c984b80 100644 --- a/deployment/clouddeploy/gke-workers/base/kustomization.yaml +++ b/deployment/clouddeploy/gke-workers/base/kustomization.yaml @@ -1,36 +1,5 @@ resources: -- workers.yaml -- scaler.yaml -- workers-cves.yaml -- workers-reimport.yaml -- importer.yaml -- importer-deleter.yaml -- importer-reconciler.yaml -- exporter.yaml -- alpine-cve-convert.yaml -- debian-cve-convert.yaml -- combine-to-osv.yaml -- debian-convert.yaml -- debian-first-version.yaml -- debian-copyright-mirror.yaml -- cpe-repo-gen.yaml -- gitter.yaml -- nvd-cve-osv.yaml -- relations.yaml -- nvd-mirror.yaml -- backup.yaml -- generate-sitemap.yaml -- ksm_cluster_pod_monitoring.yaml -- ksm_cluster_role_binding.yaml -- ksm_cluster_role.yaml -- ksm_horizontal_pod_autoscaler.yaml -- ksm_pod_monitoring.yaml -- ksm_service_account.yaml -- ksm_service.yaml -- ksm_stateful_set.yaml -- recoverer.yaml -- record-checker.yaml -- cve5-to-osv.yaml -- custommetrics.yaml -- vanir-signatures.yaml - +- core +- feeds +- extra +- ksm diff --git a/deployment/clouddeploy/gke-workers/environments/private/kustomization.yaml b/deployment/clouddeploy/gke-workers/environments/private/kustomization.yaml index 63798c1c67e..a9a6893c261 100644 --- a/deployment/clouddeploy/gke-workers/environments/private/kustomization.yaml +++ b/deployment/clouddeploy/gke-workers/environments/private/kustomization.yaml @@ -2,16 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: -# - ../../base/backup.yaml # TODO(michaelkedar): figure out how to backup specific datastore IDs -- ../../base/exporter.yaml -- ../../base/gitter.yaml -- ../../base/importer.yaml -- ../../base/importer-deleter.yaml -- ../../base/importer-reconciler.yaml -- ../../base/record-checker.yaml -- ../../base/recoverer.yaml -- ../../base/workers.yaml -- ../../base/scaler.yaml +- ../../base/core +# TODO(michaelkedar): figure out how to backup specific datastore database IDs patches: # - path: backup.yaml diff --git a/deployment/terraform/environments/oss-vdb-test/main.tf b/deployment/terraform/environments/oss-vdb-test/main.tf index c34edf78b9c..a5d08ecbb8d 100644 --- a/deployment/terraform/environments/oss-vdb-test/main.tf +++ b/deployment/terraform/environments/oss-vdb-test/main.tf @@ -6,7 +6,7 @@ locals { all_resources = concat( [for resource in local.env_kustomization.resources : "${local.env_kustomization_path}/${resource}" if can(regex("\\.yaml$", resource))], - [for resource in local.base_kustomization.resources : "${local.base_kustomization_path}/${resource}" if can(regex("\\.yaml$", resource))], + [for f in fileset(local.base_kustomization_path, "**/*.yaml") : "${local.base_kustomization_path}/${f}" if !endswith(f, "kustomization.yaml")], ) # Iterate of each yaml configuration and create a key based on kind and name in the yaml file. diff --git a/deployment/terraform/environments/oss-vdb/main.tf b/deployment/terraform/environments/oss-vdb/main.tf index eacbab44894..a0400374c1f 100644 --- a/deployment/terraform/environments/oss-vdb/main.tf +++ b/deployment/terraform/environments/oss-vdb/main.tf @@ -6,7 +6,7 @@ locals { all_resources = concat( [for resource in local.env_kustomization.resources : "${local.env_kustomization_path}/${resource}" if can(regex("\\.yaml$", resource))], - [for resource in local.base_kustomization.resources : "${local.base_kustomization_path}/${resource}" if can(regex("\\.yaml$", resource))], + [for f in fileset(local.base_kustomization_path, "**/*.yaml") : "${local.base_kustomization_path}/${f}" if !endswith(f, "kustomization.yaml")], ) # Iterate of each yaml configuration and create a key based on kind and name in the yaml file. diff --git a/docs/data.md b/docs/data.md index 0fd7b7a5ae6..03b669a961e 100644 --- a/docs/data.md +++ b/docs/data.md @@ -117,7 +117,7 @@ The quality of the data in OSV.dev [is very important to us](https://google.gith ## Data dumps -For convenience, these sources are aggregated and [continuously](https://github.com/google/osv.dev/blob/master/deployment/clouddeploy/gke-workers/base/exporter.yaml) +For convenience, these sources are aggregated and [continuously](https://github.com/google/osv.dev/blob/master/deployment/clouddeploy/gke-workers/base/core/exporter.yaml) exported to a GCS bucket maintained by OSV: [`gs://osv-vulnerabilities`](https://storage.googleapis.com/osv-vulnerabilities/index.html) diff --git a/vulnfeeds/cmd/combine-to-osv/README.md b/vulnfeeds/cmd/combine-to-osv/README.md index 7dd4eb3c90c..8ea745eb156 100644 --- a/vulnfeeds/cmd/combine-to-osv/README.md +++ b/vulnfeeds/cmd/combine-to-osv/README.md @@ -18,7 +18,7 @@ See [`run_combine_to_osv_convert.sh`](run_combine_to_osv_convert.sh): * What gets written can be overridden by OSV records in [`gs://cve-osv-conversion/osv-output-overrides`](https://storage.googleapis.com/cve-osv-conversion/index.html?prefix=osv-output-overrides/) ## Operational matters -* Runs every hour (on the half hour) as a [Kubernetes CronJob](https://github.com/google/osv.dev/blob/master/deployment/clouddeploy/gke-workers/base/combine-to-osv.yaml) +* Runs every hour (on the half hour) as a [Kubernetes CronJob](https://github.com/google/osv.dev/blob/master/deployment/clouddeploy/gke-workers/base/feeds/combine-to-osv.yaml) ## Usage