Merge pull request #383 from anchore/k8s-inventory-1.5.1

feat: bump k8s-inventory to 1.5.1
anchore · May 28, 2024 · 52fe24d · 52fe24d
2 parents 68132b1 + 20e89d2
commit 52fe24d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/stable/k8s-inventory/Chart.yaml b/stable/k8s-inventory/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: k8s-inventory
-version: 0.2.3
-appVersion: "1.4.0"
+version: 0.3.0
+appVersion: "1.5.1"
 description: A Helm chart for Kubernetes Automated Inventory, which describes which images are in use in a given Kubernetes Cluster
 keywords:
   - analysis

diff --git a/stable/k8s-inventory/templates/configmap.yaml b/stable/k8s-inventory/templates/configmap.yaml
@@ -37,6 +37,10 @@ data:
     missing-registry-override: {{ .Values.k8sInventory.missingRegistryOverride}}
     missing-tag-policy:
       {{- toYaml .Values.k8sInventory.missingTagPolicy | nindent 6 }}
+    account-route-by-namespace-label:
+      key: {{ .Values.k8sInventory.accountRouteByNamespaceLabel.key }}
+      default-account: {{ .Values.k8sInventory.accountRouteByNamespaceLabel.defaultAccount }}
+      ignore-namespace-missing-label: {{ .Values.k8sInventory.accountRouteByNamespaceLabel.ignoreNamespaceMissingLabel }}
     anchore:
       url: {{ .Values.k8sInventory.anchore.url }}
       user: {{ .Values.k8sInventory.anchore.user }}

diff --git a/stable/k8s-inventory/values.yaml b/stable/k8s-inventory/values.yaml
@@ -15,7 +15,7 @@ replicaCount: 1
 image:
   pullPolicy: "IfNotPresent"
   repository: "anchore/k8s-inventory"
-  tag: "v1.4.0"
+  tag: "v1.5.1"
 
 ## @param imagePullSecrets secrets where Kubernetes should get the credentials for pulling private images
 ##
@@ -199,6 +199,15 @@ k8sInventory:
   ##
   ignoreNotRunning: true
 
+  ### k8sInventory.accountRouteByNamespaceLabel Allow routing of Kubernetes namespaces to different Anchore accounts based on a label on the namespace
+  ## @param k8sInventory.accountRouteByNamespaceLabel.key Kubernetes label key to use for determining Anchore account to send to
+  ## @param k8sInventory.accountRouteByNamespaceLabel.defaultAccount Fallback account to send to if Anchore account or label is not found
+  ## @param k8sInventory.accountRouteByNamespaceLabel.ignoreNamespaceMissingLabel If true exclude sending inventory of namespaces that are missing the label
+  accountRouteByNamespaceLabel:
+    key: ""
+    defaultAccount: "admin"
+    ignoreNamespaceMissingLabel: false
+
   ## @param k8sInventory.anchore.url the url of the anchore platform
   ## @param k8sInventory.anchore.user the username of the anchore platform. The user specified must be an admin user or have full-control, or read-write RBAC permissions
   ## @param k8sInventory.anchore.password the password of the anchore platform