Skip to content

feat(api) VI/CVI exclude pod's from quota #1848

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.

Sign up for GitHub

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

Draft
danilrwx wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

feat(api) VI/CVI exclude pod's from quota #1848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
33fe40b
feat(api) VI/CVI exclude pod's from quota
danilrwx Dec 22, 2025
c3d4291
test
danilrwx Dec 24, 2025
db9e4d1
add prefixes
danilrwx Dec 29, 2025
2d404ce
Revert "add prefixes"
danilrwx Dec 29, 2025
8278b4f
add d8-cdi-sa
danilrwx Dec 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion images/cdi-artifact/werf.inc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
{{- $gitRepoName := "3p-containerized-data-importer" }}
{{- $gitRepoUrl := (printf "%s/%s" "deckhouse" $gitRepoName) }}
{{- $version := get $.Core $gitRepoName }}
{{- $version := "feat/core/exclude-pods-from-quotes" }}

{{- $name := print $.ImageName "-dependencies" -}}
{{- define "$name" -}}
Expand Down Expand Up @@ -37,8 +37,10 @@ secrets:
- id: SOURCE_REPO
value: {{ $.SOURCE_REPO }}
shell:
installCacheVersion: "{{ now | date "Mon Jan 2 15:04:05 MST 2006" }}"
install:
- |
echo "$date"
echo "Git clone {{ $gitRepoName }} repository..."
git clone --depth=1 --branch {{ $version }} $(cat /run/secrets/SOURCE_REPO)/{{ $gitRepoUrl }} /src/containerized-data-importer

Expand Down
5 changes: 5 additions & 0 deletions images/virtualization-artifact/pkg/common/annotations/annotations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,11 @@ const (
// DVCRLabelValue provides a constant for DVCR Pod label values.
DVCRLabelValue = "dvcr-data-importer"

// QuotaExcludeValue provides a constant for exclude quota value.
QuotaExcludeValue = "true"
// QuotaExcludeLabel provides a constant for exclude quota label.
QuotaExcludeLabel = "resource-quota-overrides.deckhouse.io/ignore"

// InhibitNodeShutdownLabel is a label to prevent node shutdown is Pod with label is present.
InhibitNodeShutdownLabel = "pod.deckhouse.io/inhibit-node-shutdown"

Expand Down
3 changes: 2 additions & 1 deletion images/virtualization-artifact/pkg/controller/importer/importer_pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@ func (imp *Importer) makeImporterPodSpec() (*corev1.Pod, error) {
Name: imp.PodSettings.Name,
Namespace: imp.PodSettings.Namespace,
Labels: map[string]string{
annotations.AppLabel: annotations.DVCRLabelValue,
annotations.AppLabel: annotations.DVCRLabelValue,
annotations.QuotaExcludeLabel: annotations.QuotaExcludeValue,
},
Annotations: map[string]string{
annotations.AnnCreatedBy: "yes",
Expand Down
1 change: 1 addition & 0 deletions images/virtualization-artifact/pkg/controller/uploader/uploader_pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ func (p *Pod) makeSpec() (*corev1.Pod, error) {
Labels: map[string]string{
annotations.AppLabel: annotations.DVCRLabelValue,
annotations.UploaderServiceLabel: p.PodSettings.ServiceName,
annotations.QuotaExcludeLabel: annotations.QuotaExcludeValue,
},
OwnerReferences: []metav1.OwnerReference{
p.PodSettings.OwnerReference,
Expand Down
2 changes: 1 addition & 1 deletion templates/admission-policy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ spec:
"system:serviceaccount:d8-virtualization:cdi-apiserver",
"system:serviceaccount:d8-virtualization:cdi-cronjob",
"system:serviceaccount:d8-virtualization:cdi-operator",
"system:serviceaccount:d8-virtualization:cdi-sa",
"system:serviceaccount:d8-virtualization:d8-cdi-sa",
"system:serviceaccount:d8-virtualization:cdi-uploadproxy",
"system:serviceaccount:d8-virtualization:kubevirt-internal-virtualization-apiserver",
"system:serviceaccount:d8-virtualization:kubevirt-internal-virtualization-controller",
Expand Down
4 changes: 2 additions & 2 deletions templates/cdi/cdi-deployment/rbac-for-us.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
{{- include "helm_lib_module_labels" (list . (dict "app" "cdi-deployment")) | nindent 2 }}
subjects:
- kind: ServiceAccount
name: cdi-sa
name: d8-cdi-sa
namespace: d8-{{ .Chart.Name }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: d8:rbac-proxy
name: d8:rbac-proxy
Loading