From 93d3cef997987c19418c88c8b274e7fe09eb4c3a Mon Sep 17 00:00:00 2001
From: Tae Park <tae.park@windriver.com>
Date: Tue, 3 Sep 2024 10:20:11 -0400
Subject: [PATCH] Fix minor application package errors
Making minor package issues for porteris. The changes include: remove
redundant .patch file in portieris-helm/files folder, update version
for portieris-helm helm chart by updating debver in meta_data.yaml
and adding new entry in the changelog.
Test Plan:
PASS Validate that the .patch file still existing in the correct
directory is applied in the package build
PASS Validate correct version for portieris-helm helm chart
PASS Application sanity test
Story: 2011086
Task: 50957
Change-Id: I163479beef8e1db7b3f72f18db09bbee7889e878
Signed-off-by: Tae Park <tae.park@windriver.com>
---
.../debian/deb_folder/changelog | 6 +++
.../portieris-helm/debian/meta_data.yaml | 2 +-
...permissive-cluster-policy-by-default.patch | 37 -------------------
3 files changed, 7 insertions(+), 38 deletions(-)
delete mode 100644 helm-charts/upstream/portieris-helm/files/0001-Add-permissive-cluster-policy-by-default.patch
diff --git a/helm-charts/upstream/portieris-helm/debian/deb_folder/changelog b/helm-charts/upstream/portieris-helm/debian/deb_folder/changelog
index e4bf147..2fb9e8e 100644
--- a/helm-charts/upstream/portieris-helm/debian/deb_folder/changelog
+++ b/helm-charts/upstream/portieris-helm/debian/deb_folder/changelog
@@ -1,3 +1,9 @@
+portieris-helm (0.13-16) unstable; urgency=medium
+
+ * Upversion Portieris to v0.13.16
+
+ -- Tae Park <tae.park@windriver.com> Thu, 6 Jun 2024 16:26:53 -0400
+
portieris-helm (0.13-10) unstable; urgency=medium
* Initial release.
diff --git a/helm-charts/upstream/portieris-helm/debian/meta_data.yaml b/helm-charts/upstream/portieris-helm/debian/meta_data.yaml
index da489e0..ec067a5 100644
--- a/helm-charts/upstream/portieris-helm/debian/meta_data.yaml
+++ b/helm-charts/upstream/portieris-helm/debian/meta_data.yaml
@@ -1,6 +1,6 @@
---
debname: portieris-helm
-debver: 0.13-10
+debver: 0.13-16
dl_path:
name: portieris-0.13.16.tgz
url: https://github.com/IBM/portieris/archive/refs/tags/v0.13.16.tar.gz
diff --git a/helm-charts/upstream/portieris-helm/files/0001-Add-permissive-cluster-policy-by-default.patch b/helm-charts/upstream/portieris-helm/files/0001-Add-permissive-cluster-policy-by-default.patch
deleted file mode 100644
index 4308a3f..0000000
--- a/helm-charts/upstream/portieris-helm/files/0001-Add-permissive-cluster-policy-by-default.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0eff41601723e51d975af4e4663dc788bb067f0a Mon Sep 17 00:00:00 2001
-From: Jerry Sun <jerry.sun@windriver.com>
-Date: Mon, 16 Jan 2023 11:35:58 -0500
-Subject: [PATCH 1/1] Add permissive cluster policy by default
-
-The default permissive policy is only added if the policy set is
-set to IKS. In the non IKS case, no default cluster image policy
-is created. This means all pod deployment is denied in all
-namespaces that don't have any imagepolicies. This patch applies
-the default permissive cluster image policy to not interfere with
-platform functionality when Portieris is applied.
-
-Signed-off-by: Jerry Sun <jerry.sun@windriver.com>
----
- helm/portieris/templates/policies.yaml | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/helm/portieris/templates/policies.yaml b/helm/portieris/templates/policies.yaml
-index 6e67ffc..ed8c84f 100644
---- a/helm/portieris/templates/policies.yaml
-+++ b/helm/portieris/templates/policies.yaml
-@@ -65,7 +65,6 @@ spec:
- ---
- {{ end }}
-
--{{- if (eq .Values.PolicySet "IKS") }}
- apiVersion: portieris.cloud.ibm.com/v1
- kind: ClusterImagePolicy
- metadata:
-@@ -77,4 +76,3 @@ spec:
- repositories:
- {{- .Values.clusterPolicy.allowedRepositories | toYaml | nindent 4 }}
- ---
--{{ end }}
---
-2.34.1
-