-
Notifications
You must be signed in to change notification settings - Fork 281
fix(stabilize-krr): add LimitStrategy + k8up Helm charts #550
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| # Patterns to ignore when building packages. | ||
| # This supports shell glob matching, relative path matching, and | ||
| # negation (prefixed with !). Only one pattern per line. | ||
| .DS_Store | ||
| # Common VCS dirs | ||
| .git/ | ||
| .gitignore | ||
| .bzr/ | ||
| .bzrignore | ||
| .hg/ | ||
| .hgignore | ||
| .svn/ | ||
| # Common backup files | ||
| *.swp | ||
| *.bak | ||
| *.tmp | ||
| *~ | ||
| # Various IDEs | ||
| .project | ||
| .idea/ | ||
| *.tmproj | ||
|
|
||
| *kustomize*/ | ||
| Makefile | ||
| *gotmpl* | ||
| test/ |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| apiVersion: v2 | ||
| description: Kubernetes and OpenShift Backup Operator based on restic | ||
| home: https://k8up.io/ | ||
| keywords: | ||
| - backup | ||
| - operator | ||
| - restic | ||
| maintainers: | ||
| - email: info@appuio.ch | ||
| name: K8up Authors | ||
| name: k8up | ||
| sources: | ||
| - https://github.com/k8up-io/k8up | ||
| version: 4.4.1 |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| # k8up | ||
|
|
||
|  | ||
|
|
||
| Kubernetes and OpenShift Backup Operator based on restic | ||
|
|
||
| **Homepage:** <https://k8up.io/> | ||
|
|
||
| ## Installation | ||
|
|
||
| ```bash | ||
| helm repo add k8up-io https://k8up-io.github.io/k8up | ||
| helm install k8up k8up-io/k8up | ||
| ``` | ||
| ```bash | ||
| kubectl apply -f https://github.com/k8up-io/k8up/releases/download/k8up-4.4.1/k8up-crd.yaml | ||
| ``` | ||
|
|
||
| <!--- | ||
| The README.md file is automatically generated with helm-docs! | ||
|
|
||
| Edit the README.gotmpl.md template instead. | ||
| --> | ||
|
|
||
| ## Handling CRDs | ||
|
|
||
| * Always upgrade the CRDs before upgrading the Helm release. | ||
| * Watch out for breaking changes in the K8up release notes. | ||
|
|
||
| ## Source Code | ||
|
|
||
| * <https://github.com/k8up-io/k8up> | ||
|
|
||
| <!--- | ||
| The values below are generated with helm-docs! | ||
|
|
||
| Document your changes in values.yaml and let `make docs:helm` generate this section. | ||
| --> | ||
| ## Values | ||
|
|
||
| | Key | Type | Default | Description | | ||
| |-----|------|---------|-------------| | ||
| | affinity | object | `{}` | | | ||
| | image.pullPolicy | string | `"IfNotPresent"` | Operator image pull policy | | ||
| | image.registry | string | `"ghcr.io"` | Operator image registry | | ||
| | image.repository | string | `"k8up-io/k8up"` | Operator image repository | | ||
| | image.tag | string | `"v2.7.1"` | Operator image tag (version) | | ||
| | imagePullSecrets | list | `[]` | | | ||
| | k8up.backupImage.repository | string | `""` | The backup runner image repository. Defaults to `{image.registry}/{image.repository}`. Specify an image repository including registry, e.g. `example.com/repo/image` | | ||
| | k8up.backupImage.tag | string | `""` | The backup runner image tag Defaults to `{image.tag}` | | ||
| | k8up.enableLeaderElection | bool | `true` | Specifies whether leader election should be enabled. | | ||
| | k8up.envVars | list | `[]` | envVars allows the specification of additional environment variables. See [values.yaml](values.yaml) how to specify See documentation which variables are supported. | | ||
| | k8up.globalResources | object | empty values | Specify the resource requests and limits that the Pods should have when they are scheduled by K8up. You are still able to override those via K8up resources, but this gives cluster administrators custom defaults. | | ||
| | k8up.globalResources.limits.cpu | string | `""` | Global CPU resource limit applied to jobs. See [supported units][resource-units]. | | ||
| | k8up.globalResources.limits.memory | string | `""` | Global Memory resource limit applied to jobs. See [supported units][resource-units]. | | ||
| | k8up.globalResources.requests.cpu | string | `""` | Global CPU resource requests applied to jobs. See [supported units][resource-units]. | | ||
| | k8up.globalResources.requests.memory | string | `""` | Global Memory resource requests applied to jobs. See [supported units][resource-units]. | | ||
| | k8up.operatorNamespace | string | `""` | Specifies the namespace in which K8up's `EffectiveSchedules` are stored. Defaults to release namespace if left empty. | | ||
| | k8up.timezone | string | `""` | Specifies the timezone K8up is using for scheduling. Empty value defaults to the timezone in which Kubernetes is deployed. Accepts `tz database` compatible entries, e.g. `Europe/Zurich` | | ||
| | metrics.prometheusRule.additionalLabels | object | `{}` | Add labels to the PrometheusRule object | | ||
| | metrics.prometheusRule.additionalRules | list | `[]` | Provide additional alert rules in addition to the defaults | | ||
| | metrics.prometheusRule.createDefaultRules | bool | `true` | Whether the default rules should be installed | | ||
| | metrics.prometheusRule.enabled | bool | `false` | Whether to enable PrometheusRule manifest for [Prometheus Operator][prometheus-operator] | | ||
| | metrics.prometheusRule.jobFailedRulesFor | list | `["archive","backup","check","prune","restore"]` | Create default rules for the given job types. Valid values are "archive", "backup", "check", "prune", and "restore". | | ||
| | metrics.prometheusRule.namespace | string | `""` | If the object should be installed in a different namespace than operator | | ||
| | metrics.service.annotations | object | `{}` | Annotations to add to the service | | ||
| | metrics.service.nodePort | int | `0` | Service node port of the metrics endpoint, requires `metrics.service.type=NodePort` | | ||
| | metrics.service.port | int | `8080` | | | ||
| | metrics.service.type | string | `"ClusterIP"` | | | ||
| | metrics.serviceMonitor.additionalLabels | object | `{}` | Add labels to the ServiceMonitor object | | ||
| | metrics.serviceMonitor.enabled | bool | `false` | Whether to enable ServiceMonitor manifests for [Prometheus Operator][prometheus-operator] | | ||
| | metrics.serviceMonitor.namespace | string | `""` | If the object should be installed in a different namespace than operator | | ||
| | metrics.serviceMonitor.scrapeInterval | string | `"60s"` | Scrape interval to collect metrics | | ||
| | nodeSelector | object | `{}` | | | ||
| | podAnnotations | object | `{}` | Annotations to add to the Pod spec. | | ||
| | podSecurityContext | object | `{}` | Security context to add to the Pod spec. | | ||
| | rbac.create | bool | `true` | Create cluster roles and rolebinding. May need elevated permissions to create cluster roles and -bindings. | | ||
| | replicaCount | int | `1` | How many operator pods should run. Note: Operator features leader election for K8s 1.16 and later, so that only 1 pod is reconciling/scheduling jobs. Follower pods reduce interruption time as they're on hot standby when leader is unresponsive. | | ||
| | resources.limits.memory | string | `"256Mi"` | Memory limit of K8up operator. See [supported units][resource-units]. | | ||
| | resources.requests.cpu | string | `"20m"` | CPU request of K8up operator. See [supported units][resource-units]. | | ||
| | resources.requests.memory | string | `"128Mi"` | Memory request of K8up operator. See [supported units][resource-units]. | | ||
| | securityContext | object | `{}` | Container security context | | ||
| | serviceAccount.annotations | object | `{}` | Annotations to add to the service account. | | ||
| | serviceAccount.create | bool | `true` | Specifies whether a service account should be created | | ||
| | serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template | | ||
| | tolerations | list | `[]` | | | ||
|
|
||
| ## Upgrading from Charts v0 to v1 | ||
|
|
||
| * In `image.repository` the registry domain was moved into its own parameter `image.registry`. | ||
| * K8up 1.x features leader election, this enables rolling updates and multiple replicas. | ||
| `k8up.enableLeaderElection` defaults to `true`. Disable this for older Kubernetes versions (<= 1.15) | ||
| * `replicaCount` is now configurable, defaults to `1`. | ||
| * Note: Deployment strategy type has changed from `Recreate` to `RollingUpdate`. | ||
| * CRDs need to be installed separately, they are no longer included in this chart. | ||
|
|
||
| ## Upgrading from Charts v1 to v2 | ||
|
|
||
| * Note: `image.repository` changed from `vshn/k8up` to `k8up-io/k8up`. | ||
| * Note: `image.registry` changed from `quay.io` to `ghcr.io`. | ||
| * Note: `image.tag` changed from `v1.x` to `v2.x`. Please see the [full changelog](https://github.com/k8up-io/k8up/releases/tag/v2.0.0). | ||
| * `metrics.prometheusRule.legacyRules` has been removed (no support for OpenShift 3.11 anymore). | ||
| * Note: `k8up.backupImage.repository` changed from `quay.io/vshn/wrestic` to `ghcr.io/k8up-io/k8up` (`wrestic` is not needed anymore in K8up v2). | ||
|
|
||
| ## Upgrading from Charts v2 to v3 | ||
|
|
||
| Due to the migration of the chart from [APPUiO](https://github.com/appuio/charts/tree/master/appuio/k8up) to this repo, we decided to make a breaking change for the chart. | ||
| Only chart archives from version 3.x can be downloaded from the https://k8up-io.github.io/k8up index. | ||
| No 2.x chart releases will be migrated from the APPUiO Helm repo. | ||
|
|
||
| Some RBAC roles and role bindings have change the name. | ||
| In most cases this shouldn't be an issue and Helm should be able to cleanup the old resources without impact on the RBAC permissions. | ||
|
|
||
| * New parameter: `podAnnotations`, default `{}`. | ||
| * New parameter: `service.annotations`, default `{}`. | ||
| * Parameter changed: `image.tag` now defaults to `v2` instead of a pinned version. | ||
| * Parameter changed: `image.pullPolicy` now defaults to `Always` instead of `IfNotPresent`. | ||
| * Note: Renamed ClusterRole `${release-name}-manager-role` to `${release-name}-manager`. | ||
| * Note: Spec of ClusterRole `${release-name}-leader-election-role` moved to `${release-name}-manager`. | ||
| * Note: Renamed ClusterRoleBinding `${release-name}-manager-rolebinding` to `${release-name}`. | ||
| * Note: ClusterRoleBinding `${release-name}-leader-election-rolebinding` removed (not needed anymore). | ||
| * Note: Renamed ClusterRole `${release-name}-k8up-view` to `${release-name}-view`. | ||
| * Note: Renamed ClusterRole `${release-name}-k8up-edit` to `${release-name}-edit`. | ||
|
|
||
| ## Upgrading from Charts v3 to v4 | ||
|
|
||
| The image tag is now pinned again and not using a floating tag. | ||
|
|
||
| * Parameter changed: `image.tag` now defaults to a pinned version. Each new K8up version now requires also a new chart version. | ||
| * Parameter changed: `image.pullPolicy` now defaults to `IfNotPresent` instead of `Always`. | ||
| * Parameter changed: `k8up.backupImage.repository` is now unset, which defaults to the same image as defined in `image.{registry/repository}`. | ||
| * Parameter changed: `k8up.backupImage.tag` is now unset, which defaults to the same image tag as defined in `image.tag`. | ||
|
|
||
| ## Source Code | ||
|
|
||
| * <https://github.com/k8up-io/k8up> | ||
|
Comment on lines
+134
to
+136
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win Remove the duplicate Line 134 duplicates the heading at Line 30. This creates duplicate navigation entries and triggers markdownlint MD024. Keep one section when regenerating this file. 🧰 Tools🪛 markdownlint-cli2 (0.23.2)[warning] 134-134: Multiple headings with the same content (MD024, no-duplicate-heading) 🤖 Prompt for AI AgentsSource: Linters/SAST tools |
||
|
|
||
| <!--- | ||
| Common/Useful Link references from values.yaml | ||
| --> | ||
| [resource-units]: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#resource-units-in-kubernetes | ||
| [prometheus-operator]: https://github.com/coreos/prometheus-operator | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| ##################### | ||
| ! Attention ! | ||
| ##################### | ||
|
|
||
| This Helm chart does not include CRDs. | ||
| Please make sure you have installed or upgraded the necessary CRDs as instructed in the Chart README. | ||
|
|
||
| ##################### |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| {{/* vim: set filetype=mustache: */}} | ||
| {{/* | ||
| Expand the name of the chart. | ||
| */}} | ||
| {{- define "k8up.name" -}} | ||
| {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} | ||
| {{- end -}} | ||
|
|
||
| {{/* | ||
| Create a default fully qualified app name. | ||
| We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). | ||
| If release name contains chart name it will be used as a full name. | ||
| */}} | ||
| {{- define "k8up.fullname" -}} | ||
| {{- if .Values.fullnameOverride -}} | ||
| {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} | ||
| {{- else -}} | ||
| {{- $name := default .Chart.Name .Values.nameOverride -}} | ||
| {{- if contains $name .Release.Name -}} | ||
| {{- .Release.Name | trunc 63 | trimSuffix "-" -}} | ||
| {{- else -}} | ||
| {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} | ||
| {{- end -}} | ||
| {{- end -}} | ||
| {{- end -}} | ||
|
|
||
| {{/* | ||
| Create chart name and version as used by the chart label. | ||
| */}} | ||
| {{- define "k8up.chart" -}} | ||
| {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} | ||
| {{- end -}} | ||
|
|
||
| {{/* | ||
| Common labels | ||
| */}} | ||
| {{- define "k8up.labels" -}} | ||
| helm.sh/chart: {{ include "k8up.chart" . }} | ||
| app.kubernetes.io/name: {{ include "k8up.name" . }} | ||
| app.kubernetes.io/instance: {{ .Release.Name }} | ||
| {{- if .Chart.AppVersion }} | ||
| app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} | ||
| {{- end }} | ||
| app.kubernetes.io/managed-by: {{ .Release.Service }} | ||
| {{- end -}} | ||
|
|
||
| {{/* | ||
| Selector labels | ||
| */}} | ||
| {{- define "k8up.selectorLabels" -}} | ||
| app.kubernetes.io/name: {{ include "k8up.name" . }} | ||
| app.kubernetes.io/instance: {{ .Release.Name }} | ||
| {{- end -}} | ||
|
|
||
| {{/* | ||
| Static labels | ||
| */}} | ||
| {{- define "k8up.staticLabels" -}} | ||
| app.kubernetes.io/name: {{ include "k8up.name" . }} | ||
| app.kubernetes.io/instance: {{ .Release.Name }} | ||
| app.kubernetes.io/managed-by: {{ .Release.Service }} | ||
| {{- end -}} | ||
|
|
||
| {{/* | ||
| Create the name of the service account to use | ||
| */}} | ||
| {{- define "k8up.serviceAccountName" -}} | ||
| {{- if .Values.serviceAccount.create -}} | ||
| {{ default (include "k8up.fullname" .) .Values.serviceAccount.name }} | ||
| {{- else -}} | ||
| {{ default "default" .Values.serviceAccount.name }} | ||
| {{- end -}} | ||
| {{- end -}} | ||
|
|
||
| {{/* | ||
| Backup Image | ||
| */}} | ||
| {{- define "k8up.backupImage" -}} | ||
| {{- with .Values -}} | ||
| {{ if .k8up.backupImage.repository }}{{ .k8up.backupImage.repository }}{{ else }}{{ .image.registry}}/{{ .image.repository }}{{ end }}:{{ if .k8up.backupImage.tag }}{{ .k8up.backupImage.tag }}{{ else }}{{ .image.tag }}{{ end }} | ||
| {{- end -}} | ||
| {{- end -}} |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| apiVersion: v1 | ||
| kind: ServiceAccount | ||
| metadata: | ||
| name: cleanup-service-account | ||
| annotations: | ||
| "helm.sh/hook": post-install,post-upgrade,post-delete | ||
| "helm.sh/hook-weight": "1" | ||
| "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded | ||
| labels: | ||
| {{ include "k8up.labels" . | indent 4 }} | ||
|
|
||
| --- | ||
|
|
||
| --- | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: ClusterRole | ||
| metadata: | ||
| name: k8up-cleanup-roles | ||
| namespace: {{ .Release.Namespace }} | ||
| annotations: | ||
| "helm.sh/hook": post-install,post-upgrade,post-delete | ||
| "helm.sh/hook-weight": "2" | ||
| "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded | ||
| labels: | ||
| {{- include "k8up.labels" . | nindent 4 }} | ||
| rules: | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - namespaces | ||
| verbs: | ||
| - get | ||
| - list | ||
| - apiGroups: | ||
| - "rbac.authorization.k8s.io" | ||
| resources: | ||
| - rolebindings | ||
| - roles | ||
| verbs: | ||
| - delete | ||
|
|
||
| --- | ||
|
|
||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: ClusterRoleBinding | ||
| metadata: | ||
| name: cleanup-rolebinding | ||
| annotations: | ||
| "helm.sh/hook": post-install,post-upgrade,post-delete | ||
| "helm.sh/hook-weight": "3" | ||
| "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded | ||
| labels: | ||
| {{- include "k8up.labels" . | nindent 4 }} | ||
| roleRef: | ||
| apiGroup: rbac.authorization.k8s.io | ||
| kind: ClusterRole | ||
| name: k8up-cleanup-roles | ||
| subjects: | ||
| - kind: ServiceAccount | ||
| name: cleanup-service-account | ||
| namespace: {{ .Release.Namespace }} | ||
|
|
||
| --- | ||
|
|
||
| apiVersion: batch/v1 | ||
| kind: Job | ||
| metadata: | ||
| name: "{{ .Release.Name }}-cleanup" | ||
| labels: | ||
| {{- include "k8up.labels" . | nindent 4 }} | ||
| annotations: | ||
| "helm.sh/hook": post-install,post-upgrade,post-delete | ||
| "helm.sh/hook-weight": "4" | ||
| "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded | ||
| spec: | ||
| template: | ||
| metadata: | ||
| name: "{{ .Release.Name }}" | ||
| labels: | ||
| {{- include "k8up.selectorLabels" . | nindent 8 }} | ||
| spec: | ||
| restartPolicy: Never | ||
| serviceAccountName: cleanup-service-account | ||
| containers: | ||
| - name: "{{ .Release.Name }}-cleanup" | ||
| image: "bitnami/kubectl:latest" | ||
| command: | ||
| - sh | ||
| - -c | ||
| args: | ||
| - | | ||
| #!/bin/bash | ||
|
|
||
| NAMESPACES=$(kubectl get namespace -ojson | jq -r '.items[].metadata.name') | ||
|
|
||
| for ns in $NAMESPACES | ||
| do | ||
| kubectl -n "$ns" delete rolebinding pod-executor-namespaced --ignore-not-found=true | ||
| kubectl -n "$ns" delete role pod-executor --ignore-not-found=true | ||
| done |
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,16 @@ | ||||||
| {{- if and .Values.serviceAccount.create .Values.rbac.create -}} | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🎯 Functional Correctness | 🟠 Major | ⚡ Quick win Bind an existing ServiceAccount when RBAC is enabled. When Gate this resource only on Proposed fix-{{- if and .Values.serviceAccount.create .Values.rbac.create -}}
+{{- if .Values.rbac.create -}}📝 Committable suggestion
Suggested change
🧰 Tools🪛 YAMLlint (1.37.1)[error] 1-1: syntax error: expected the node content, but found '-' (syntax) 🤖 Prompt for AI Agents |
||||||
| apiVersion: rbac.authorization.k8s.io/v1 | ||||||
| kind: ClusterRoleBinding | ||||||
| metadata: | ||||||
| name: {{ include "k8up.fullname" . }} | ||||||
| labels: | ||||||
| {{- include "k8up.labels" . | nindent 4 }} | ||||||
| roleRef: | ||||||
| apiGroup: rbac.authorization.k8s.io | ||||||
| kind: ClusterRole | ||||||
| name: {{ include "k8up.fullname" . }}-manager | ||||||
| subjects: | ||||||
| - kind: ServiceAccount | ||||||
| name: {{ include "k8up.serviceAccountName" . }} | ||||||
| namespace: {{ .Release.Namespace }} | ||||||
| {{- end }} | ||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win
Install the CRDs before the Helm release.
The documented command sequence deploys the operator before its required CRDs. This conflicts with Line 27, which requires CRD upgrades before Helm upgrades. Apply the CRD manifest first.
Proposed correction
-
bash -kubectl apply -f https://github.com/k8up-io/k8up/releases/download/k8up-4.4.1/k8up-crd.yaml -🤖 Prompt for AI Agents