dprodanov/Factory
SHA256
1
0
Fork 0
forked from suse-edge/Factory
Code Pull Requests Activity

Merge pull request '[3.2] Backport rancher-turtles updates' (#47) from steven.hardy/Factory:turtles_3.2 into 3.2

Browse Source 
Reviewed-on: suse-edge/Factory#47
Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org>
This commit is contained in:
Denislav Prodanov 2024-12-06 10:57:08 +01:00
commit 14b56eabbe
19 changed files with 277 additions and 404 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.obs/workflows.yml
View File

@ -94,26 +94,14 @@ staging_build:
source_package: hauler source_package: hauler
source_project: isv:SUSE:Edge:3.2 source_project: isv:SUSE:Edge:3.2
target_project: isv:SUSE:Edge:3.2:Staging target_project: isv:SUSE:Edge:3.2:Staging
- branch_package:
source_package: ip-address-manager
source_project: isv:SUSE:Edge:3.2
target_project: isv:SUSE:Edge:3.2:Staging
- branch_package: - branch_package:
source_package: baremetal-operator source_package: baremetal-operator
source_project: isv:SUSE:Edge:3.2 source_project: isv:SUSE:Edge:3.2
target_project: isv:SUSE:Edge:3.2:Staging target_project: isv:SUSE:Edge:3.2:Staging
- branch_package:
source_package: cluster-api-provider-metal3
source_project: isv:SUSE:Edge:3.2
target_project: isv:SUSE:Edge:3.2:Staging
- branch_package: - branch_package:
source_package: cdi-chart source_package: cdi-chart
source_project: isv:SUSE:Edge:3.2 source_project: isv:SUSE:Edge:3.2
target_project: isv:SUSE:Edge:3.2:Staging target_project: isv:SUSE:Edge:3.2:Staging
- branch_package:
source_package: cluster-api-provider-metal3-image
source_project: isv:SUSE:Edge:3.2
target_project: isv:SUSE:Edge:3.2:Staging
- branch_package: - branch_package:
source_package: metallb-chart source_package: metallb-chart
source_project: isv:SUSE:Edge:3.2 source_project: isv:SUSE:Edge:3.2
@ -154,10 +142,6 @@ staging_build:
source_package: metallb-controller-image source_package: metallb-controller-image
source_project: isv:SUSE:Edge:3.2 source_project: isv:SUSE:Edge:3.2
target_project: isv:SUSE:Edge:3.2:Staging target_project: isv:SUSE:Edge:3.2:Staging
- branch_package:
source_package: ip-address-manager-image
source_project: isv:SUSE:Edge:3.2
target_project: isv:SUSE:Edge:3.2:Staging
- branch_package: - branch_package:
source_package: metallb-speaker-image source_package: metallb-speaker-image
source_project: isv:SUSE:Edge:3.2 source_project: isv:SUSE:Edge:3.2

36
cluster-api-provider-metal3-image/Dockerfile
View File

@ -1,36 +0,0 @@
# SPDX-License-Identifier: Apache-2.0
#!BuildTag: %%IMG_PREFIX%%cluster-api-provider-metal3:v%%cluster-api-provider-metal3_version%%
#!BuildTag: %%IMG_PREFIX%%cluster-api-provider-metal3:%%cluster-api-provider-metal3_version%%
#!BuildTag: %%IMG_PREFIX%%cluster-api-provider-metal3:%%cluster-api-provider-metal3_version%%-%RELEASE%
#!BuildVersion: 15.6
ARG SLE_VERSION
FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro
FROM registry.suse.com/bci/bci-base:$SLE_VERSION AS base
COPY --from=micro / /installroot/
RUN zypper --installroot /installroot --non-interactive install --no-recommends cluster-api-provider-metal3 shadow; zypper -n clean; rm -rf /var/log/*
FROM micro AS final
# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=com.suse.application.cluster-api-provider-metal3
LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
LABEL org.opencontainers.image.title="SLE cluster-api-provider-metal3 Container Image"
LABEL org.opencontainers.image.description="cluster-api-provider-metal3 based on the SLE Base Container Image."
LABEL org.opencontainers.image.version="%%cluster-api-provider-metal3_version%%"
LABEL org.opencontainers.image.url="https://www.suse.com/products/server/"
LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="SUSE LLC"
LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%cluster-api-provider-metal3:%%cluster-api-provider-metal3_version%%-%RELEASE%"
LABEL org.openbuildservice.disturl="%DISTURL%"
LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
LABEL com.suse.eula="SUSE Combined EULA February 2024"
LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle"
LABEL com.suse.image-type="application"
LABEL com.suse.release-stage="released"
# endlabelprefix
COPY --from=base /installroot /
RUN mv /usr/bin/cluster-api-provider-metal3 /manager
# Use uid of nonroot user (65532) because kubernetes expects numeric user when applying pod security policies
USER 65532
ENTRYPOINT [ "/manager" ]

19
cluster-api-provider-metal3-image/_service
View File

@ -1,19 +0,0 @@
<services>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service mode="buildtime" name="docker_label_helper"/>
<service name="replace_using_package_version" mode="buildtime">
<param name="file">Dockerfile</param>
<param name="regex">%%cluster-api-provider-metal3_version%%</param>
<param name="package">cluster-api-provider-metal3</param>
<param name="parse-version">patch</param>
</service>
<service name="replace_using_env" mode="buildtime">
<param name="file">Dockerfile</param>
<param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix})</param>
<param name="var">IMG_PREFIX</param>
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
<param name="var">IMG_REPO</param>
<param name="eval">SUPPORT_LEVEL=$(rpm --macros=/root/.rpmmacros -E %support_level)</param>
<param name="var">SUPPORT_LEVEL</param>
</service>
</services>

23
cluster-api-provider-metal3/_service
View File

@ -1,23 +0,0 @@
<services>
<service name="obs_scm">
<param name="url">https://github.com/metal3-io/cluster-api-provider-metal3</param>
<param name="scm">git</param>
<param name="revision">v1.7.2</param>
<param name="version">_auto_</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="changesauthor">steven.hardy@suse.com</param>
<param name="match-tag">v*</param>
<param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param>
<param name="without-version">yes</param>
<param name="versionrewrite-replacement">\1</param>
</service>
<service mode="buildtime" name="tar" />
<service mode="buildtime" name="recompress">
<param name="file">*.tar</param>
<param name="compression">gz</param>
</service>
<service name="go_modules">
</service>
<service mode="buildtime" name="set_version" />
</services>

54
cluster-api-provider-metal3/cluster-api-provider-metal3.spec
View File

@ -1,54 +0,0 @@
#
# spec file for package cluster-api-provider-metal3
#
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: cluster-api-provider-metal3
Version: 1.7.2
Release: 0
Summary: Cluster API Infrastructure Provider for Metal3
License: Apache-2.0
URL: https://github.com/metal3-io/cluster-api-provider-metal3
Source: cluster-api-provider-metal3-%{version}.tar.gz
Source1: vendor.tar.gz
BuildRequires: golang(API) = 1.22
ExcludeArch: s390
ExcludeArch: %{ix86}
%description
Cluster API Provider Metal3 is one of the providers for Cluster API and enables
users to deploy a Cluster API based cluster on top of bare metal infrastructure
using Metal3.
%prep
%autosetup -a1 -n cluster-api-provider-metal3-%{version}
%build
go build \
-mod=vendor \
-buildmode=pie \
-a -ldflags '-extldflags "-static"'
%install
install -D -m0755 cluster-api-provider-metal3 %{buildroot}%{_bindir}/cluster-api-provider-metal3
%files
%license LICENSE
%doc README.md
%{_bindir}/cluster-api-provider-metal3
%changelog

36
ip-address-manager-image/Dockerfile
View File

@ -1,36 +0,0 @@
# SPDX-License-Identifier: Apache-2.0
#!BuildTag: %%IMG_PREFIX%%ip-address-manager:v%%ip-address-manager_version%%
#!BuildTag: %%IMG_PREFIX%%ip-address-manager:%%ip-address-manager_version%%
#!BuildTag: %%IMG_PREFIX%%ip-address-manager:%%ip-address-manager_version%%-%RELEASE%
#!BuildVersion: 15.6
ARG SLE_VERSION
FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro
FROM registry.suse.com/bci/bci-base:$SLE_VERSION AS base
COPY --from=micro / /installroot/
RUN zypper --installroot /installroot --non-interactive install --no-recommends ip-address-manager shadow; zypper -n clean; rm -rf /var/log/*
FROM micro AS final
# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=com.suse.application.ip-address-manager
LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
LABEL org.opencontainers.image.title="SLE ip-address-manager Container Image"
LABEL org.opencontainers.image.description="ip-address-manager based on the SLE Base Container Image."
LABEL org.opencontainers.image.version="%%ip-address-manager_version%%"
LABEL org.opencontainers.image.url="https://www.suse.com/products/server/"
LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="SUSE LLC"
LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%ip-address-manager:%%ip-address-manager_version%%-%RELEASE%"
LABEL org.openbuildservice.disturl="%DISTURL%"
LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
LABEL com.suse.eula="SUSE Combined EULA February 2024"
LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle"
LABEL com.suse.image-type="application"
LABEL com.suse.release-stage="released"
# endlabelprefix
COPY --from=base /installroot /
RUN mv /usr/bin/ip-address-manager /manager
# Use uid of nonroot user (65532) because kubernetes expects numeric user when applying pod security policies
USER 65532
ENTRYPOINT [ "/manager" ]

19
ip-address-manager-image/_service
View File

@ -1,19 +0,0 @@
<services>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service mode="buildtime" name="docker_label_helper"/>
<service name="replace_using_package_version" mode="buildtime">
<param name="file">Dockerfile</param>
<param name="regex">%%ip-address-manager_version%%</param>
<param name="package">ip-address-manager</param>
<param name="parse-version">patch</param>
</service>
<service name="replace_using_env" mode="buildtime">
<param name="file">Dockerfile</param>
<param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix})</param>
<param name="var">IMG_PREFIX</param>
<param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
<param name="var">IMG_REPO</param>
<param name="eval">SUPPORT_LEVEL=$(rpm --macros=/root/.rpmmacros -E %support_level)</param>
<param name="var">SUPPORT_LEVEL</param>
</service>
</services>

23
ip-address-manager/_service
View File

@ -1,23 +0,0 @@
<services>
<service name="obs_scm">
<param name="url">https://github.com/metal3-io/ip-address-manager</param>
<param name="scm">git</param>
<param name="revision">v1.7.2</param>
<param name="version">_auto_</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="changesauthor">steven.hardy@suse.com</param>
<param name="match-tag">v*</param>
<param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param>
<param name="without-version">yes</param>
<param name="versionrewrite-replacement">\1</param>
</service>
<service mode="buildtime" name="tar" />
<service mode="buildtime" name="recompress">
<param name="file">*.tar</param>
<param name="compression">gz</param>
</service>
<service name="go_modules">
</service>
<service mode="buildtime" name="set_version" />
</services>

51
ip-address-manager/ip-address-manager.spec
View File

@ -1,51 +0,0 @@
#
# spec file for package ip-address-manager
#
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: ip-address-manager
Version: 1.7.2
Release: 0
Summary: Metal3 IPAM controller
License: Apache-2.0
URL: https://github.com/metal3-io/ip-address-manager
Source: ip-address-manager-%{version}.tar.gz
Source1: vendor.tar.gz
BuildRequires: golang(API) = 1.22
ExcludeArch: s390
ExcludeArch: %{ix86}
%description
Metal3 IPAM controller
%prep
%autosetup -a1 -n ip-address-manager-%{version}
%build
go build \
-mod=vendor \
-buildmode=pie \
%install
install -D -m0755 ip-address-manager %{buildroot}%{_bindir}/ip-address-manager
%files
%license LICENSE
%doc README.md
%{_bindir}/ip-address-manager
%changelog

8
rancher-turtles-airgap-resources-chart/Chart.yaml
View File

@ -1,10 +1,10 @@
#!BuildTag: %%IMG_PREFIX%%rancher-turtles-airgap-resources-chart:%%CHART_MAJOR%%.0.0_up0.13.0 #!BuildTag: %%IMG_PREFIX%%rancher-turtles-airgap-resources-chart:%%CHART_MAJOR%%.0.0_up0.14.1
#!BuildTag: %%IMG_PREFIX%%rancher-turtles-airgap-resources-chart:%%CHART_MAJOR%%.0.0_up0.13.0 #!BuildTag: %%IMG_PREFIX%%rancher-turtles-airgap-resources-chart:%%CHART_MAJOR%%.0.0_up0.14.1
apiVersion: v2 apiVersion: v2
appVersion: 0.13.0 appVersion: 0.14.1
description: Rancher Turtles utility chart for airgap scenarios description: Rancher Turtles utility chart for airgap scenarios
home: https://github.com/rancher/turtles/ home: https://github.com/rancher/turtles/
icon: https://raw.githubusercontent.com/rancher/turtles/main/logos/capi.svg icon: https://raw.githubusercontent.com/rancher/turtles/main/logos/capi.svg
name: rancher-turtles-airgap-resources name: rancher-turtles-airgap-resources
type: application type: application
version: "%%CHART_MAJOR%%.0.0+up0.13.0" version: "%%CHART_MAJOR%%.0.0+up0.14.1"

7
rancher-turtles-airgap-resources-chart/templates/airgap-cm-core.yaml
View File

File diff suppressed because one or more lines are too long

192
rancher-turtles-airgap-resources-chart/templates/airgap-cm-metal3.yaml
View File

@ -35,7 +35,6 @@ data:
strategy: Webhook strategy: Webhook
webhook: webhook:
clientConfig: clientConfig:
caBundle: Cg==
service: service:
name: ipam-webhook-service name: ipam-webhook-service
namespace: capm3-system namespace: capm3-system
@ -208,7 +207,6 @@ data:
strategy: Webhook strategy: Webhook
webhook: webhook:
clientConfig: clientConfig:
caBundle: Cg==
service: service:
name: ipam-webhook-service name: ipam-webhook-service
namespace: capm3-system namespace: capm3-system
@ -369,7 +367,6 @@ data:
strategy: Webhook strategy: Webhook
webhook: webhook:
clientConfig: clientConfig:
caBundle: Cg==
service: service:
name: ipam-webhook-service name: ipam-webhook-service
namespace: capm3-system namespace: capm3-system
@ -536,7 +533,6 @@ data:
strategy: Webhook strategy: Webhook
webhook: webhook:
clientConfig: clientConfig:
caBundle: Cg==
service: service:
name: capm3-webhook-service name: capm3-webhook-service
namespace: capm3-system namespace: capm3-system
@ -699,6 +695,91 @@ data:
--- ---
apiVersion: apiextensions.k8s.io/v1 apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: capm3-system/capm3-serving-cert
controller-gen.kubebuilder.io/version: v0.13.0
labels:
cluster.x-k8s.io/provider: infrastructure-metal3
cluster.x-k8s.io/v1beta1: v1beta1
name: metal3clustertemplates.infrastructure.cluster.x-k8s.io
spec:
group: infrastructure.cluster.x-k8s.io
names:
categories:
- cluster-api
kind: Metal3ClusterTemplate
listKind: Metal3ClusterTemplateList
plural: metal3clustertemplates
shortNames:
- m3ct
singular: metal3clustertemplate
scope: Namespaced
versions:
- name: v1beta1
schema:
openAPIV3Schema:
description: Metal3ClusterTemplate is the Schema for the metal3clustertemplates
API.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: Metal3ClusterTemplateSpec defines the desired state of Metal3ClusterTemplate.
properties:
template:
description: Metal3ClusterTemplateResource describes the data for
creating a Metal3Cluster from a template.
properties:
spec:
description: Metal3ClusterSpec defines the desired state of Metal3Cluster.
properties:
controlPlaneEndpoint:
description: ControlPlaneEndpoint represents the endpoint
used to communicate with the control plane.
properties:
host:
description: Host is the hostname on which the API server
is serving.
type: string
port:
description: Port is the port on which the API server
is serving.
type: integer
required:
- host
- port
type: object
noCloudProvider:
description: Determines if the cluster is not to be deployed
with an external cloud provider. If set to true, CAPM3 will
use node labels to set providerID on the kubernetes nodes.
If set to false, providerID is set on nodes by other entities
and CAPM3 uses the value of the providerID on the m3m resource.
type: boolean
type: object
required:
- spec
type: object
required:
- template
type: object
type: object
served: true
storage: true
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
cert-manager.io/inject-ca-from: capm3-system/capm3-serving-cert cert-manager.io/inject-ca-from: capm3-system/capm3-serving-cert
@ -712,7 +793,6 @@ data:
strategy: Webhook strategy: Webhook
webhook: webhook:
clientConfig: clientConfig:
caBundle: Cg==
service: service:
name: capm3-webhook-service name: capm3-webhook-service
namespace: capm3-system namespace: capm3-system
@ -868,7 +948,6 @@ data:
strategy: Webhook strategy: Webhook
webhook: webhook:
clientConfig: clientConfig:
caBundle: Cg==
service: service:
name: capm3-webhook-service name: capm3-webhook-service
namespace: capm3-system namespace: capm3-system
@ -1064,7 +1143,6 @@ data:
strategy: Webhook strategy: Webhook
webhook: webhook:
clientConfig: clientConfig:
caBundle: Cg==
service: service:
name: capm3-webhook-service name: capm3-webhook-service
namespace: capm3-system namespace: capm3-system
@ -2078,7 +2156,6 @@ data:
strategy: Webhook strategy: Webhook
webhook: webhook:
clientConfig: clientConfig:
caBundle: Cg==
service: service:
name: capm3-webhook-service name: capm3-webhook-service
namespace: capm3-system namespace: capm3-system
@ -2150,6 +2227,17 @@ data:
- metadata - metadata
- disabled - disabled
type: string type: string
customDeploy:
description: A custom deploy procedure.
properties:
method:
description: Custom deploy method name. This name is specific
to the deploy ramdisk used. If you don't have a custom deploy
ramdisk, you shouldn't use CustomDeploy.
type: string
required:
- method
type: object
dataTemplate: dataTemplate:
description: MetadataTemplate is a reference to a Metal3DataTemplate description: MetadataTemplate is a reference to a Metal3DataTemplate
object containing a template of metadata to be rendered. Metadata object containing a template of metadata to be rendered. Metadata
@ -2302,8 +2390,6 @@ data:
type: string type: string
type: object type: object
x-kubernetes-map-type: atomic x-kubernetes-map-type: atomic
required:
- image
type: object type: object
status: status:
description: Metal3MachineStatus defines the observed state of Metal3Machine. description: Metal3MachineStatus defines the observed state of Metal3Machine.
@ -2521,7 +2607,6 @@ data:
strategy: Webhook strategy: Webhook
webhook: webhook:
clientConfig: clientConfig:
caBundle: Cg==
service: service:
name: capm3-webhook-service name: capm3-webhook-service
namespace: capm3-system namespace: capm3-system
@ -2591,6 +2676,17 @@ data:
- metadata - metadata
- disabled - disabled
type: string type: string
customDeploy:
description: A custom deploy procedure.
properties:
method:
description: Custom deploy method name. This name is specific
to the deploy ramdisk used. If you don't have a custom
deploy ramdisk, you shouldn't use CustomDeploy.
type: string
required:
- method
type: object
dataTemplate: dataTemplate:
description: MetadataTemplate is a reference to a Metal3DataTemplate description: MetadataTemplate is a reference to a Metal3DataTemplate
object containing a template of metadata to be rendered. object containing a template of metadata to be rendered.
@ -2745,8 +2841,6 @@ data:
type: string type: string
type: object type: object
x-kubernetes-map-type: atomic x-kubernetes-map-type: atomic
required:
- image
type: object type: object
required: required:
- spec - spec
@ -2774,7 +2868,6 @@ data:
strategy: Webhook strategy: Webhook
webhook: webhook:
clientConfig: clientConfig:
caBundle: Cg==
service: service:
name: capm3-webhook-service name: capm3-webhook-service
namespace: capm3-system namespace: capm3-system
@ -2889,7 +2982,6 @@ data:
strategy: Webhook strategy: Webhook
webhook: webhook:
clientConfig: clientConfig:
caBundle: Cg==
service: service:
name: capm3-webhook-service name: capm3-webhook-service
namespace: capm3-system namespace: capm3-system
@ -3173,6 +3265,12 @@ data:
- patch - patch
- update - update
- watch - watch
- apiGroups:
- ""
resources:
- pods
verbs:
- list
- apiGroups: - apiGroups:
- infrastructure.cluster.x-k8s.io - infrastructure.cluster.x-k8s.io
resources: resources:
@ -3391,6 +3489,13 @@ data:
- get - get
- patch - patch
- update - update
- apiGroups:
- storage.k8s.io
resources:
- volumeattachments
verbs:
- list
- watch
--- ---
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
@ -3634,7 +3739,7 @@ data:
containers: containers:
- args: - args:
- --webhook-port=9443 - --webhook-port=9443
- --enableBMHNameBasedPreallocation=${enableBMHNameBasedPreallocation:=false} - --enableBMHNameBasedPreallocation=${ENABLE_BMH_NAME_BASED_PREALLOCATION:=false}
- --diagnostics-address=${CAPM3_DIAGNOSTICS_ADDRESS:=:8443} - --diagnostics-address=${CAPM3_DIAGNOSTICS_ADDRESS:=:8443}
- --insecure-diagnostics=${CAPM3_INSECURE_DIAGNOSTICS:=false} - --insecure-diagnostics=${CAPM3_INSECURE_DIAGNOSTICS:=false}
command: command:
@ -3647,7 +3752,7 @@ data:
envFrom: envFrom:
- configMapRef: - configMapRef:
name: capm3-capm3fasttrack-configmap name: capm3-capm3fasttrack-configmap
image: quay.io/metal3-io/cluster-api-provider-metal3:v1.7.2 image: registry.rancher.com/rancher/cluster-api-provider-metal3:v1.8.2
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
livenessProbe: livenessProbe:
httpGet: httpGet:
@ -3676,6 +3781,7 @@ data:
privileged: false privileged: false
runAsGroup: 65532 runAsGroup: 65532
runAsUser: 65532 runAsUser: 65532
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts: volumeMounts:
- mountPath: /tmp/k8s-webhook-server/serving-certs - mountPath: /tmp/k8s-webhook-server/serving-certs
name: cert name: cert
@ -3731,7 +3837,7 @@ data:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
image: quay.io/metal3-io/ip-address-manager:v1.7.2 image: quay.io/metal3-io/ip-address-manager:v1.8.1
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
livenessProbe: livenessProbe:
httpGet: httpGet:
@ -3760,6 +3866,7 @@ data:
privileged: false privileged: false
runAsGroup: 65532 runAsGroup: 65532
runAsUser: 65532 runAsUser: 65532
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts: volumeMounts:
- mountPath: /tmp/k8s-webhook-server/serving-certs - mountPath: /tmp/k8s-webhook-server/serving-certs
name: cert name: cert
@ -3864,6 +3971,28 @@ data:
resources: resources:
- metal3clusters - metal3clusters
sideEffects: None sideEffects: None
- admissionReviewVersions:
- v1
- v1beta1
clientConfig:
service:
name: capm3-webhook-service
namespace: capm3-system
path: /mutate-infrastructure-cluster-x-k8s-io-v1beta1-metal3clustertemplate
failurePolicy: Fail
matchPolicy: Equivalent
name: default.metal3clustertemplate.infrastructure.cluster.x-k8s.io
rules:
- apiGroups:
- infrastructure.cluster.x-k8s.io
apiVersions:
- v1beta1
operations:
- CREATE
- UPDATE
resources:
- metal3clustertemplates
sideEffects: None
- admissionReviewVersions: - admissionReviewVersions:
- v1 - v1
- v1beta1 - v1beta1
@ -4126,6 +4255,28 @@ data:
resources: resources:
- metal3clusters - metal3clusters
sideEffects: None sideEffects: None
- admissionReviewVersions:
- v1
- v1beta1
clientConfig:
service:
name: capm3-webhook-service
namespace: capm3-system
path: /validate-infrastructure-cluster-x-k8s-io-v1beta1-metal3clustertemplate
failurePolicy: Fail
matchPolicy: Equivalent
name: validation.metal3clustertemplate.infrastructure.cluster.x-k8s.io
rules:
- apiGroups:
- infrastructure.cluster.x-k8s.io
apiVersions:
- v1beta1
operations:
- CREATE
- UPDATE
resources:
- metal3clustertemplates
sideEffects: None
- admissionReviewVersions: - admissionReviewVersions:
- v1 - v1
- v1beta1 - v1beta1
@ -4360,6 +4511,9 @@ data:
apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3 apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
kind: Metadata kind: Metadata
releaseSeries: releaseSeries:
- major: 1
minor: 8
contract: v1beta1
- major: 1 - major: 1
minor: 7 minor: 7
contract: v1beta1 contract: v1beta1
@ -4384,7 +4538,7 @@ data:
kind: ConfigMap kind: ConfigMap
metadata: metadata:
creationTimestamp: null creationTimestamp: null
name: v1.7.2 name: v1.8.2
namespace: capm3-system namespace: capm3-system
labels: labels:
provider-components: metal3 provider-components: metal3

10
rancher-turtles-airgap-resources-chart/templates/airgap-cm-rke2-bootstrap.yaml
View File

@ -32,7 +32,6 @@ data:
strategy: Webhook strategy: Webhook
webhook: webhook:
clientConfig: clientConfig:
caBundle: Cg==
service: service:
name: rke2-bootstrap-webhook-service name: rke2-bootstrap-webhook-service
namespace: rke2-bootstrap-system namespace: rke2-bootstrap-system
@ -1237,7 +1236,6 @@ data:
strategy: Webhook strategy: Webhook
webhook: webhook:
clientConfig: clientConfig:
caBundle: Cg==
service: service:
name: rke2-bootstrap-webhook-service name: rke2-bootstrap-webhook-service
namespace: rke2-bootstrap-system namespace: rke2-bootstrap-system
@ -2545,7 +2543,7 @@ data:
- --insecure-diagnostics=${CAPRKE2_INSECURE_DIAGNOSTICS:=false} - --insecure-diagnostics=${CAPRKE2_INSECURE_DIAGNOSTICS:=false}
command: command:
- /manager - /manager
image: ghcr.io/rancher/cluster-api-provider-rke2-bootstrap:v0.8.0 image: ghcr.io/rancher/cluster-api-provider-rke2-bootstrap:v0.9.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
livenessProbe: livenessProbe:
httpGet: httpGet:
@ -2574,6 +2572,7 @@ data:
privileged: false privileged: false
runAsGroup: 65532 runAsGroup: 65532
runAsUser: 65532 runAsUser: 65532
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts: volumeMounts:
- mountPath: /tmp/k8s-webhook-server/serving-certs - mountPath: /tmp/k8s-webhook-server/serving-certs
name: cert name: cert
@ -2755,10 +2754,13 @@ data:
- major: 0 - major: 0
minor: 8 minor: 8
contract: v1beta1 contract: v1beta1
- major: 0
minor: 9
contract: v1beta1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
creationTimestamp: null creationTimestamp: null
name: v0.8.0 name: v0.9.0
namespace: rke2-bootstrap-system namespace: rke2-bootstrap-system
labels: labels:
provider-components: rke2-bootstrap provider-components: rke2-bootstrap

10
rancher-turtles-airgap-resources-chart/templates/airgap-cm-rke2-control-plane.yaml
View File

@ -32,7 +32,6 @@ data:
strategy: Webhook strategy: Webhook
webhook: webhook:
clientConfig: clientConfig:
caBundle: Cg==
service: service:
name: rke2-control-plane-webhook-service name: rke2-control-plane-webhook-service
namespace: rke2-control-plane-system namespace: rke2-control-plane-system
@ -2620,7 +2619,6 @@ data:
strategy: Webhook strategy: Webhook
webhook: webhook:
clientConfig: clientConfig:
caBundle: Cg==
service: service:
name: rke2-control-plane-webhook-service name: rke2-control-plane-webhook-service
namespace: rke2-control-plane-system namespace: rke2-control-plane-system
@ -4295,7 +4293,7 @@ data:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.uid fieldPath: metadata.uid
image: ghcr.io/rancher/cluster-api-provider-rke2-controlplane:v0.8.0 image: ghcr.io/rancher/cluster-api-provider-rke2-controlplane:v0.9.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
livenessProbe: livenessProbe:
httpGet: httpGet:
@ -4331,6 +4329,7 @@ data:
privileged: false privileged: false
runAsGroup: 65532 runAsGroup: 65532
runAsUser: 65532 runAsUser: 65532
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts: volumeMounts:
- mountPath: /tmp/k8s-webhook-server/serving-certs - mountPath: /tmp/k8s-webhook-server/serving-certs
name: cert name: cert
@ -4512,10 +4511,13 @@ data:
- major: 0 - major: 0
minor: 8 minor: 8
contract: v1beta1 contract: v1beta1
- major: 0
minor: 9
contract: v1beta1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
creationTimestamp: null creationTimestamp: null
name: v0.8.0 name: v0.9.0
namespace: rke2-control-plane-system namespace: rke2-control-plane-system
labels: labels:
provider-components: rke2-control-plane provider-components: rke2-control-plane

2
rancher-turtles-chart/Chart.lock
View File

@ -3,4 +3,4 @@ dependencies:
repository: https://kubernetes-sigs.github.io/cluster-api-operator repository: https://kubernetes-sigs.github.io/cluster-api-operator
version: 0.14.0 version: 0.14.0
digest: sha256:9e9e851dbab3212c279efec06bcf0da147228ea1590470f3a8cbbb5806a250d4 digest: sha256:9e9e851dbab3212c279efec06bcf0da147228ea1590470f3a8cbbb5806a250d4
generated: "2024-10-28T11:44:34.392387979Z" generated: "2024-12-03T09:34:12.871417074Z"

10
rancher-turtles-chart/Chart.yaml
View File

@ -1,5 +1,5 @@
#!BuildTag: %%IMG_PREFIX%%rancher-turtles-chart:%%CHART_MAJOR%%.0.0_up0.13.0 #!BuildTag: %%IMG_PREFIX%%rancher-turtles-chart:%%CHART_MAJOR%%.0.0_up0.14.1
#!BuildTag: %%IMG_PREFIX%%rancher-turtles-chart:%%CHART_MAJOR%%.0.0_up0.13.0-%RELEASE% #!BuildTag: %%IMG_PREFIX%%rancher-turtles-chart:%%CHART_MAJOR%%.0.0_up0.14.1-%RELEASE%
annotations: annotations:
catalog.cattle.io/certified: rancher catalog.cattle.io/certified: rancher
catalog.cattle.io/display-name: Rancher Turtles - the Cluster API Extension catalog.cattle.io/display-name: Rancher Turtles - the Cluster API Extension
@ -7,12 +7,12 @@ annotations:
catalog.cattle.io/namespace: rancher-turtles-system catalog.cattle.io/namespace: rancher-turtles-system
catalog.cattle.io/os: linux catalog.cattle.io/os: linux
catalog.cattle.io/permits-os: linux catalog.cattle.io/permits-os: linux
catalog.cattle.io/rancher-version: '>= 2.9.0-1' catalog.cattle.io/rancher-version: '>= 2.10.0-1'
catalog.cattle.io/release-name: rancher-turtles catalog.cattle.io/release-name: rancher-turtles
catalog.cattle.io/scope: management catalog.cattle.io/scope: management
catalog.cattle.io/type: cluster-tool catalog.cattle.io/type: cluster-tool
apiVersion: v2 apiVersion: v2
appVersion: 0.13.0 appVersion: 0.14.1
dependencies: dependencies:
- condition: cluster-api-operator.enabled - condition: cluster-api-operator.enabled
name: cluster-api-operator name: cluster-api-operator
@ -29,4 +29,4 @@ keywords:
- provisioning - provisioning
name: rancher-turtles name: rancher-turtles
type: application type: application
version: "%%CHART_MAJOR%%.0.0+up0.13.0" version: "%%CHART_MAJOR%%.0.0+up0.14.1"

147
rancher-turtles-chart/templates/rancher-turtles-exp-etcdrestore-components.yaml
View File

@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
cert-manager.io/inject-ca-from: rancher-turtles-system/rancher-turtles-etcdsnapshotrestore-serving-cert cert-manager.io/inject-ca-from: {{ index .Values "rancherTurtles" "namespace" }}/rancher-turtles-etcdsnapshotrestore-serving-cert
controller-gen.kubebuilder.io/version: v0.14.0 controller-gen.kubebuilder.io/version: v0.14.0
labels: labels:
turtles-capi.cattle.io: etcd-restore turtles-capi.cattle.io: etcd-restore
@ -45,77 +45,65 @@ spec:
properties: properties:
clusterName: clusterName:
type: string type: string
configRef:
type: string
location: location:
type: string type: string
machineName: machineName:
type: string type: string
required: required:
- clusterName - clusterName
- configRef
- location
- machineName
type: object type: object
x-kubernetes-validations: x-kubernetes-validations:
- message: ETCD snapshot location can't be empty. - message: ETCD snapshot location can't be empty.
rule: size(self.location)>0 rule: size(self.clusterName)>0
status: status:
default: {} default: {}
description: EtcdSnapshotRestoreStatus defines observed state of EtcdSnapshotRestore description: EtcdSnapshotRestoreStatus defines observed state of EtcdSnapshotRestore
properties: properties:
conditions: error:
description: Conditions provide observations of the operational state type: string
of a Cluster API resource.
items:
description: Condition defines an observation of a Cluster API resource
operational state.
properties:
lastTransitionTime:
description: |-
Last time the condition transitioned from one status to another.
This should be when the underlying condition changed. If that is not known, then using the time when
the API field changed is acceptable.
format: date-time
type: string
message:
description: |-
A human readable message indicating details about the transition.
This field may be empty.
type: string
reason:
description: |-
The reason for the condition's last transition in CamelCase.
The specific API may choose whether or not this field is considered a guaranteed API.
This field may not be empty.
type: string
severity:
description: |-
Severity provides an explicit classification of Reason code, so the users or machines can immediately
understand the current situation and act accordingly.
The Severity field MUST be set only when Status=False.
type: string
status:
description: Status of the condition, one of True, False, Unknown.
type: string
type:
description: |-
Type of condition in CamelCase or in foo.example.com/CamelCase.
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
can be useful (see .node.status.conditions), the ability to deconflict is important.
type: string
required:
- lastTransitionTime
- status
- type
type: object
type: array
manual:
type: boolean
phase: phase:
description: ETCDSnapshotPhase is a string representation of the phase description: ETCDSnapshotPhase is a string representation of the phase
of the etcd snapshot of the etcd snapshot
type: string type: string
s3Snapshots:
items:
properties:
creationTime:
description: CreationTime is the timestamp when the snapshot
was taken by etcd.
format: date-time
type: string
location:
type: string
name:
type: string
required:
- location
- name
type: object
type: array
snapshotFileName:
type: string
snapshots:
items:
properties:
creationTime:
description: CreationTime is the timestamp when the snapshot
was taken by etcd.
format: date-time
type: string
location:
type: string
machineName:
type: string
name:
type: string
required:
- location
- machineName
- name
type: object
type: array
type: object type: object
type: object type: object
served: true served: true
@ -127,7 +115,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
cert-manager.io/inject-ca-from: rancher-turtles-system/rancher-turtles-etcdsnapshotrestore-serving-cert cert-manager.io/inject-ca-from: {{ index .Values "rancherTurtles" "namespace" }}/rancher-turtles-etcdsnapshotrestore-serving-cert
controller-gen.kubebuilder.io/version: v0.14.0 controller-gen.kubebuilder.io/version: v0.14.0
labels: labels:
turtles-capi.cattle.io: etcd-restore turtles-capi.cattle.io: etcd-restore
@ -246,7 +234,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
cert-manager.io/inject-ca-from: rancher-turtles-system/rancher-turtles-etcdsnapshotrestore-serving-cert cert-manager.io/inject-ca-from: {{ index .Values "rancherTurtles" "namespace" }}/rancher-turtles-etcdsnapshotrestore-serving-cert
controller-gen.kubebuilder.io/version: v0.14.0 controller-gen.kubebuilder.io/version: v0.14.0
labels: labels:
turtles-capi.cattle.io: etcd-restore turtles-capi.cattle.io: etcd-restore
@ -306,8 +294,6 @@ spec:
type: string type: string
insecure: insecure:
type: boolean type: boolean
location:
type: string
region: region:
type: string type: string
s3CredentialSecret: s3CredentialSecret:
@ -337,7 +323,7 @@ metadata:
app.kubernetes.io/part-of: rancher-turtles app.kubernetes.io/part-of: rancher-turtles
turtles-capi.cattle.io: etcd-restore turtles-capi.cattle.io: etcd-restore
name: rancher-turtles-etcdsnapshotrestore-manager name: rancher-turtles-etcdsnapshotrestore-manager
namespace: rancher-turtles-system namespace: {{ index .Values "rancherTurtles" "namespace" }}
--- ---
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: Role kind: Role
@ -351,7 +337,7 @@ metadata:
app.kubernetes.io/part-of: rancher-turtles app.kubernetes.io/part-of: rancher-turtles
turtles-capi.cattle.io: etcd-restore turtles-capi.cattle.io: etcd-restore
name: rancher-turtles-etcdsnapshotrestore-leader-election-role name: rancher-turtles-etcdsnapshotrestore-leader-election-role
namespace: rancher-turtles-system namespace: {{ index .Values "rancherTurtles" "namespace" }}
rules: rules:
- apiGroups: - apiGroups:
- "" - ""
@ -600,7 +586,7 @@ metadata:
app.kubernetes.io/part-of: rancher-turtles app.kubernetes.io/part-of: rancher-turtles
turtles-capi.cattle.io: etcd-restore turtles-capi.cattle.io: etcd-restore
name: rancher-turtles-etcdsnapshotrestore-leader-election-rolebinding name: rancher-turtles-etcdsnapshotrestore-leader-election-rolebinding
namespace: rancher-turtles-system namespace: {{ index .Values "rancherTurtles" "namespace" }}
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: Role kind: Role
@ -608,7 +594,7 @@ roleRef:
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: rancher-turtles-etcdsnapshotrestore-manager name: rancher-turtles-etcdsnapshotrestore-manager
namespace: rancher-turtles-system namespace: {{ index .Values "rancherTurtles" "namespace" }}
--- ---
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding kind: ClusterRoleBinding
@ -629,7 +615,7 @@ roleRef:
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: rancher-turtles-etcdsnapshotrestore-manager name: rancher-turtles-etcdsnapshotrestore-manager
namespace: rancher-turtles-system namespace: {{ index .Values "rancherTurtles" "namespace" }}
--- ---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
@ -637,7 +623,7 @@ metadata:
labels: labels:
turtles-capi.cattle.io: etcd-restore turtles-capi.cattle.io: etcd-restore
name: rancher-turtles-etcdsnapshotrestore-webhook-service name: rancher-turtles-etcdsnapshotrestore-webhook-service
namespace: rancher-turtles-system namespace: {{ index .Values "rancherTurtles" "namespace" }}
spec: spec:
ports: ports:
- port: 443 - port: 443
@ -652,7 +638,7 @@ metadata:
control-plane: controller-manager control-plane: controller-manager
turtles-capi.cattle.io: etcd-restore turtles-capi.cattle.io: etcd-restore
name: rancher-turtles-etcdsnapshotrestore-controller-manager name: rancher-turtles-etcdsnapshotrestore-controller-manager
namespace: rancher-turtles-system namespace: {{ index .Values "rancherTurtles" "namespace" }}
spec: spec:
replicas: 1 replicas: 1
selector: selector:
@ -671,7 +657,7 @@ spec:
- args: - args:
- --leader-elect - --leader-elect
command: command:
- /manager - ./etcd-snapshot-restore
env: env:
- name: POD_NAMESPACE - name: POD_NAMESPACE
valueFrom: valueFrom:
@ -685,8 +671,13 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.uid fieldPath: metadata.uid
image: ghcr.io/rancher/turtles-etcd-snapshot-restore:dev {{- $imageVersion := index .Values "rancherTurtles" "features" "etcd-snapshot-restore" "imageVersion" -}}
imagePullPolicy: IfNotPresent {{- if contains "sha256:" $imageVersion }}
image: {{ index .Values "rancherTurtles" "features" "etcd-snapshot-restore" "image" }}@{{ index .Values "rancherTurtles" "features" "etcd-snapshot-restore" "imageVersion" }}
{{- else }}
image: {{ index .Values "rancherTurtles" "features" "etcd-snapshot-restore" "image" }}:{{ index .Values "rancherTurtles" "features" "etcd-snapshot-restore" "imageVersion" }}
{{- end }}
imagePullPolicy: '{{ index .Values "rancherTurtles" "features" "etcd-snapshot-restore" "imagePullPolicy" }}'
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthz path: /healthz
@ -733,11 +724,11 @@ metadata:
labels: labels:
turtles-capi.cattle.io: etcd-restore turtles-capi.cattle.io: etcd-restore
name: rancher-turtles-etcdsnapshotrestore-serving-cert name: rancher-turtles-etcdsnapshotrestore-serving-cert
namespace: rancher-turtles-system namespace: {{ index .Values "rancherTurtles" "namespace" }}
spec: spec:
dnsNames: dnsNames:
- rancher-turtles-etcdsnapshotrestore-webhook-service.rancher-turtles-system.svc - rancher-turtles-etcdsnapshotrestore-webhook-service.{{ index .Values "rancherTurtles" "namespace" }}.svc
- rancher-turtles-etcdsnapshotrestore-webhook-service.rancher-turtles-system.svc.cluster.local - rancher-turtles-etcdsnapshotrestore-webhook-service.{{ index .Values "rancherTurtles" "namespace" }}.svc.cluster.local
issuerRef: issuerRef:
kind: Issuer kind: Issuer
name: rancher-turtles-etcdsnapshotrestore-selfsigned-issuer name: rancher-turtles-etcdsnapshotrestore-selfsigned-issuer
@ -749,7 +740,7 @@ metadata:
labels: labels:
turtles-capi.cattle.io: etcd-restore turtles-capi.cattle.io: etcd-restore
name: rancher-turtles-etcdsnapshotrestore-selfsigned-issuer name: rancher-turtles-etcdsnapshotrestore-selfsigned-issuer
namespace: rancher-turtles-system namespace: {{ index .Values "rancherTurtles" "namespace" }}
spec: spec:
selfSigned: {} selfSigned: {}
--- ---
@ -757,7 +748,7 @@ apiVersion: admissionregistration.k8s.io/v1
kind: MutatingWebhookConfiguration kind: MutatingWebhookConfiguration
metadata: metadata:
annotations: annotations:
cert-manager.io/inject-ca-from: rancher-turtles-system/rancher-turtles-etcdsnapshotrestore-serving-cert cert-manager.io/inject-ca-from: {{ index .Values "rancherTurtles" "namespace" }}/rancher-turtles-etcdsnapshotrestore-serving-cert
labels: labels:
turtles-capi.cattle.io: etcd-restore turtles-capi.cattle.io: etcd-restore
name: rancher-turtles-etcdsnapshotrestore-mutating-webhook-configuration name: rancher-turtles-etcdsnapshotrestore-mutating-webhook-configuration
@ -767,7 +758,7 @@ webhooks:
clientConfig: clientConfig:
service: service:
name: rancher-turtles-etcdsnapshotrestore-webhook-service name: rancher-turtles-etcdsnapshotrestore-webhook-service
namespace: rancher-turtles-system namespace: {{ index .Values "rancherTurtles" "namespace" }}
path: /mutate-bootstrap-cluster-x-k8s-io-v1beta1-rke2config path: /mutate-bootstrap-cluster-x-k8s-io-v1beta1-rke2config
failurePolicy: Fail failurePolicy: Fail
name: systemagentrke2config.kb.io name: systemagentrke2config.kb.io
@ -787,7 +778,7 @@ apiVersion: admissionregistration.k8s.io/v1
kind: ValidatingWebhookConfiguration kind: ValidatingWebhookConfiguration
metadata: metadata:
annotations: annotations:
cert-manager.io/inject-ca-from: rancher-turtles-system/rancher-turtles-etcdsnapshotrestore-serving-cert cert-manager.io/inject-ca-from: {{ index .Values "rancherTurtles" "namespace" }}/rancher-turtles-etcdsnapshotrestore-serving-cert
labels: labels:
turtles-capi.cattle.io: etcd-restore turtles-capi.cattle.io: etcd-restore
name: rancher-turtles-etcdsnapshotrestore-validating-webhook-configuration name: rancher-turtles-etcdsnapshotrestore-validating-webhook-configuration
@ -797,7 +788,7 @@ webhooks:
clientConfig: clientConfig:
service: service:
name: rancher-turtles-etcdsnapshotrestore-webhook-service name: rancher-turtles-etcdsnapshotrestore-webhook-service
namespace: rancher-turtles-system namespace: {{ index .Values "rancherTurtles" "namespace" }}
path: /validate-turtles-capi-cattle-io-v1alpha1-etcdmachinesnapshot path: /validate-turtles-capi-cattle-io-v1alpha1-etcdmachinesnapshot
failurePolicy: Fail failurePolicy: Fail
matchPolicy: Equivalent matchPolicy: Equivalent
@ -818,7 +809,7 @@ webhooks:
clientConfig: clientConfig:
service: service:
name: rancher-turtles-etcdsnapshotrestore-webhook-service name: rancher-turtles-etcdsnapshotrestore-webhook-service
namespace: rancher-turtles-system namespace: {{ index .Values "rancherTurtles" "namespace" }}
path: /validate-turtles-capi-cattle-io-v1alpha1-etcdsnapshotrestore path: /validate-turtles-capi-cattle-io-v1alpha1-etcdsnapshotrestore
failurePolicy: Fail failurePolicy: Fail
matchPolicy: Equivalent matchPolicy: Equivalent

16
rancher-turtles-chart/values.yaml
View File

@ -1,6 +1,6 @@
rancherTurtles: rancherTurtles:
image: registry.rancher.com/rancher/rancher/turtles image: registry.rancher.com/rancher/rancher/turtles
imageVersion: v0.13.0 imageVersion: v0.14.1
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
namespace: rancher-turtles-system namespace: rancher-turtles-system
managerArguments: [] managerArguments: []
@ -25,6 +25,9 @@ rancherTurtles:
enabled: false enabled: false
etcd-snapshot-restore: etcd-snapshot-restore:
enabled: false enabled: false
image: registry.rancher.com/rancher/rancher/turtles
imageVersion: v0.14.1
imagePullPolicy: IfNotPresent
addon-provider-fleet: addon-provider-fleet:
enabled: false enabled: false
cluster-api-operator: cluster-api-operator:
@ -52,40 +55,35 @@ cluster-api-operator:
readOnly: true readOnly: true
cluster-api: cluster-api:
enabled: true enabled: true
version: "v1.7.7"
configSecret: configSecret:
name: "" name: ""
defaultName: capi-env-variables defaultName: capi-env-variables
core: core:
namespace: capi-system namespace: capi-system
imageUrl: "registry.rancher.com/rancher/cluster-api-controller:v1.7.7"
fetchConfig: fetchConfig:
url: "" url: ""
selector: "" selector: ""
rke2: rke2:
enabled: true enabled: true
version: "v0.8.0"
bootstrap: bootstrap:
namespace: rke2-bootstrap-system namespace: rke2-bootstrap-system
imageUrl: "registry.rancher.com/rancher/cluster-api-provider-rke2-bootstrap:v0.8.0"
fetchConfig: fetchConfig:
url: "" url: ""
selector: "" selector: ""
controlPlane: controlPlane:
namespace: rke2-control-plane-system namespace: rke2-control-plane-system
imageUrl: "registry.rancher.com/rancher/cluster-api-provider-rke2-controlplane:v0.8.0"
fetchConfig: fetchConfig:
url: "" url: ""
selector: "" selector: ""
metal3: metal3:
enabled: true enabled: true
version: "v1.7.2" version: "v1.8.2"
infrastructure: infrastructure:
namespace: capm3-system namespace: capm3-system
imageUrl: "%%IMG_REPO%%/%%IMG_PREFIX%%cluster-api-provider-metal3:1.7.2" imageUrl: "registry.rancher.com/rancher/cluster-api-metal3-controller:v1.8.2"
fetchConfig: fetchConfig:
url: "" url: ""
selector: "" selector: ""
ipam: ipam:
namespace: capm3-system namespace: capm3-system
imageUrl: "%%IMG_REPO%%/%%IMG_PREFIX%%ip-address-manager:1.7.2" imageUrl: "registry.rancher.com/rancher/cluster-api-metal3-ipam-controller:v1.8.1"

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

@ -101,4 +101,4 @@ spec:
- prettyName: RancherTurtles - prettyName: RancherTurtles
releaseName: rancher-turtles releaseName: rancher-turtles
chart: %%CHART_REPO%%/%%IMG_PREFIX%%rancher-turtles-chart chart: %%CHART_REPO%%/%%IMG_PREFIX%%rancher-turtles-chart
version: %%CHART_MAJOR%%.0.0+up0.4.0 version: %%CHART_MAJOR%%.0.0+up0.14.1