From 476872b1b7828a4d478be3897339b03cd36285ed Mon Sep 17 00:00:00 2001 From: Tae Park Date: Tue, 27 Aug 2024 17:23:51 -0400 Subject: [PATCH] Hardcode app label selector Hardcoding the selector.matchLabels.app to "portieris" to match spec.template.metadata.labels.app value in deployment.yaml. This should allow the portieris pods to be cordonned properly, so that the kubernetes upgrades can be done. Test Plan: PASS Build portieris application PASS Application sanity test PASS With the patch applied, perform a kubernetes upgrade on AIOSX Closes-bug: 2078063 Change-Id: Ib1ef4d7cdde62bc29fa9534fb77bc82a0666bcdc Signed-off-by: Tae Park --- .../0002-Hardcode-app-label-selector.patch | 29 +++++++++++++++++++ .../debian/deb_folder/patches/series | 1 + 2 files changed, 30 insertions(+) create mode 100644 helm-charts/upstream/portieris-helm/debian/deb_folder/patches/0002-Hardcode-app-label-selector.patch diff --git a/helm-charts/upstream/portieris-helm/debian/deb_folder/patches/0002-Hardcode-app-label-selector.patch b/helm-charts/upstream/portieris-helm/debian/deb_folder/patches/0002-Hardcode-app-label-selector.patch new file mode 100644 index 0000000..d293680 --- /dev/null +++ b/helm-charts/upstream/portieris-helm/debian/deb_folder/patches/0002-Hardcode-app-label-selector.patch @@ -0,0 +1,29 @@ +From e0073c8e0d306d3d33b30bc9a16a73e21b00dc7b Mon Sep 17 00:00:00 2001 +From: Tae Park +Date: Tue, 27 Aug 2024 17:06:33 -0400 +Subject: [PATCH] Hardcode app label selector + +Hardcoding the selector.matchLabels.app to "portieris" to match +spec.template.metadata.labels.app value in deployment.yaml. This should +allow the portieris pods to be cordonned properly, so that the +kubernetes upgrades can be done. + +Signed-off-by: Tae Park +--- + helm/portieris/templates/pdb.yaml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/helm/portieris/templates/pdb.yaml b/helm/portieris/templates/pdb.yaml +index dee1243..526e7e1 100644 +--- a/helm/portieris/templates/pdb.yaml ++++ b/helm/portieris/templates/pdb.yaml +@@ -17,5 +17,5 @@ spec: + {{- end }} + selector: + matchLabels: +- app: {{ .Release.Name }} ++ app: portieris + {{- end }} +-- +2.25.1 + diff --git a/helm-charts/upstream/portieris-helm/debian/deb_folder/patches/series b/helm-charts/upstream/portieris-helm/debian/deb_folder/patches/series index 43898f1..2b45225 100644 --- a/helm-charts/upstream/portieris-helm/debian/deb_folder/patches/series +++ b/helm-charts/upstream/portieris-helm/debian/deb_folder/patches/series @@ -1 +1,2 @@ 0001-Add-permissive-cluster-policy-by-default.patch +0002-Hardcode-app-label-selector.patch