From 2f3b63d2df296cd5d3ec1201a0e8e625d483ecc7 Mon Sep 17 00:00:00 2001 From: Jake Hyde <33796120+jakefhyde@users.noreply.github.com> Date: Wed, 15 Sep 2021 15:06:39 -0400 Subject: [PATCH] (dev-v2.6-archive) Merge pull request #1466 from jakefhyde/update-image-versions-in-rancher-cis-benchmark Update image versions in rancher cis benchmark (partially cherry picked from commit fa0a5a726aebac573f5f601d4ce9e022689e4ff0) --- packages/rancher-aks-operator-crd/package.yaml | 4 ++-- packages/rancher-aks-operator/package.yaml | 4 ++-- .../generated-changes/patch/Chart.yaml.patch | 12 +++++++----- .../templates/gatekeeper-audit-deployment.yaml.patch | 2 +- ...tekeeper-controller-manager-deployment.yaml.patch | 2 +- .../patch/templates/upgrade-crds-hook.yaml.patch | 11 +++++++++++ .../generated-changes/patch/values.yaml.patch | 10 ++++++---- packages/rancher-gatekeeper/package.yaml | 4 ++-- .../templates/crd-template/Chart.yaml | 2 +- 9 files changed, 33 insertions(+), 18 deletions(-) create mode 100644 packages/rancher-gatekeeper/generated-changes/patch/templates/upgrade-crds-hook.yaml.patch diff --git a/packages/rancher-aks-operator-crd/package.yaml b/packages/rancher-aks-operator-crd/package.yaml index 754679220..5d7a1436e 100644 --- a/packages/rancher-aks-operator-crd/package.yaml +++ b/packages/rancher-aks-operator-crd/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/aks-operator/releases/download/v1.0.1/rancher-aks-operator-crd-1.0.1.tgz -version: 100.0.0 +url: https://github.com/rancher/aks-operator/releases/download/v1.0.2-rc1/rancher-aks-operator-crd-1.0.2-rc1.tgz +version: 100.0.1 diff --git a/packages/rancher-aks-operator/package.yaml b/packages/rancher-aks-operator/package.yaml index b8b03e344..c1585fca1 100644 --- a/packages/rancher-aks-operator/package.yaml +++ b/packages/rancher-aks-operator/package.yaml @@ -1,2 +1,2 @@ -url: https://github.com/rancher/aks-operator/releases/download/v1.0.1/rancher-aks-operator-1.0.1.tgz -version: 100.0.0 +url: https://github.com/rancher/aks-operator/releases/download/v1.0.2-rc1/rancher-aks-operator-1.0.2-rc1.tgz +version: 100.0.1 diff --git a/packages/rancher-gatekeeper/generated-changes/patch/Chart.yaml.patch b/packages/rancher-gatekeeper/generated-changes/patch/Chart.yaml.patch index a687f6d1c..490894b83 100644 --- a/packages/rancher-gatekeeper/generated-changes/patch/Chart.yaml.patch +++ b/packages/rancher-gatekeeper/generated-changes/patch/Chart.yaml.patch @@ -2,18 +2,20 @@ +++ charts/Chart.yaml @@ -1,10 +1,22 @@ apiVersion: v2 - appVersion: v3.5.1 + appVersion: v3.6.0 -description: A Helm chart for Gatekeeper +description: Modifies Open Policy Agent's upstream gatekeeper chart that provides policy-based control for cloud native environments home: https://github.com/open-policy-agent/gatekeeper keywords: - - open policy agent +-- open policy agent -name: gatekeeper -+- security ++ - open policy agent ++ - security +name: rancher-gatekeeper sources: - - https://github.com/open-policy-agent/gatekeeper.git - version: 3.5.1 +-- https://github.com/open-policy-agent/gatekeeper.git ++ - https://github.com/open-policy-agent/gatekeeper.git + version: 3.6.0 +icon: https://charts.rancher.io/assets/logos/gatekeeper.svg +annotations: + catalog.cattle.io/certified: rancher diff --git a/packages/rancher-gatekeeper/generated-changes/patch/templates/gatekeeper-audit-deployment.yaml.patch b/packages/rancher-gatekeeper/generated-changes/patch/templates/gatekeeper-audit-deployment.yaml.patch index 8df99ab2a..6e833d2ad 100644 --- a/packages/rancher-gatekeeper/generated-changes/patch/templates/gatekeeper-audit-deployment.yaml.patch +++ b/packages/rancher-gatekeeper/generated-changes/patch/templates/gatekeeper-audit-deployment.yaml.patch @@ -1,6 +1,6 @@ --- charts-original/templates/gatekeeper-audit-deployment.yaml +++ charts/templates/gatekeeper-audit-deployment.yaml -@@ -63,7 +63,7 @@ +@@ -65,7 +65,7 @@ valueFrom: fieldRef: fieldPath: metadata.name diff --git a/packages/rancher-gatekeeper/generated-changes/patch/templates/gatekeeper-controller-manager-deployment.yaml.patch b/packages/rancher-gatekeeper/generated-changes/patch/templates/gatekeeper-controller-manager-deployment.yaml.patch index f885fca90..bc9ad5195 100644 --- a/packages/rancher-gatekeeper/generated-changes/patch/templates/gatekeeper-controller-manager-deployment.yaml.patch +++ b/packages/rancher-gatekeeper/generated-changes/patch/templates/gatekeeper-controller-manager-deployment.yaml.patch @@ -1,6 +1,6 @@ --- charts-original/templates/gatekeeper-controller-manager-deployment.yaml +++ charts/templates/gatekeeper-controller-manager-deployment.yaml -@@ -65,7 +65,7 @@ +@@ -71,7 +71,7 @@ valueFrom: fieldRef: fieldPath: metadata.name diff --git a/packages/rancher-gatekeeper/generated-changes/patch/templates/upgrade-crds-hook.yaml.patch b/packages/rancher-gatekeeper/generated-changes/patch/templates/upgrade-crds-hook.yaml.patch new file mode 100644 index 000000000..031645501 --- /dev/null +++ b/packages/rancher-gatekeeper/generated-changes/patch/templates/upgrade-crds-hook.yaml.patch @@ -0,0 +1,11 @@ +--- charts-original/templates/upgrade-crds-hook.yaml ++++ charts/templates/upgrade-crds-hook.yaml +@@ -72,7 +72,7 @@ + restartPolicy: Never + containers: + - name: crds-upgrade +- image: '{{ .Values.image.crdRepository }}:{{ .Values.image.release }}' ++ image: '{{ template "system_default_registry" . }}{{ .Values.image.crdRepository }}:{{ .Values.image.tag }}' + imagePullPolicy: '{{ .Values.image.pullPolicy }}' + args: + - apply diff --git a/packages/rancher-gatekeeper/generated-changes/patch/values.yaml.patch b/packages/rancher-gatekeeper/generated-changes/patch/values.yaml.patch index b1a501fce..5f151b41c 100644 --- a/packages/rancher-gatekeeper/generated-changes/patch/values.yaml.patch +++ b/packages/rancher-gatekeeper/generated-changes/patch/values.yaml.patch @@ -7,7 +7,7 @@ auditMatchKindOnly: false constraintViolationsLimit: 20 auditFromCache: false -@@ -16,13 +16,13 @@ +@@ -19,14 +19,14 @@ labelNamespace: enabled: true image: @@ -19,13 +19,15 @@ pullSecrets: [] image: - repository: openpolicyagent/gatekeeper -- release: v3.5.1 +- crdRepository: openpolicyagent/gatekeeper-crds +- release: v3.6.0 + repository: rancher/mirrored-openpolicyagent-gatekeeper -+ tag: v3.5.1 ++ crdRepository: rancher/mirrored-openpolicyagent-gatekeeper-crds ++ tag: v3.6.0 pullPolicy: IfNotPresent pullSecrets: [] podAnnotations: -@@ -70,5 +70,11 @@ +@@ -80,5 +80,11 @@ pdb: controllerManager: minAvailable: 1 diff --git a/packages/rancher-gatekeeper/package.yaml b/packages/rancher-gatekeeper/package.yaml index 0aa23231c..17c0c3534 100644 --- a/packages/rancher-gatekeeper/package.yaml +++ b/packages/rancher-gatekeeper/package.yaml @@ -1,5 +1,5 @@ -url: https://open-policy-agent.github.io/gatekeeper/charts/gatekeeper-3.5.1.tgz -version: 100.0.0 +url: https://open-policy-agent.github.io/gatekeeper/charts/gatekeeper-3.6.0.tgz +version: 100.0.1 additionalCharts: - workingDir: charts-crd crdOptions: diff --git a/packages/rancher-gatekeeper/templates/crd-template/Chart.yaml b/packages/rancher-gatekeeper/templates/crd-template/Chart.yaml index 2d33b09bb..f7ec02fa3 100644 --- a/packages/rancher-gatekeeper/templates/crd-template/Chart.yaml +++ b/packages/rancher-gatekeeper/templates/crd-template/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -version: 3.5.1 +version: 3.6.0 description: Installs the CRDs for rancher-gatekeeper. name: rancher-gatekeeper-crd type: application