From a752a251911024ea2b0a0ded729616aff11b679a202569193585918c5fc135e8 Mon Sep 17 00:00:00 2001 From: Atanas Dinov Date: Wed, 11 Dec 2024 16:19:46 +0200 Subject: [PATCH 1/3] Bump RPM version --- upgrade-controller/_service | 2 +- upgrade-controller/upgrade-controller.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/upgrade-controller/_service b/upgrade-controller/_service index c7bc886..251bb05 100644 --- a/upgrade-controller/_service +++ b/upgrade-controller/_service @@ -4,7 +4,7 @@ @PARENT_TAG@ git .git - v0.1.0 + v0.1.1 v(\d+).(\d+).(\d+) \1.\2.\3 enable diff --git a/upgrade-controller/upgrade-controller.spec b/upgrade-controller/upgrade-controller.spec index c6fbedf..2d7d586 100644 --- a/upgrade-controller/upgrade-controller.spec +++ b/upgrade-controller/upgrade-controller.spec @@ -17,7 +17,7 @@ Name: upgrade-controller -Version: 0.1.0 +Version: 0.1.1 Release: 0 Summary: Upgrade Controller License: Apache-2.0 From 383705e9a34d2eb2bc6325f238f9a2f8043afc0fd7158bbb4639d1d1fc85e5ee Mon Sep 17 00:00:00 2001 From: Atanas Dinov Date: Wed, 11 Dec 2024 16:20:34 +0200 Subject: [PATCH 2/3] Bump container image version --- upgrade-controller-image/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/upgrade-controller-image/Dockerfile b/upgrade-controller-image/Dockerfile index bbc72eb..77febf4 100644 --- a/upgrade-controller-image/Dockerfile +++ b/upgrade-controller-image/Dockerfile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: Apache-2.0 -#!BuildTag: %%IMG_PREFIX%%upgrade-controller:0.1.0 -#!BuildTag: %%IMG_PREFIX%%upgrade-controller:0.1.0-%RELEASE% +#!BuildTag: %%IMG_PREFIX%%upgrade-controller:0.1.1 +#!BuildTag: %%IMG_PREFIX%%upgrade-controller:0.1.1-%RELEASE% #!BuildVersion: 15.6 ARG SLE_VERSION FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro @@ -16,11 +16,11 @@ FROM micro AS final LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)" LABEL org.opencontainers.image.title="SLE Edge Upgrade Controller Container Image" LABEL org.opencontainers.image.description="Edge Update Controller Image based on the SLE Base Container Image." -LABEL org.opencontainers.image.version="0.1.0" +LABEL org.opencontainers.image.version="0.1.1" LABEL org.opencontainers.image.url="https://www.suse.com/solutions/edge-computing/" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="SUSE LLC" -LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%upgrade-controller:0.1.0-%RELEASE%" +LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%upgrade-controller:0.1.1-%RELEASE%" LABEL org.openbuildservice.disturl="%DISTURL%" LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%" LABEL com.suse.eula="SUSE Combined EULA February 2024" From 4bba5fd3f2e28e556ca01b6a676a89aa98572861e5a1cea1921c9b163a9750fa Mon Sep 17 00:00:00 2001 From: Atanas Dinov Date: Wed, 11 Dec 2024 16:27:08 +0200 Subject: [PATCH 3/3] Bump chart version --- upgrade-controller-chart/Chart.yaml | 10 ++-- .../charts/lifecycle-crds/Chart.yaml | 4 +- .../templates/release-manifest-crd.yaml | 58 +++++++++++++++++++ .../templates/clusterrole.yaml | 8 +++ 4 files changed, 73 insertions(+), 7 deletions(-) diff --git a/upgrade-controller-chart/Chart.yaml b/upgrade-controller-chart/Chart.yaml index 033cedf..247c13e 100644 --- a/upgrade-controller-chart/Chart.yaml +++ b/upgrade-controller-chart/Chart.yaml @@ -1,13 +1,13 @@ -#!BuildTag: %%IMG_PREFIX%%upgrade-controller-chart:%%CHART_MAJOR%%.0.0_up0.1.0 -#!BuildTag: %%IMG_PREFIX%%upgrade-controller-chart:%%CHART_MAJOR%%.0.0_up0.1.0-%RELEASE% +#!BuildTag: %%IMG_PREFIX%%upgrade-controller-chart:%%CHART_MAJOR%%.0.0_up0.1.1 +#!BuildTag: %%IMG_PREFIX%%upgrade-controller-chart:%%CHART_MAJOR%%.0.0_up0.1.1-%RELEASE% apiVersion: v2 -appVersion: 0.1.0 +appVersion: 0.1.1 dependencies: - condition: crds.enabled name: lifecycle-crds repository: file://./charts/lifecycle-crds - version: 0.1.0 + version: 0.1.1 description: A Helm chart for Upgrade Controller name: upgrade-controller type: application -version: "%%CHART_MAJOR%%.0.0+up0.1.0" +version: "%%CHART_MAJOR%%.0.0+up0.1.1" diff --git a/upgrade-controller-chart/charts/lifecycle-crds/Chart.yaml b/upgrade-controller-chart/charts/lifecycle-crds/Chart.yaml index 2ac8dc1..735f8f0 100644 --- a/upgrade-controller-chart/charts/lifecycle-crds/Chart.yaml +++ b/upgrade-controller-chart/charts/lifecycle-crds/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -appVersion: 0.1.0 +appVersion: 0.1.1 description: A Helm chart containing SUSE Lifecycle CRDs name: lifecycle-crds type: application -version: 0.1.0 +version: 0.1.1 diff --git a/upgrade-controller-chart/charts/lifecycle-crds/templates/release-manifest-crd.yaml b/upgrade-controller-chart/charts/lifecycle-crds/templates/release-manifest-crd.yaml index 5927e10..b19107d 100644 --- a/upgrade-controller-chart/charts/lifecycle-crds/templates/release-manifest-crd.yaml +++ b/upgrade-controller-chart/charts/lifecycle-crds/templates/release-manifest-crd.yaml @@ -43,6 +43,35 @@ spec: properties: k3s: properties: + coreComponents: + items: + properties: + containers: + items: + properties: + image: + type: string + name: + type: string + required: + - image + - name + type: object + type: array + name: + type: string + type: + enum: + - HelmChart + - Deployment + type: string + version: + type: string + required: + - name + - type + type: object + type: array version: type: string required: @@ -50,6 +79,35 @@ spec: type: object rke2: properties: + coreComponents: + items: + properties: + containers: + items: + properties: + image: + type: string + name: + type: string + required: + - image + - name + type: object + type: array + name: + type: string + type: + enum: + - HelmChart + - Deployment + type: string + version: + type: string + required: + - name + - type + type: object + type: array version: type: string required: diff --git a/upgrade-controller-chart/templates/clusterrole.yaml b/upgrade-controller-chart/templates/clusterrole.yaml index 8e9c6e7..ae75204 100644 --- a/upgrade-controller-chart/templates/clusterrole.yaml +++ b/upgrade-controller-chart/templates/clusterrole.yaml @@ -29,6 +29,14 @@ rules: - customresourcedefinitions verbs: - get +- apiGroups: + - apps + resources: + - deployments + verbs: + - get + - list + - watch - apiGroups: - batch resources: