Merge pull request containers#129 from fmuyassarov/fix-ga

github-action: update charts path to include memtierd and memory-qos
marquiz · Oct 10, 2023 · b6c4b21 · b6c4b21
2 parents 1687298 + 862510f
commit b6c4b21
Show file tree

Hide file tree

Showing 27 changed files with 6 additions and 9 deletions.
diff --git a/.github/workflows/helm-lint.yaml b/.github/workflows/helm-lint.yaml
@@ -19,8 +19,5 @@ jobs:
         with:
           version: v3.11.2
 
-      - name: Run balloons linter
-        run: helm lint deployment/helm/resource-management-policies/balloons
-
-      - name: Run topology-aware linter
-        run: helm lint deployment/helm/resource-management-policies/topology-aware/
+      - name: Run linter for all the charts
+        run: helm lint deployment/helm/*
diff --git a/.github/workflows/package-helm.yaml b/.github/workflows/package-helm.yaml
@@ -6,7 +6,7 @@ on:
       - "v*.*.*"
 
 env:
-  CHARTS_DIR: deployment/helm/resource-management-policies/
+  CHARTS_DIR: deployment/helm/
 
 jobs:
   release:
@@ -34,4 +34,4 @@ jobs:
           name: ${{ github.ref_name }}
           draft: true
           append_body: true
-          files: nri-resource-policy-*helm-chart*.tgz
+          files: nri-*helm-chart*.tgz
diff --git a/...e-management-policies/balloons/Chart.yaml → deployment/helm/balloons/Chart.yaml b/...e-management-policies/balloons/Chart.yaml → deployment/helm/balloons/Chart.yaml
diff --git a/...s/balloons/crds/noderesourcetopology.yaml → ...m/balloons/crds/noderesourcetopology.yaml b/...s/balloons/crds/noderesourcetopology.yaml → ...m/balloons/crds/noderesourcetopology.yaml
diff --git a/...-policies/balloons/templates/_helpers.tpl → ...ment/helm/balloons/templates/_helpers.tpl b/...-policies/balloons/templates/_helpers.tpl → ...ment/helm/balloons/templates/_helpers.tpl
diff --git a/...icies/balloons/templates/clusterrole.yaml → .../helm/balloons/templates/clusterrole.yaml b/...icies/balloons/templates/clusterrole.yaml → .../helm/balloons/templates/clusterrole.yaml
diff --git a/...alloons/templates/clusterrolebinding.yaml → ...alloons/templates/clusterrolebinding.yaml b/...alloons/templates/clusterrolebinding.yaml → ...alloons/templates/clusterrolebinding.yaml
diff --git a/...olicies/balloons/templates/configmap.yaml → ...nt/helm/balloons/templates/configmap.yaml b/...olicies/balloons/templates/configmap.yaml → ...nt/helm/balloons/templates/configmap.yaml
diff --git a/...olicies/balloons/templates/daemonset.yaml → ...nt/helm/balloons/templates/daemonset.yaml b/...olicies/balloons/templates/daemonset.yaml → ...nt/helm/balloons/templates/daemonset.yaml
diff --git a/...ent-policies/balloons/templates/role.yaml → deployment/helm/balloons/templates/role.yaml b/...ent-policies/balloons/templates/role.yaml → deployment/helm/balloons/templates/role.yaml
diff --git a/...icies/balloons/templates/rolebinding.yaml → .../helm/balloons/templates/rolebinding.yaml b/...icies/balloons/templates/rolebinding.yaml → .../helm/balloons/templates/rolebinding.yaml
diff --git a/...es/balloons/templates/serviceaccount.yaml → ...lm/balloons/templates/serviceaccount.yaml b/...es/balloons/templates/serviceaccount.yaml → ...lm/balloons/templates/serviceaccount.yaml
diff --git a/...ment-policies/balloons/values.scheme.json → deployment/helm/balloons/values.scheme.json b/...ment-policies/balloons/values.scheme.json → deployment/helm/balloons/values.scheme.json
diff --git a/...-management-policies/balloons/values.yaml → deployment/helm/balloons/values.yaml b/...-management-policies/balloons/values.yaml → deployment/helm/balloons/values.yaml
diff --git a/...gement-policies/topology-aware/Chart.yaml → deployment/helm/topology-aware/Chart.yaml b/...gement-policies/topology-aware/Chart.yaml → deployment/helm/topology-aware/Chart.yaml
diff --git a/...logy-aware/crds/noderesourcetopology.yaml → ...logy-aware/crds/noderesourcetopology.yaml b/...logy-aware/crds/noderesourcetopology.yaml → ...logy-aware/crds/noderesourcetopology.yaml
diff --git a/...ies/topology-aware/templates/_helpers.tpl → ...elm/topology-aware/templates/_helpers.tpl b/...ies/topology-aware/templates/_helpers.tpl → ...elm/topology-aware/templates/_helpers.tpl
diff --git a/...topology-aware/templates/clusterrole.yaml → ...topology-aware/templates/clusterrole.yaml b/...topology-aware/templates/clusterrole.yaml → ...topology-aware/templates/clusterrole.yaml
diff --git a/...y-aware/templates/clusterrolebinding.yaml → ...y-aware/templates/clusterrolebinding.yaml b/...y-aware/templates/clusterrolebinding.yaml → ...y-aware/templates/clusterrolebinding.yaml
diff --git a/...s/topology-aware/templates/configmap.yaml → ...m/topology-aware/templates/configmap.yaml b/...s/topology-aware/templates/configmap.yaml → ...m/topology-aware/templates/configmap.yaml
diff --git a/...s/topology-aware/templates/daemonset.yaml → ...m/topology-aware/templates/daemonset.yaml b/...s/topology-aware/templates/daemonset.yaml → ...m/topology-aware/templates/daemonset.yaml
diff --git a/...licies/topology-aware/templates/role.yaml → ...t/helm/topology-aware/templates/role.yaml b/...licies/topology-aware/templates/role.yaml → ...t/helm/topology-aware/templates/role.yaml
diff --git a/...topology-aware/templates/rolebinding.yaml → ...topology-aware/templates/rolebinding.yaml b/...topology-aware/templates/rolebinding.yaml → ...topology-aware/templates/rolebinding.yaml
diff --git a/...ology-aware/templates/serviceaccount.yaml → ...ology-aware/templates/serviceaccount.yaml b/...ology-aware/templates/serviceaccount.yaml → ...ology-aware/templates/serviceaccount.yaml
diff --git a/...olicies/topology-aware/values.scheme.json → ...nt/helm/topology-aware/values.scheme.json b/...olicies/topology-aware/values.scheme.json → ...nt/helm/topology-aware/values.scheme.json
diff --git a/...ement-policies/topology-aware/values.yaml → deployment/helm/topology-aware/values.yaml b/...ement-policies/topology-aware/values.yaml → deployment/helm/topology-aware/values.yaml
diff --git a/docs/resource-policy/installation.md b/docs/resource-policy/installation.md
@@ -25,7 +25,7 @@ following components: DaemonSet, ConfigMap, CustomResourceDefinition, and RBAC-r
           For instance,
 
           ```sh
-          helm install topology-aware --namespace kube-system --set nri.patchContainerdConfig=true deployment/helm/resource-management-policies/topology-aware/
+          helm install topology-aware --namespace kube-system --set nri.patchContainerdConfig=true deployment/helm/topology-aware/
           ```
 
           Enabling `nri.patchContainerdConfig` creates an init container to turn on
@@ -61,7 +61,7 @@ following components: DaemonSet, ConfigMap, CustomResourceDefinition, and RBAC-r
    be installed in the default namespace.
 
     ```sh
-    helm install topology-aware --namespace kube-system deployment/helm/resource-management-policies/topology-aware/
+    helm install topology-aware --namespace kube-system deployment/helm/topology-aware/
     ```
 
 1. Verify the status of the daemonset to ensure that the plugin is running successfully