From 45e95c221799c04572ec3342f8b609082dd9d559 Mon Sep 17 00:00:00 2001 From: treydock Date: Thu, 12 Aug 2021 16:54:17 -0400 Subject: [PATCH] Make Kyverno CRDs a seperate Helm chart capable of being updated/deleted (#2218) * Make Kyverno CRDs a seperate Helm chart capable of being updated/deleted Signed-off-by: Trey Dockendorf * Make E2E tests work with new chart Signed-off-by: Trey Dockendorf * Seems Helm lint needs values.yaml Signed-off-by: Trey Dockendorf * Can't use ct install for the CRDs because will end up getting uninstalled after test Signed-off-by: Trey Dockendorf * Ensure helm release accounts for new CRD chart Signed-off-by: Trey Dockendorf * Update CRD chart versions Signed-off-by: Trey Dockendorf * Make CRD chart version match main kyverno chart version Signed-off-by: Trey Dockendorf * Bump chart versions Signed-off-by: Trey Dockendorf --- .github/workflows/e2e.yaml | 3 ++- .github/workflows/helm-release.yaml | 1 + Makefile | 2 +- charts/kyverno-crds/Chart.yaml | 20 +++++++++++++++++++ .../crds => kyverno-crds/templates}/crds.yaml | 0 charts/kyverno-crds/values.yaml | 0 charts/kyverno/Chart.yaml | 2 +- 7 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 charts/kyverno-crds/Chart.yaml rename charts/{kyverno/crds => kyverno-crds/templates}/crds.yaml (100%) create mode 100644 charts/kyverno-crds/values.yaml diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index dbeccec154..8bff0bcd2f 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -99,7 +99,8 @@ jobs: - name: Run chart-testing (install) run: | kubectl create namespace kyverno - ct install --target-branch=main --namespace=kyverno + helm install kyverno-crds charts/kyverno-crds -n kyverno + ct install --target-branch=main --namespace=kyverno --charts charts/kyverno - name: Debug failure if: failure() diff --git a/.github/workflows/helm-release.yaml b/.github/workflows/helm-release.yaml index b804564db5..62a0db69c3 100644 --- a/.github/workflows/helm-release.yaml +++ b/.github/workflows/helm-release.yaml @@ -4,6 +4,7 @@ on: branches: - 'main' paths: + - 'charts/kyverno-crds/Chart.yaml' - 'charts/kyverno/Chart.yaml' - '.github/workflows/helm-release.yaml' diff --git a/Makefile b/Makefile index 45de4ef429..9f0be17643 100644 --- a/Makefile +++ b/Makefile @@ -210,7 +210,7 @@ godownloader: # kustomize-crd will create install.yaml kustomize-crd: # Create CRD for helm deployment Helm - kustomize build ./definitions/crds > ./charts/kyverno/crds/crds.yaml + kustomize build ./definitions/crds > ./charts/kyverno-crds/templates/crds.yaml # Generate install.yaml that have all resources for kyverno kustomize build ./definitions > ./definitions/install.yaml # Generate install_debug.yaml that for developer testing diff --git a/charts/kyverno-crds/Chart.yaml b/charts/kyverno-crds/Chart.yaml new file mode 100644 index 0000000000..39cb84977e --- /dev/null +++ b/charts/kyverno-crds/Chart.yaml @@ -0,0 +1,20 @@ +apiVersion: v1 +name: kyverno-crds +version: v2.0.2 +appVersion: v1.4.2 +icon: https://github.com/kyverno/kyverno/raw/main/img/logo.png +description: Kubernetes Native Policy Management CRDs +keywords: + - kubernetes + - nirmata + - policy agent + - validating webhook + - admissions controller +home: https://kyverno.io/ +sources: + - https://github.com/kyverno/kyverno +maintainers: + - name: Nirmata + url: https://kyverno.io/ +engine: gotpl +kubeVersion: ">=1.10.0-0" diff --git a/charts/kyverno/crds/crds.yaml b/charts/kyverno-crds/templates/crds.yaml similarity index 100% rename from charts/kyverno/crds/crds.yaml rename to charts/kyverno-crds/templates/crds.yaml diff --git a/charts/kyverno-crds/values.yaml b/charts/kyverno-crds/values.yaml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/charts/kyverno/Chart.yaml b/charts/kyverno/Chart.yaml index 10c0c4a2ca..658b9efdd8 100644 --- a/charts/kyverno/Chart.yaml +++ b/charts/kyverno/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: kyverno -version: v2.0.1 +version: v2.0.2 appVersion: v1.4.2 icon: https://github.com/kyverno/kyverno/raw/main/img/logo.png description: Kubernetes Native Policy Management