suse-edge/Factory
SHA256
11
0
Fork 5
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[3.2] Bump Upgrade Controller and Release Manifest (#54)

Browse Source 
Co-authored-by: Ivo Petrov <ivo.petrov@suse.com>
Reviewed-on: #54
Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org>
This commit is contained in:
Atanas Dinov 2024-12-12 09:39:30 +01:00
parent af59834eaf
commit 26e34cc386
8 changed files with 144 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
release-manifest-image/release_manifest.yaml
View File

@ -8,8 +8,73 @@ spec:
kubernetes: kubernetes:
k3s: k3s:
version: v1.31.2+k3s1 version: v1.31.2+k3s1
coreComponents:
- name: traefik-crd
version: 27.0.201+up27.0.2
type: HelmChart
- name: traefik
version: 27.0.201+up27.0.2
type: HelmChart
- name: local-path-provisioner
containers:
- name: local-path-provisioner
image: rancher/local-path-provisioner:v0.0.30
type: Deployment
- name: coredns
containers:
- name: coredns
image: rancher/mirrored-coredns-coredns:1.11.3
type: Deployment
- name: metrics-server
containers:
- name: metrics-server
image: rancher/mirrored-metrics-server:v0.7.2
type: Deployment
rke2: rke2:
version: v1.31.2+rke2r1 version: v1.31.2+rke2r1
coreComponents:
- name: rke2-cilium
version: 1.16.201
type: HelmChart
- name: rke2-canal
version: v3.28.2-build2024101601
type: HelmChart
- name: rke2-calico-crd
version: v3.28.200
type: HelmChart
- name: rke2-calico
version: v3.28.200
type: HelmChart
- name: rke2-coredns
version: 1.33.002
type: HelmChart
- name: rke2-ingress-nginx
version: 4.10.501
type: HelmChart
- name: rke2-metrics-server
version: 3.12.004
type: HelmChart
- name: rancher-vsphere-csi
version: 3.3.1-rancher100
type: HelmChart
- name: rancher-vsphere-cpi
version: 1.9.000
type: HelmChart
- name: harvester-cloud-provider
version: 0.2.600
type: HelmChart
- name: harvester-csi-driver
version: 0.1.2000
type: HelmChart
- name: rke2-snapshot-controller-crd
version: 3.0.601
type: HelmChart
- name: rke2-snapshot-controller
version: 3.0.601
type: HelmChart
- name: rke2-snapshot-validation-webhook
version: 1.9.001
type: HelmChart
operatingSystem: operatingSystem:
version: "6.0" version: "6.0"
zypperID: "SL-Micro" zypperID: "SL-Micro"

10
upgrade-controller-chart/Chart.yaml
View File

@ -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.1
#!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-%RELEASE%
apiVersion: v2 apiVersion: v2
appVersion: 0.1.0 appVersion: 0.1.1
dependencies: dependencies:
- condition: crds.enabled - condition: crds.enabled
name: lifecycle-crds name: lifecycle-crds
repository: file://./charts/lifecycle-crds repository: file://./charts/lifecycle-crds
version: 0.1.0 version: 0.1.1
description: A Helm chart for Upgrade Controller description: A Helm chart for Upgrade Controller
name: upgrade-controller name: upgrade-controller
type: application type: application
version: "%%CHART_MAJOR%%.0.0+up0.1.0" version: "%%CHART_MAJOR%%.0.0+up0.1.1"

4
upgrade-controller-chart/charts/lifecycle-crds/Chart.yaml
View File

@ -1,6 +1,6 @@
apiVersion: v2 apiVersion: v2
appVersion: 0.1.0 appVersion: 0.1.1
description: A Helm chart containing SUSE Lifecycle CRDs description: A Helm chart containing SUSE Lifecycle CRDs
name: lifecycle-crds name: lifecycle-crds
type: application type: application
version: 0.1.0 version: 0.1.1

58
upgrade-controller-chart/charts/lifecycle-crds/templates/release-manifest-crd.yaml
View File

@ -43,6 +43,35 @@ spec:
properties: properties:
k3s: k3s:
properties: 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: version:
type: string type: string
required: required:
@ -50,6 +79,35 @@ spec:
type: object type: object
rke2: rke2:
properties: 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: version:
type: string type: string
required: required:

8
upgrade-controller-chart/templates/clusterrole.yaml
View File

@ -29,6 +29,14 @@ rules:
- customresourcedefinitions - customresourcedefinitions
verbs: verbs:
- get - get
- apiGroups:
- apps
resources:
- deployments
verbs:
- get
- list
- watch
- apiGroups: - apiGroups:
- batch - batch
resources: resources:

8
upgrade-controller-image/Dockerfile
View File

@ -1,6 +1,6 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
#!BuildTag: %%IMG_PREFIX%%upgrade-controller:0.1.0 #!BuildTag: %%IMG_PREFIX%%upgrade-controller:0.1.1
#!BuildTag: %%IMG_PREFIX%%upgrade-controller:0.1.0-%RELEASE% #!BuildTag: %%IMG_PREFIX%%upgrade-controller:0.1.1-%RELEASE%
#!BuildVersion: 15.6 #!BuildVersion: 15.6
ARG SLE_VERSION ARG SLE_VERSION
FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro 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.authors="SUSE LLC (https://www.suse.com/)"
LABEL org.opencontainers.image.title="SLE Edge Upgrade Controller Container Image" 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.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.url="https://www.suse.com/solutions/edge-computing/"
LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="SUSE LLC" 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 org.openbuildservice.disturl="%DISTURL%"
LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%" LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
LABEL com.suse.eula="SUSE Combined EULA February 2024" LABEL com.suse.eula="SUSE Combined EULA February 2024"

2
upgrade-controller/_service
View File

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

2
upgrade-controller/upgrade-controller.spec
View File

@ -17,7 +17,7 @@
Name: upgrade-controller Name: upgrade-controller
Version: 0.1.0 Version: 0.1.1
Release: 0 Release: 0
Summary: Upgrade Controller Summary: Upgrade Controller
License: Apache-2.0 License: Apache-2.0