rancher-turtles-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
2024-12-05 11:31:40 +00:00
parent cf6abb24fb
commit 7721c66ab0
4 changed files with 82 additions and 93 deletions
--- a/rancher-turtles-chart/templates/rancher-turtles-exp-etcdrestore-components.yaml
+++ b/rancher-turtles-chart/templates/rancher-turtles-exp-etcdrestore-components.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  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
  labels:
    turtles-capi.cattle.io: etcd-restore
@@ -45,77 +45,65 @@ spec:
            properties:
              clusterName:
                type: string
-              configRef:
-                type: string
              location:
                type: string
              machineName:
                type: string
            required:
            - clusterName
-            - configRef
-            - location
-            - machineName
            type: object
            x-kubernetes-validations:
            - message: ETCD snapshot location can't be empty.
-              rule: size(self.location)>0
+              rule: size(self.clusterName)>0
          status:
            default: {}
            description: EtcdSnapshotRestoreStatus defines observed state of EtcdSnapshotRestore
            properties:
-              conditions:
-                description: Conditions provide observations of the operational state
-                  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
+              error:
+                type: string
              phase:
                description: ETCDSnapshotPhase is a string representation of the phase
                  of the etcd snapshot
                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
    served: true
@@ -127,7 +115,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  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
  labels:
    turtles-capi.cattle.io: etcd-restore
@@ -246,7 +234,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  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
  labels:
    turtles-capi.cattle.io: etcd-restore
@@ -306,8 +294,6 @@ spec:
                    type: string
                  insecure:
                    type: boolean
-                  location:
-                    type: string
                  region:
                    type: string
                  s3CredentialSecret:
@@ -337,7 +323,7 @@ metadata:
    app.kubernetes.io/part-of: rancher-turtles
    turtles-capi.cattle.io: etcd-restore
  name: rancher-turtles-etcdsnapshotrestore-manager
-  namespace: rancher-turtles-system
+  namespace: {{ index .Values "rancherTurtles" "namespace" }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -351,7 +337,7 @@ metadata:
    app.kubernetes.io/part-of: rancher-turtles
    turtles-capi.cattle.io: etcd-restore
  name: rancher-turtles-etcdsnapshotrestore-leader-election-role
-  namespace: rancher-turtles-system
+  namespace: {{ index .Values "rancherTurtles" "namespace" }}
 rules:
 - apiGroups:
  - ""
@@ -600,7 +586,7 @@ metadata:
    app.kubernetes.io/part-of: rancher-turtles
    turtles-capi.cattle.io: etcd-restore
  name: rancher-turtles-etcdsnapshotrestore-leader-election-rolebinding
-  namespace: rancher-turtles-system
+  namespace: {{ index .Values "rancherTurtles" "namespace" }}
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: Role
@@ -608,7 +594,7 @@ roleRef:
 subjects:
 - kind: ServiceAccount
  name: rancher-turtles-etcdsnapshotrestore-manager
-  namespace: rancher-turtles-system
+  namespace: {{ index .Values "rancherTurtles" "namespace" }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -629,7 +615,7 @@ roleRef:
 subjects:
 - kind: ServiceAccount
  name: rancher-turtles-etcdsnapshotrestore-manager
-  namespace: rancher-turtles-system
+  namespace: {{ index .Values "rancherTurtles" "namespace" }}
 ---
 apiVersion: v1
 kind: Service
@@ -637,7 +623,7 @@ metadata:
  labels:
    turtles-capi.cattle.io: etcd-restore
  name: rancher-turtles-etcdsnapshotrestore-webhook-service
-  namespace: rancher-turtles-system
+  namespace: {{ index .Values "rancherTurtles" "namespace" }}
 spec:
  ports:
  - port: 443
@@ -652,7 +638,7 @@ metadata:
    control-plane: controller-manager
    turtles-capi.cattle.io: etcd-restore
  name: rancher-turtles-etcdsnapshotrestore-controller-manager
-  namespace: rancher-turtles-system
+  namespace: {{ index .Values "rancherTurtles" "namespace" }}
 spec:
  replicas: 1
  selector:
@@ -671,7 +657,7 @@ spec:
      - args:
        - --leader-elect
        command:
-        - /manager
+        - ./etcd-snapshot-restore
        env:
        - name: POD_NAMESPACE
          valueFrom:
@@ -685,8 +671,13 @@ spec:
          valueFrom:
            fieldRef:
              fieldPath: metadata.uid
-        image: ghcr.io/rancher/turtles-etcd-snapshot-restore:dev
-        imagePullPolicy: IfNotPresent
+        {{- $imageVersion := index .Values "rancherTurtles" "features" "etcd-snapshot-restore" "imageVersion" -}}
+        {{- 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:
          httpGet:
            path: /healthz
@@ -733,11 +724,11 @@ metadata:
  labels:
    turtles-capi.cattle.io: etcd-restore
  name: rancher-turtles-etcdsnapshotrestore-serving-cert
-  namespace: rancher-turtles-system
+  namespace: {{ index .Values "rancherTurtles" "namespace" }}
 spec:
  dnsNames:
-  - rancher-turtles-etcdsnapshotrestore-webhook-service.rancher-turtles-system.svc
-  - rancher-turtles-etcdsnapshotrestore-webhook-service.rancher-turtles-system.svc.cluster.local
+  - rancher-turtles-etcdsnapshotrestore-webhook-service.{{ index .Values "rancherTurtles" "namespace" }}.svc
+  - rancher-turtles-etcdsnapshotrestore-webhook-service.{{ index .Values "rancherTurtles" "namespace" }}.svc.cluster.local
  issuerRef:
    kind: Issuer
    name: rancher-turtles-etcdsnapshotrestore-selfsigned-issuer
@@ -749,7 +740,7 @@ metadata:
  labels:
    turtles-capi.cattle.io: etcd-restore
  name: rancher-turtles-etcdsnapshotrestore-selfsigned-issuer
-  namespace: rancher-turtles-system
+  namespace: {{ index .Values "rancherTurtles" "namespace" }}
 spec:
  selfSigned: {}
 ---
@@ -757,7 +748,7 @@ apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
  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:
    turtles-capi.cattle.io: etcd-restore
  name: rancher-turtles-etcdsnapshotrestore-mutating-webhook-configuration
@@ -767,7 +758,7 @@ webhooks:
  clientConfig:
    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
  failurePolicy: Fail
  name: systemagentrke2config.kb.io
@@ -787,7 +778,7 @@ apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
  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:
    turtles-capi.cattle.io: etcd-restore
  name: rancher-turtles-etcdsnapshotrestore-validating-webhook-configuration
@@ -797,7 +788,7 @@ webhooks:
  clientConfig:
    service:
      name: rancher-turtles-etcdsnapshotrestore-webhook-service
-      namespace: rancher-turtles-system
+      namespace: {{ index .Values "rancherTurtles" "namespace" }}
      path: /validate-turtles-capi-cattle-io-v1alpha1-etcdmachinesnapshot
  failurePolicy: Fail
  matchPolicy: Equivalent
@@ -818,7 +809,7 @@ webhooks:
  clientConfig:
    service:
      name: rancher-turtles-etcdsnapshotrestore-webhook-service
-      namespace: rancher-turtles-system
+      namespace: {{ index .Values "rancherTurtles" "namespace" }}
      path: /validate-turtles-capi-cattle-io-v1alpha1-etcdsnapshotrestore
  failurePolicy: Fail
  matchPolicy: Equivalent