1
0
forked from suse-edge/Factory

rancher-turtles-airgap-resources-chart: Update to 0.14.1 upstream release

Aligns with https://github.com/suse-edge/charts/pull/174 which
rebases to 0.14.1, which is marked as compatible with Rancher 2.10

(cherry picked from commit 856ec2ac8e)
This commit is contained in:
Steven Hardy 2024-12-05 11:35:05 +00:00
parent 39338dd6ac
commit 2928b2076e
Signed by: steven.hardy
GPG Key ID: 44E1F7EC6AC42B8E
5 changed files with 194 additions and 33 deletions

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"

File diff suppressed because one or more lines are too long

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

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

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