Merge pull request 'Bump upgrade-controller to v0.1.1' (#53) from upgrade-controller-v0.1.1 into main

Reviewed-on: #53
Reviewed-by: Ivo Petrov <ipetrov117@noreply.src.opensuse.org>
Reviewed-by: Nicolas Belouin <nbelouin@noreply.src.opensuse.org>
Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org>
(cherry picked from commit 8c31073506)
Signed-off-by: Atanas Dinov <atanas.dinov@suse.com>

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"

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

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:

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:

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"

upgrade-controller/_service

@@ -4,7 +4,7 @@
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="revision">v0.1.0</param>
+    <param name="revision">v0.1.1</param>
     <param name="versionrewrite-pattern">v(\d+).(\d+).(\d+)</param>
     <param name="versionrewrite-replacement">\1.\2.\3</param>
     <param name="changesgenerate">enable</param>

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