diff --git a/README.md b/README.md index 1929d2f..e63bf75 100644 --- a/README.md +++ b/README.md @@ -30,22 +30,12 @@ kubectl apply -f https://raw.githubusercontent.com/suse-edge/fleet-examples/main kubectl apply -f https://raw.githubusercontent.com/suse-edge/fleet-examples/main/gitrepos/general/elemental-gitrepo.yaml ``` -NOTE: If the [Rancher's UI Plugin Operator](https://github.com/rancher/ui-plugin-operator) is not installed, enable the installation in the [Elemental Gitrepo](./gitrepos/general/elemental-gitrepo.yaml) file. - * [Opni](./fleets/general/opni) - [Opni](https://github.com/rancher/opni), including the [Opni's Rancher UI Plugin](https://github.com/rancher/opni-ui/): ``` kubectl apply -f https://raw.githubusercontent.com/suse-edge/fleet-examples/main/gitrepos/general/opni-gitrepo.yaml ``` -NOTE: If the [Rancher's UI Plugin Operator](https://github.com/rancher/ui-plugin-operator) is not installed, enable the installation in the [Opni Gitrepo](./gitrepos/general/opni-gitrepo.yaml) file. - -* [Rancher's UI Plugin Operator](./fleets/general/rancher-ui-plugin-operator) - [Rancher's UI Plugin Operator](https://github.com/rancher/ui-plugin-operator): - -``` -kubectl apply -f https://raw.githubusercontent.com/suse-edge/fleet-examples/main/gitrepos/general/rancher-ui-plugin-operator-gitrepo.yaml -``` - * [Longhorn](./fleets/general/longhorn) - [Longhorn](https://longhorn.io/): ``` @@ -168,4 +158,4 @@ helm -n cattle-fleet-system upgrade --create-namespace fleet https://github.com/ ``` kubectl -n longhorn-system patch -p '{"value": "true"}' --type=merge lhs deleting-confirmation-flag -``` \ No newline at end of file +``` diff --git a/bundles/day2/system-upgrade-controller-plans/k3s-upgrade/plan-bundle.yaml b/bundles/day2/system-upgrade-controller-plans/k3s-upgrade/plan-bundle.yaml index ca822a7..3ed3980 100644 --- a/bundles/day2/system-upgrade-controller-plans/k3s-upgrade/plan-bundle.yaml +++ b/bundles/day2/system-upgrade-controller-plans/k3s-upgrade/plan-bundle.yaml @@ -35,7 +35,7 @@ spec: cordon: true upgrade: image: rancher/k3s-upgrade - version: v1.28.10+k3s1 + version: v1.30.3+k3s1 --- # worker upgrade plan apiVersion: upgrade.cattle.io/v1 @@ -60,7 +60,7 @@ spec: cordon: true upgrade: image: rancher/k3s-upgrade - version: v1.28.10+k3s1 + version: v1.30.3+k3s1 name: k3s-upgrade-bundle.yaml targets: # Match nothing, user needs to specify targets diff --git a/bundles/day2/system-upgrade-controller-plans/os-upgrade/os-upgrade-bundle.yaml b/bundles/day2/system-upgrade-controller-plans/os-upgrade/os-upgrade-bundle.yaml index d67870c..3f9d2c0 100644 --- a/bundles/day2/system-upgrade-controller-plans/os-upgrade/os-upgrade-bundle.yaml +++ b/bundles/day2/system-upgrade-controller-plans/os-upgrade/os-upgrade-bundle.yaml @@ -27,7 +27,7 @@ spec: cordon: true version: "3.1.0" prepare: - image: registry.opensuse.org/isv/suse/edge/lifecycle/containerfile/kubectl:1.30.3 + image: registry.suse.com/edge/3.1/kubectl:1.30.3 command: ["/bin/sh", "-c"] args: - | diff --git a/bundles/day2/system-upgrade-controller-plans/rke2-upgrade/plan-bundle.yaml b/bundles/day2/system-upgrade-controller-plans/rke2-upgrade/plan-bundle.yaml index d6b722f..c6c5a77 100644 --- a/bundles/day2/system-upgrade-controller-plans/rke2-upgrade/plan-bundle.yaml +++ b/bundles/day2/system-upgrade-controller-plans/rke2-upgrade/plan-bundle.yaml @@ -35,7 +35,7 @@ spec: cordon: true upgrade: image: rancher/rke2-upgrade - version: v1.28.10+rke2r1 + version: v1.30.3+rke2r1 --- # worker upgrade plan apiVersion: upgrade.cattle.io/v1 @@ -62,7 +62,7 @@ spec: force: true upgrade: image: rancher/rke2-upgrade - version: v1.28.10+rke2r1 + version: v1.30.3+rke2r1 name: rke2-upgrade-bundle.yaml targets: # Match nothing, user needs to specify targets diff --git a/bundles/day2/system-upgrade-controller/controller-bundle.yaml b/bundles/day2/system-upgrade-controller/controller-bundle.yaml deleted file mode 100644 index b830b44..0000000 --- a/bundles/day2/system-upgrade-controller/controller-bundle.yaml +++ /dev/null @@ -1,120 +0,0 @@ -kind: Bundle -apiVersion: fleet.cattle.io/v1alpha1 -metadata: - name: system-upgrade-controller - namespace: fleet-default -spec: - resources: - - content: | - # Source: system-upgrade-controller/templates/serviceaccount.yaml - apiVersion: v1 - kind: ServiceAccount - metadata: - name: system-upgrade-controller - namespace: cattle-system - --- - # Source: system-upgrade-controller/templates/configmap.yaml - apiVersion: v1 - kind: ConfigMap - metadata: - name: system-upgrade-controller-config - namespace: cattle-system - data: - SYSTEM_UPGRADE_CONTROLLER_DEBUG: "false" - SYSTEM_UPGRADE_CONTROLLER_THREADS: "2" - SYSTEM_UPGRADE_JOB_ACTIVE_DEADLINE_SECONDS: "900" - SYSTEM_UPGRADE_JOB_BACKOFF_LIMIT: "99" - SYSTEM_UPGRADE_JOB_IMAGE_PULL_POLICY: "IfNotPresent" - SYSTEM_UPGRADE_JOB_KUBECTL_IMAGE: rancher/kubectl:v1.23.3 - SYSTEM_UPGRADE_JOB_PRIVILEGED: "true" - SYSTEM_UPGRADE_JOB_TTL_SECONDS_AFTER_FINISH: "900" - SYSTEM_UPGRADE_PLAN_POLLING_INTERVAL: "15m" - --- - # Source: system-upgrade-controller/templates/clusterrolebinding.yaml - apiVersion: rbac.authorization.k8s.io/v1 - kind: ClusterRoleBinding - metadata: - name: system-upgrade-controller - roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: cluster-admin - subjects: - - kind: ServiceAccount - name: system-upgrade-controller - namespace: cattle-system - --- - # Source: system-upgrade-controller/templates/deployment.yaml - apiVersion: apps/v1 - kind: Deployment - metadata: - name: system-upgrade-controller - namespace: cattle-system - spec: - selector: - matchLabels: - upgrade.cattle.io/controller: system-upgrade-controller - template: - metadata: - labels: - upgrade.cattle.io/controller: system-upgrade-controller # necessary to avoid drain - spec: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: "kubernetes.io/os" - operator: NotIn - values: - - windows - preferredDuringSchedulingIgnoredDuringExecution: - - preference: - matchExpressions: - - key: node-role.kubernetes.io/control-plane - operator: In - values: - - "true" - weight: 100 - - preference: - matchExpressions: - - key: node-role.kubernetes.io/master - operator: In - values: - - "true" - weight: 100 - tolerations: - - operator: Exists - serviceAccountName: system-upgrade-controller - containers: - - name: system-upgrade-controller - image: rancher/system-upgrade-controller:v0.13.1 - imagePullPolicy: IfNotPresent - envFrom: - - configMapRef: - name: system-upgrade-controller-config - env: - - name: SYSTEM_UPGRADE_CONTROLLER_NAME - valueFrom: - fieldRef: - fieldPath: metadata.labels['upgrade.cattle.io/controller'] - - name: SYSTEM_UPGRADE_CONTROLLER_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - volumeMounts: - - name: etc-ssl - mountPath: /etc/ssl - - name: tmp - mountPath: /tmp - volumes: - - name: etc-ssl - hostPath: - path: /etc/ssl - type: Directory - - name: tmp - emptyDir: {} - name: controller-bundle.yaml - targets: - # Match nothing, user needs to specify targets - - clusterSelector: null diff --git a/fleets/day2/chart-templates/akri-dashboard-extension/fleet.yaml b/fleets/day2/chart-templates/akri-dashboard-extension/fleet.yaml index c1e5c84..8f098fb 100644 --- a/fleets/day2/chart-templates/akri-dashboard-extension/fleet.yaml +++ b/fleets/day2/chart-templates/akri-dashboard-extension/fleet.yaml @@ -2,7 +2,7 @@ defaultNamespace: cattle-ui-plugin-system helm: releaseName: akri-dashboard-extension - chart: "oci://registry.suse.com/edge/akri-dashboard-extension" - version: "1.0.0" + chart: "oci://registry.suse.com/edge/3.1/akri-dashboard-extension" + version: "1.1.0" # custom chart value overrides values: {} diff --git a/fleets/day2/chart-templates/akri/fleet.yaml b/fleets/day2/chart-templates/akri/fleet.yaml index 5049f1f..97069ff 100644 --- a/fleets/day2/chart-templates/akri/fleet.yaml +++ b/fleets/day2/chart-templates/akri/fleet.yaml @@ -2,7 +2,7 @@ defaultNamespace: akri helm: releaseName: akri - chart: "oci://registry.suse.com/edge/akri-chart" + chart: "oci://registry.suse.com/edge/3.1/akri-chart" version: "0.12.20" # custom chart value overrides diff --git a/fleets/day2/chart-templates/cdi/fleet.yaml b/fleets/day2/chart-templates/cdi/fleet.yaml index 57ed0c7..2128f6a 100644 --- a/fleets/day2/chart-templates/cdi/fleet.yaml +++ b/fleets/day2/chart-templates/cdi/fleet.yaml @@ -1,9 +1,9 @@ -defaultNamespace: kubevirt +defaultNamespace: cdi-system helm: releaseName: cdi - chart: "oci://registry.suse.com/edge/cdi-chart" - version: "0.3.0" + chart: "oci://registry.suse.com/edge/3.1/cdi-chart" + version: "0.4.0" # custom chart value overrides values: {} @@ -13,12 +13,12 @@ diff: - apiVersion: rbac.authorization.k8s.io/v1 kind: Role name: cdi-operator - namespace: kubevirt + namespace: cdi-system operations: - {"op":"remove", "path":"/metadata/labels"} - apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding name: cdi-operator - namespace: kubevirt + namespace: cdi-system operations: - {"op":"remove", "path":"/metadata/labels"} diff --git a/fleets/day2/chart-templates/elemental/elemental-dashboard-extension/fleet.yaml b/fleets/day2/chart-templates/elemental/elemental-dashboard-extension/fleet.yaml new file mode 100644 index 0000000..6daa887 --- /dev/null +++ b/fleets/day2/chart-templates/elemental/elemental-dashboard-extension/fleet.yaml @@ -0,0 +1,9 @@ +defaultNamespace: cattle-ui-plugin-system + +helm: + releaseName: elemental + chart: "elemental" + repo: "https://github.com/rancher/ui-plugin-charts/raw/main" + version: "2.0.0" + # custom chart value overrides + values: {} diff --git a/fleets/day2/chart-templates/elemental/elemental-operator-crds/fleet.yaml b/fleets/day2/chart-templates/elemental/elemental-operator-crds/fleet.yaml index 67688ce..66afcc8 100644 --- a/fleets/day2/chart-templates/elemental/elemental-operator-crds/fleet.yaml +++ b/fleets/day2/chart-templates/elemental/elemental-operator-crds/fleet.yaml @@ -3,6 +3,6 @@ defaultNamespace: cattle-elemental-system helm: releaseName: elemental-operator-crds chart: "oci://registry.suse.com/rancher/elemental-operator-crds-chart" - version: "1.4.4" + version: "1.6.4" # custom chart value overrides values: {} diff --git a/fleets/day2/chart-templates/elemental/elemental-operator/fleet.yaml b/fleets/day2/chart-templates/elemental/elemental-operator/fleet.yaml index 1c432d3..8ccea5e 100644 --- a/fleets/day2/chart-templates/elemental/elemental-operator/fleet.yaml +++ b/fleets/day2/chart-templates/elemental/elemental-operator/fleet.yaml @@ -3,7 +3,7 @@ defaultNamespace: cattle-elemental-system helm: releaseName: elemental-operator chart: "oci://registry.suse.com/rancher/elemental-operator-chart" - version: "1.4.4" + version: "1.6.4" # custom chart value overrides values: {} diff --git a/fleets/day2/chart-templates/endpoint-copier-operator/fleet.yaml b/fleets/day2/chart-templates/endpoint-copier-operator/fleet.yaml index 0694d83..b3e0ba3 100644 --- a/fleets/day2/chart-templates/endpoint-copier-operator/fleet.yaml +++ b/fleets/day2/chart-templates/endpoint-copier-operator/fleet.yaml @@ -2,7 +2,7 @@ defaultNamespace: endpoint-copier helm: releaseName: endpoint-copier-operator - chart: "oci://registry.suse.com/edge/endpoint-copier-operator-chart" - version: "0.2.0" + chart: "oci://registry.suse.com/edge/3.1/endpoint-copier-operator-chart" + version: "0.2.1" # custom chart value overrides values: {} diff --git a/fleets/day2/chart-templates/kubevirt-dashboard-extension/fleet.yaml b/fleets/day2/chart-templates/kubevirt-dashboard-extension/fleet.yaml index 9660043..64b6264 100644 --- a/fleets/day2/chart-templates/kubevirt-dashboard-extension/fleet.yaml +++ b/fleets/day2/chart-templates/kubevirt-dashboard-extension/fleet.yaml @@ -2,7 +2,7 @@ defaultNamespace: cattle-ui-plugin-system helm: releaseName: kubevirt-dashboard-extension - chart: "oci://registry.suse.com/edge/kubevirt-dashboard-extension-chart" - version: "1.0.0" + chart: "oci://registry.suse.com/edge/3.1/kubevirt-dashboard-extension-chart" + version: "1.1.0" # custom chart value overrides values: {} diff --git a/fleets/day2/chart-templates/kubevirt/fleet.yaml b/fleets/day2/chart-templates/kubevirt/fleet.yaml index 3221e51..72eca36 100644 --- a/fleets/day2/chart-templates/kubevirt/fleet.yaml +++ b/fleets/day2/chart-templates/kubevirt/fleet.yaml @@ -1,9 +1,9 @@ -defaultNamespace: kubevirt +defaultNamespace: kubevirt-system helm: releaseName: kubevirt - chart: "oci://registry.suse.com/edge/kubevirt-chart" - version: "0.3.0" + chart: "oci://registry.suse.com/edge/3.1/kubevirt-chart" + version: "0.4.0" # kubevirt namespace is created by kubevirt as well, we need to take ownership of it, otherwise it fails takeOwnership: true # custom chart value overrides @@ -15,6 +15,6 @@ diff: - apiVersion: kubevirt.io/v1 kind: KubeVirt name: kubevirt - namespace: kubevirt + namespace: kubevirt-system operations: - {"op":"remove", "path":"/spec/configuration/developerConfiguration/featureGates"} diff --git a/fleets/day2/chart-templates/longhorn/longhorn-crd/fleet.yaml b/fleets/day2/chart-templates/longhorn/longhorn-crd/fleet.yaml new file mode 100644 index 0000000..25da0dc --- /dev/null +++ b/fleets/day2/chart-templates/longhorn/longhorn-crd/fleet.yaml @@ -0,0 +1,9 @@ +defaultNamespace: longhorn-system + +helm: + releaseName: "longhorn-crd" + chart: "longhorn-crd" + repo: "https://charts.rancher.io/" + version: "104.2.0+up1.7.1" + # custom chart value overrides + values: {} diff --git a/fleets/day2/chart-templates/longhorn/fleet.yaml b/fleets/day2/chart-templates/longhorn/longhorn/fleet.yaml similarity index 94% rename from fleets/day2/chart-templates/longhorn/fleet.yaml rename to fleets/day2/chart-templates/longhorn/longhorn/fleet.yaml index 87e3012..3396c25 100644 --- a/fleets/day2/chart-templates/longhorn/fleet.yaml +++ b/fleets/day2/chart-templates/longhorn/longhorn/fleet.yaml @@ -3,8 +3,8 @@ defaultNamespace: longhorn-system helm: releaseName: "longhorn" chart: "longhorn" - repo: "https://charts.longhorn.io" - version: "1.6.1" + repo: "https://charts.rancher.io/" + version: "104.2.0+up1.7.1" takeOwnership: true # custom chart value overrides values: {} diff --git a/fleets/day2/chart-templates/metal3/fleet.yaml b/fleets/day2/chart-templates/metal3/fleet.yaml index 07a8230..392452c 100644 --- a/fleets/day2/chart-templates/metal3/fleet.yaml +++ b/fleets/day2/chart-templates/metal3/fleet.yaml @@ -2,7 +2,7 @@ defaultNamespace: metal3-system helm: releaseName: metal3 - chart: "oci://registry.suse.com/edge/metal3-chart" - version: "0.7.3" + chart: "oci://registry.suse.com/edge/3.1/metal3-chart" + version: "0.8.1" # custom chart value overrides values: {} diff --git a/fleets/day2/chart-templates/metallb/fleet.yaml b/fleets/day2/chart-templates/metallb/fleet.yaml index 7016f59..98f3d25 100644 --- a/fleets/day2/chart-templates/metallb/fleet.yaml +++ b/fleets/day2/chart-templates/metallb/fleet.yaml @@ -2,8 +2,8 @@ defaultNamespace: metallb-system helm: releaseName: metallb - chart: "oci://registry.suse.com/edge/metallb-chart" - version: "0.14.3" + chart: "oci://registry.suse.com/edge/3.1/metallb-chart" + version: "0.14.9" # custom chart value overrides values: {} diff --git a/fleets/day2/chart-templates/neuvector/neuvector-crd/fleet.yaml b/fleets/day2/chart-templates/neuvector/neuvector-crd/fleet.yaml new file mode 100644 index 0000000..541b82b --- /dev/null +++ b/fleets/day2/chart-templates/neuvector/neuvector-crd/fleet.yaml @@ -0,0 +1,9 @@ +defaultNamespace: neuvector-system + +helm: + releaseName: "neuvector-crd" + chart: "neuvector-crd" + repo: "https://charts.rancher.io" + version: "104.0.1+up2.7.9" + # custom chart value overrides + values: {} diff --git a/fleets/day2/chart-templates/neuvector/neuvector/fleet.yaml b/fleets/day2/chart-templates/neuvector/neuvector/fleet.yaml index dade76f..9f225a7 100644 --- a/fleets/day2/chart-templates/neuvector/neuvector/fleet.yaml +++ b/fleets/day2/chart-templates/neuvector/neuvector/fleet.yaml @@ -4,6 +4,6 @@ helm: releaseName: "neuvector" chart: "neuvector" repo: "https://charts.rancher.io" - version: "103.0.3+up2.7.6" + version: "104.0.1+up2.7.9" # custom chart value overrides values: {} diff --git a/fleets/day2/chart-templates/rancher-turtles-airgap-resources/fleet.yaml b/fleets/day2/chart-templates/rancher-turtles-airgap-resources/fleet.yaml new file mode 100644 index 0000000..c373996 --- /dev/null +++ b/fleets/day2/chart-templates/rancher-turtles-airgap-resources/fleet.yaml @@ -0,0 +1,8 @@ +defaultNamespace: rancher-turtles-system + +helm: + releaseName: rancher-turtles-airgap-resources + chart: "oci://registry.suse.com/edge/3.1/rancher-turtles-airgap-resources-chart" + version: "0.3.2" + # custom chart value overrides + values: {} diff --git a/fleets/day2/chart-templates/rancher-turtles/fleet.yaml b/fleets/day2/chart-templates/rancher-turtles/fleet.yaml new file mode 100644 index 0000000..3240be5 --- /dev/null +++ b/fleets/day2/chart-templates/rancher-turtles/fleet.yaml @@ -0,0 +1,69 @@ +defaultNamespace: rancher-turtles-system + +helm: + releaseName: rancher-turtles + chart: "oci://registry.suse.com/edge/3.1/rancher-turtles-chart" + version: "0.3.2" + # custom chart value overrides + values: {} + +diff: + comparePatches: + - apiVersion: apiextensions.k8s.io/v1 + kind: CustomResourceDefinition + name: addonproviders.operator.cluster.x-k8s.io + operations: + - {"op":"remove", "path":"/spec/conversion/webhook/clientConfig/caBundle"} + - apiVersion: apiextensions.k8s.io/v1 + kind: CustomResourceDefinition + name: bootstrapproviders.operator.cluster.x-k8s.io + operations: + - {"op":"remove", "path":"/spec/conversion/webhook/clientConfig/caBundle"} + - apiVersion: apiextensions.k8s.io/v1 + kind: CustomResourceDefinition + name: controlplaneproviders.operator.cluster.x-k8s.io + operations: + - {"op":"remove", "path":"/spec/conversion/webhook/clientConfig/caBundle"} + - apiVersion: apiextensions.k8s.io/v1 + kind: CustomResourceDefinition + name: coreproviders.operator.cluster.x-k8s.io + operations: + - {"op":"remove", "path":"/spec/conversion/webhook/clientConfig/caBundle"} + - apiVersion: apiextensions.k8s.io/v1 + kind: CustomResourceDefinition + name: infrastructureproviders.operator.cluster.x-k8s.io + operations: + - {"op":"remove", "path":"/spec/conversion/webhook/clientConfig/caBundle"} + - apiVersion: apiextensions.k8s.io/v1 + kind: CustomResourceDefinition + name: ipamproviders.operator.cluster.x-k8s.io + operations: + - {"op":"remove", "path":"/spec/conversion/webhook/clientConfig/caBundle"} + - apiVersion: apiextensions.k8s.io/v1 + kind: CustomResourceDefinition + name: runtimeextensionproviders.operator.cluster.x-k8s.io + operations: + - {"op":"remove", "path":"/spec/conversion/webhook/clientConfig/caBundle"} + - apiVersion: rbac.authorization.k8s.io/v1 + kind: ClusterRoleBinding + name: rancher-turtles-manager-rolebinding + operations: + - {"op":"remove", "path":"/metadata/labels"} + - apiVersion: rbac.authorization.k8s.io/v1 + kind: Role + name: rancher-turtles-leader-election-role + namespace: rancher-turtles-system + operations: + - {"op":"remove", "path":"/metadata/labels"} + - apiVersion: rbac.authorization.k8s.io/v1 + kind: RoleBinding + name: rancher-turtles-leader-election-rolebinding + namespace: rancher-turtles-system + operations: + - {"op":"remove", "path":"/metadata/labels"} + - apiVersion: v1 + kind: ServiceAccount + name: rancher-turtles-manager + namespace: rancher-turtles-system + operations: + - {"op":"remove", "path":"/metadata/labels"} diff --git a/fleets/day2/chart-templates/rancher/fleet.yaml b/fleets/day2/chart-templates/rancher/fleet.yaml index 98ec3ce..383d281 100644 --- a/fleets/day2/chart-templates/rancher/fleet.yaml +++ b/fleets/day2/chart-templates/rancher/fleet.yaml @@ -4,6 +4,6 @@ helm: releaseName: "rancher" chart: "rancher" repo: "https://charts.rancher.com/server-charts/prime" - version: "2.8.5" + version: "2.9.1" # custom chart value overrides values: {} diff --git a/fleets/day2/chart-templates/sriov/sriov-crd/fleet.yaml b/fleets/day2/chart-templates/sriov/sriov-crd/fleet.yaml index c5e7e1a..46efac5 100644 --- a/fleets/day2/chart-templates/sriov/sriov-crd/fleet.yaml +++ b/fleets/day2/chart-templates/sriov/sriov-crd/fleet.yaml @@ -2,7 +2,7 @@ defaultNamespace: sriov-network-operator helm: releaseName: sriov-crd-chart - chart: "oci://registry.suse.com/edge/sriov-crd-chart" - version: "1.2.2" + chart: "oci://registry.suse.com/edge/3.1/sriov-crd-chart" + version: "1.3.0" # custom chart value overrides values: {} diff --git a/fleets/day2/chart-templates/sriov/sriov-network-operator/fleet.yaml b/fleets/day2/chart-templates/sriov/sriov-network-operator/fleet.yaml index 4ff5981..c14f638 100644 --- a/fleets/day2/chart-templates/sriov/sriov-network-operator/fleet.yaml +++ b/fleets/day2/chart-templates/sriov/sriov-network-operator/fleet.yaml @@ -2,7 +2,7 @@ defaultNamespace: sriov-network-operator helm: releaseName: sriov-network-operator-chart - chart: "oci://registry.suse.com/edge/sriov-network-operator-chart" - version: "1.2.2" + chart: "oci://registry.suse.com/edge/3.1/sriov-network-operator-chart" + version: "1.3.0" # custom chart value overrides values: {} diff --git a/fleets/day2/chart-templates/ui-plugin-operator/ui-plugin-operator-crd/fleet.yaml b/fleets/day2/chart-templates/ui-plugin-operator/ui-plugin-operator-crd/fleet.yaml deleted file mode 100644 index 01f3e3b..0000000 --- a/fleets/day2/chart-templates/ui-plugin-operator/ui-plugin-operator-crd/fleet.yaml +++ /dev/null @@ -1,9 +0,0 @@ -defaultNamespace: cattle-ui-plugin-system - -helm: - releaseName: "ui-plugin-operator" - chart: "ui-plugin-operator-crd" - repo: "https://charts.rancher.io/" - version: "103.0.2+up0.2.1" - # custom chart value overrides - values: {} diff --git a/fleets/day2/chart-templates/ui-plugin-operator/ui-plugin-operator/fleet.yaml b/fleets/day2/chart-templates/ui-plugin-operator/ui-plugin-operator/fleet.yaml deleted file mode 100644 index 24c6af2..0000000 --- a/fleets/day2/chart-templates/ui-plugin-operator/ui-plugin-operator/fleet.yaml +++ /dev/null @@ -1,9 +0,0 @@ -defaultNamespace: cattle-ui-plugin-system - -helm: - releaseName: "ui-plugin-operator" - chart: "ui-plugin-operator" - repo: "https://charts.rancher.io/" - version: "103.0.2+up0.2.1" - # custom chart value overrides - values: {} diff --git a/fleets/day2/eib-charts-upgrader/base/job.yaml b/fleets/day2/eib-charts-upgrader/base/job.yaml index f14f37d..61abcf8 100644 --- a/fleets/day2/eib-charts-upgrader/base/job.yaml +++ b/fleets/day2/eib-charts-upgrader/base/job.yaml @@ -8,7 +8,7 @@ spec: serviceAccountName: eib-charts-upgrader containers: - name: kubectl-container - image: registry.opensuse.org/isv/suse/edge/lifecycle/containerfile/kubectl:1.30.3 + image: registry.suse.com/edge/3.1/kubectl:1.30.3 command: ["/bin/sh", "-c"] args: ["/tmp/scripts/chartPatch.sh"] volumeMounts: diff --git a/fleets/day2/system-upgrade-controller-plans/eib-charts-migration-prep/plan.yaml b/fleets/day2/system-upgrade-controller-plans/eib-charts-migration-prep/plan.yaml index 276ed19..cba3f87 100644 --- a/fleets/day2/system-upgrade-controller-plans/eib-charts-migration-prep/plan.yaml +++ b/fleets/day2/system-upgrade-controller-plans/eib-charts-migration-prep/plan.yaml @@ -27,7 +27,7 @@ spec: # Version of the specific Edge release that this Plan relates to version: "3.1.0" upgrade: - image: registry.opensuse.org/isv/suse/edge/lifecycle/containerfile/kubectl:1.30.3 + image: registry.suse.com/edge/3.1/kubectl:1.30.3 command: ["/bin/sh", "/host/run/system-upgrade/secrets/migration-prep-script/prepare_chart_migration.sh"] # For when you want to backup your chart # manifest data under a specific directory diff --git a/fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-agent.yaml b/fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-agent.yaml index 8d59198..2cde034 100644 --- a/fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-agent.yaml +++ b/fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-agent.yaml @@ -20,4 +20,4 @@ spec: cordon: true upgrade: image: rancher/k3s-upgrade - version: v1.28.10+k3s1 + version: v1.30.3+k3s1 diff --git a/fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-control-plane.yaml b/fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-control-plane.yaml index 0b51e6f..43ddff8 100644 --- a/fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-control-plane.yaml +++ b/fleets/day2/system-upgrade-controller-plans/k3s-upgrade/plan-control-plane.yaml @@ -25,4 +25,4 @@ spec: cordon: true upgrade: image: rancher/k3s-upgrade - version: v1.28.10+k3s1 + version: v1.30.3+k3s1 diff --git a/fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-agent.yaml b/fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-agent.yaml index 0555c3f..034511e 100644 --- a/fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-agent.yaml +++ b/fleets/day2/system-upgrade-controller-plans/os-upgrade/plan-agent.yaml @@ -18,7 +18,7 @@ spec: cordon: true version: "3.1.0" prepare: - image: registry.opensuse.org/isv/suse/edge/lifecycle/containerfile/kubectl:1.30.3 + image: registry.suse.com/edge/3.1/kubectl:1.30.3 command: ["/bin/sh", "-c"] args: - | diff --git a/fleets/day2/system-upgrade-controller-plans/rke2-upgrade/plan-agent.yaml b/fleets/day2/system-upgrade-controller-plans/rke2-upgrade/plan-agent.yaml index 8a9335e..1811be5 100644 --- a/fleets/day2/system-upgrade-controller-plans/rke2-upgrade/plan-agent.yaml +++ b/fleets/day2/system-upgrade-controller-plans/rke2-upgrade/plan-agent.yaml @@ -21,4 +21,4 @@ spec: force: true upgrade: image: rancher/rke2-upgrade - version: v1.28.10+rke2r1 + version: v1.30.3+rke2r1 diff --git a/fleets/day2/system-upgrade-controller-plans/rke2-upgrade/plan-control-plane.yaml b/fleets/day2/system-upgrade-controller-plans/rke2-upgrade/plan-control-plane.yaml index 4223b1c..b5b57a5 100644 --- a/fleets/day2/system-upgrade-controller-plans/rke2-upgrade/plan-control-plane.yaml +++ b/fleets/day2/system-upgrade-controller-plans/rke2-upgrade/plan-control-plane.yaml @@ -25,4 +25,4 @@ spec: cordon: true upgrade: image: rancher/rke2-upgrade - version: v1.28.10+rke2r1 + version: v1.30.3+rke2r1 diff --git a/fleets/day2/system-upgrade-controller/fleet.yaml b/fleets/day2/system-upgrade-controller/fleet.yaml index 01e07e6..a634e94 100644 --- a/fleets/day2/system-upgrade-controller/fleet.yaml +++ b/fleets/day2/system-upgrade-controller/fleet.yaml @@ -2,7 +2,7 @@ defaultNamespace: cattle-system helm: releaseName: system-upgrade-controller chart: "system-upgrade-controller" - version: "103.0.1+up0.6.0" + version: "104.0.0+up0.7.0" repo: "https://charts.rancher.io/" values: global: diff --git a/fleets/general/rancher-ui-plugin-operator/rancher-ui-plugin-operator-crd/fleet.yaml b/fleets/general/rancher-ui-plugin-operator/rancher-ui-plugin-operator-crd/fleet.yaml deleted file mode 100644 index b3dfbe4..0000000 --- a/fleets/general/rancher-ui-plugin-operator/rancher-ui-plugin-operator-crd/fleet.yaml +++ /dev/null @@ -1,8 +0,0 @@ -defaultNamespace: cattle-ui-plugin-system -labels: - chart: "rancher-ui-plugin-operator-crd" -helm: - releaseName: ui-plugin-operator-crd - chart: "ui-plugin-operator-crd" - repo: "https://charts.rancher.io/" - values: {} diff --git a/fleets/general/rancher-ui-plugin-operator/rancher-ui-plugin-operator/fleet.yaml b/fleets/general/rancher-ui-plugin-operator/rancher-ui-plugin-operator/fleet.yaml deleted file mode 100644 index d1031a6..0000000 --- a/fleets/general/rancher-ui-plugin-operator/rancher-ui-plugin-operator/fleet.yaml +++ /dev/null @@ -1,9 +0,0 @@ -defaultNamespace: cattle-ui-plugin-system -helm: - releaseName: ui-plugin-operator - chart: "ui-plugin-operator" - repo: "https://charts.rancher.io/" -dependsOn: - - selector: - matchLabels: - chart: "rancher-ui-plugin-operator-crd" \ No newline at end of file diff --git a/gitrepos/day2/k3s-upgrade-gitrepo.yaml b/gitrepos/day2/k3s-upgrade-gitrepo.yaml index e50895e..79d4f1b 100644 --- a/gitrepos/day2/k3s-upgrade-gitrepo.yaml +++ b/gitrepos/day2/k3s-upgrade-gitrepo.yaml @@ -4,7 +4,7 @@ metadata: name: k3s-upgrade namespace: fleet-default spec: - revision: release-3.0.2 + revision: release-3.1.0 paths: - fleets/day2/system-upgrade-controller-plans/k3s-upgrade repo: https://github.com/suse-edge/fleet-examples.git diff --git a/gitrepos/day2/os-update-gitrepo.yaml b/gitrepos/day2/os-update-gitrepo.yaml index e047a3d..de8d442 100644 --- a/gitrepos/day2/os-update-gitrepo.yaml +++ b/gitrepos/day2/os-update-gitrepo.yaml @@ -4,7 +4,7 @@ metadata: name: os-upgrade namespace: fleet-default spec: - revision: release-3.0.2 + revision: release-3.1.0 paths: - fleets/day2/system-upgrade-controller-plans/os-upgrade repo: https://github.com/suse-edge/fleet-examples.git diff --git a/gitrepos/day2/rke2-upgrade-gitrepo.yaml b/gitrepos/day2/rke2-upgrade-gitrepo.yaml index 29d07a9..a1dcd93 100644 --- a/gitrepos/day2/rke2-upgrade-gitrepo.yaml +++ b/gitrepos/day2/rke2-upgrade-gitrepo.yaml @@ -4,7 +4,7 @@ metadata: name: rke2-upgrade namespace: fleet-default spec: - revision: release-3.0.2 + revision: release-3.1.0 paths: - fleets/day2/system-upgrade-controller-plans/rke2-upgrade repo: https://github.com/suse-edge/fleet-examples.git diff --git a/gitrepos/day2/system-upgrade-controller-gitrepo.yaml b/gitrepos/day2/system-upgrade-controller-gitrepo.yaml index 49e43e7..ae5fcb5 100644 --- a/gitrepos/day2/system-upgrade-controller-gitrepo.yaml +++ b/gitrepos/day2/system-upgrade-controller-gitrepo.yaml @@ -4,7 +4,7 @@ metadata: name: system-upgrade-controller namespace: fleet-default spec: - revision: release-3.0.2 + revision: release-3.1.0 paths: - fleets/day2/system-upgrade-controller repo: https://github.com/suse-edge/fleet-examples.git diff --git a/gitrepos/general/elemental-gitrepo.yaml b/gitrepos/general/elemental-gitrepo.yaml index 5db4d90..02fb9b7 100644 --- a/gitrepos/general/elemental-gitrepo.yaml +++ b/gitrepos/general/elemental-gitrepo.yaml @@ -8,5 +8,3 @@ spec: branch: main paths: - fleets/general/elemental/ - # If the rancher ui plugin operator is not deployed, enable this - # - fleets/rancher-ui-plugin-operator \ No newline at end of file diff --git a/gitrepos/general/opni-gitrepo.yaml b/gitrepos/general/opni-gitrepo.yaml index ebfba6b..0087e0c 100644 --- a/gitrepos/general/opni-gitrepo.yaml +++ b/gitrepos/general/opni-gitrepo.yaml @@ -8,5 +8,3 @@ spec: branch: main paths: - fleets/general/opni/ - # If the rancher ui plugin operator is not deployed, enable this - # - fleets/rancher-ui-plugin-operator \ No newline at end of file diff --git a/gitrepos/general/rancher-ui-plugin-operator-gitrepo.yaml b/gitrepos/general/rancher-ui-plugin-operator-gitrepo.yaml deleted file mode 100644 index 0fe89d7..0000000 --- a/gitrepos/general/rancher-ui-plugin-operator-gitrepo.yaml +++ /dev/null @@ -1,10 +0,0 @@ -kind: GitRepo -apiVersion: fleet.cattle.io/v1alpha1 -metadata: - name: rancher-ui-plugin-operator - namespace: fleet-local -spec: - repo: https://github.com/suse-edge/fleet-examples.git - branch: main - paths: - - fleets/general/rancher-ui-plugin-operator/ \ No newline at end of file diff --git a/scripts/day2/edge-release-helm-oci-artefacts.txt b/scripts/day2/edge-release-helm-oci-artefacts.txt index 4cd75bf..ec355e7 100644 --- a/scripts/day2/edge-release-helm-oci-artefacts.txt +++ b/scripts/day2/edge-release-helm-oci-artefacts.txt @@ -1,8 +1,13 @@ -edge/akri-chart:0.12.20 -edge/akri-dashboard-extension-chart:1.0.0 -edge/cdi-chart:0.3.0 -edge/endpoint-copier-operator-chart:0.2.0 -edge/kubevirt-chart:0.3.0 -edge/kubevirt-dashboard-extension-chart:1.0.0 -edge/metal3-chart:0.7.3 -edge/metallb-chart:0.14.3 +edge/3.1/akri-chart:0.12.20 +edge/3.1/akri-dashboard-extension-chart:1.1.0 +edge/3.1/cdi-chart:0.4.0 +edge/3.1/endpoint-copier-operator-chart:0.2.1 +edge/3.1/kubevirt-chart:0.4.0 +edge/3.1/kubevirt-dashboard-extension-chart:1.1.0 +edge/3.1/metal3-chart:0.8.1 +edge/3.1/metallb-chart:0.14.9 +edge/3.1/sriov-crd-chart:1.3.0 +edge/3.1/sriov-network-operator-chart:1.3.0 +edge/3.1/rancher-turtles-chart:0.3.2 +edge/3.1/rancher-turtles-airgap-resources-chart:0.3.2 +edge/3.1/upgrade-controller-chart:0.1.0 diff --git a/scripts/day2/edge-release-images.txt b/scripts/day2/edge-release-images.txt index 8913497..5b89bea 100644 --- a/scripts/day2/edge-release-images.txt +++ b/scripts/day2/edge-release-images.txt @@ -1,38 +1,40 @@ -edge/akri-agent:v0.12.20 -edge/akri-controller:v0.12.20 -edge/akri-debug-echo-discovery-handler:v0.12.20 -edge/akri-onvif-discovery-handler:v0.12.20 -edge/akri-opcua-discovery-handler:v0.12.20 -edge/akri-udev-discovery-handler:v0.12.20 -edge/akri-webhook-configuration:v0.12.20 -edge/baremetal-operator:0.5.1 -edge/cluster-api-controller:v1.6.2 -edge/ip-address-manager:1.6.0 -edge/cluster-api-provider-metal3:v1.6.0 -edge/cluster-api-provider-rke2-bootstrap:0.4.1 -edge/cluster-api-provider-rke2-controlplane:0.4.1 -edge/edge-image-builder:1.0.1 -edge/endpoint-copier-operator:v0.2.0 -edge/frr:8.4 -edge/frr-k8s:v0.0.8 -edge/ip-address-manager:v1.6.0 -edge/ironic:23.0.2.1 -edge/ironic-ipa-downloader:1.3.4 -edge/kube-rbac-proxy:v0.14.2 +edge/3.1/akri-agent:v0.12.20 +edge/3.1/akri-controller:v0.12.20 +edge/3.1/akri-debug-echo-discovery-handler:v0.12.20 +edge/3.1/akri-onvif-discovery-handler:v0.12.20 +edge/3.1/akri-opcua-discovery-handler:v0.12.20 +edge/3.1/akri-udev-discovery-handler:v0.12.20 +edge/3.1/akri-webhook-configuration:v0.12.20 +edge/3.1/baremetal-operator:0.6.1 +edge/3.1/cluster-api-controller:v1.7.5 +edge/3.1/ip-address-manager:1.7.1 +edge/3.1/cluster-api-provider-metal3:v1.7.1 +edge/3.1/cluster-api-provider-rke2-bootstrap:0.7.0 +edge/3.1/cluster-api-provider-rke2-controlplane:0.7.0 +edge/3.1/edge-image-builder:1.1.0 +edge/3.1/endpoint-copier-operator:0.2.1 +edge/3.1/frr:8.4 +edge/3.1/frr-k8s:v0.0.14 +edge/3.1/ironic:24.1.2.0 +edge/3.1/ironic-ipa-downloader:2.0.0 +edge/3.1/kube-rbac-proxy:v0.18.0 edge/mariadb:10.6.15.1 -edge/metallb-controller:v0.14.3 -edge/metallb-speaker:v0.14.3 -suse/sles/15.5/cdi-operator:1.59.0-150500.6.18.1 -suse/sles/15.5/cdi-controller:1.59.0-150500.6.18.1 -suse/sles/15.5/cdi-importer:1.59.0-150500.6.18.1 -suse/sles/15.5/cdi-cloner:1.59.0-150500.6.18.1 -suse/sles/15.5/cdi-apiserver:1.59.0-150500.6.18.1 -suse/sles/15.5/cdi-uploadserver:1.59.0-150500.6.18.1 -suse/sles/15.5/cdi-uploadproxy:1.59.0-150500.6.18.1 -suse/sles/15.5/virt-operator:1.2.2-150500.8.21.1 -suse/sles/15.5/virt-launcher:1.2.2-150500.8.21.1 -suse/sles/15.5/virt-handler:1.2.2-150500.8.21.1 -suse/sles/15.5/virt-controller:1.2.2-150500.8.21.1 -suse/sles/15.5/virt-api:1.2.2-150500.8.21.1 -suse/sles/15.5/virt-exportproxy:1.2.2-150500.8.21.1 -suse/sles/15.5/virt-exportserver:1.2.2-150500.8.21.1 +edge/3.1/metallb-controller:v0.14.8 +edge/3.1/metallb-speaker:v0.14.8 +suse/sles/15.6/cdi-operator:1.60.1-150600.3.9.1 +suse/sles/15.6/cdi-controller:1.60.1-150600.3.9.1 +suse/sles/15.6/cdi-importer:1.60.1-150600.3.9.1 +suse/sles/15.6/cdi-cloner:1.60.1-150600.3.9.1 +suse/sles/15.6/cdi-apiserver:1.60.1-150600.3.9.1 +suse/sles/15.6/cdi-uploadserver:1.60.1-150600.3.9.1 +suse/sles/15.6/cdi-uploadproxy:1.60.1-150600.3.9.1 +suse/sles/15.6/virt-operator:1.3.1-150600.5.9.1 +suse/sles/15.6/virt-launcher:1.3.1-150600.5.9.1 +suse/sles/15.6/virt-handler:1.3.1-150600.5.9.1 +suse/sles/15.6/virt-controller:1.3.1-150600.5.9.1 +suse/sles/15.6/virt-api:1.3.1-150600.5.9.1 +suse/sles/15.6/virt-exportproxy:1.3.1-150600.5.9.1 +suse/sles/15.6/virt-exportserver:1.3.1-150600.5.9.1 +edge/3.1/upgrade-controller:0.1.0 +edge/3.1/kubectl:1.30.3 +edge/3.1/release-manifest:3.1.0 diff --git a/scripts/day2/edge-release-rke2-images.txt b/scripts/day2/edge-release-rke2-images.txt index c0890eb..f89b481 100644 --- a/scripts/day2/edge-release-rke2-images.txt +++ b/scripts/day2/edge-release-rke2-images.txt @@ -1,6 +1,6 @@ -https://github.com/rancher/rke2/releases/download/v1.28.10%2Brke2r1/sha256sum-amd64.txt -https://github.com/rancher/rke2/releases/download/v1.28.10%2Brke2r1/rke2.linux-amd64.tar.gz -https://github.com/rancher/rke2/releases/download/v1.28.10%2Brke2r1/rke2-images.linux-amd64.tar.zst -https://github.com/rancher/rke2/releases/download/v1.28.10%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst -https://github.com/rancher/rke2/releases/download/v1.28.10%2Brke2r1/rke2-images-core.linux-amd64.tar.zst -https://github.com/rancher/rke2/releases/download/v1.28.10%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst +https://github.com/rancher/rke2/releases/download/v1.30.3%2Brke2r1/sha256sum-amd64.txt +https://github.com/rancher/rke2/releases/download/v1.30.3%2Brke2r1/rke2.linux-amd64.tar.gz +https://github.com/rancher/rke2/releases/download/v1.30.3%2Brke2r1/rke2-images.linux-amd64.tar.zst +https://github.com/rancher/rke2/releases/download/v1.30.3%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst +https://github.com/rancher/rke2/releases/download/v1.30.3%2Brke2r1/rke2-images-core.linux-amd64.tar.zst +https://github.com/rancher/rke2/releases/download/v1.30.3%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst