Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGES/1553.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add pod label support for Pulp components.
30 changes: 30 additions & 0 deletions apis/repo-manager.pulpproject.org/v1/pulp_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,11 @@ type Api struct {
// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:hidden"}
DeploymentAnnotations map[string]string `json:"deployment_annotations,omitempty"`

// Labels to add to api pods
// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:advanced"}
PodLabels map[string]string `json:"pod_labels,omitempty"`
}

// Content defines desired state of pulpcore-content resources
Expand Down Expand Up @@ -560,6 +565,11 @@ type Content struct {
// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:hidden"}
DeploymentAnnotations map[string]string `json:"deployment_annotations,omitempty"`

// Labels to add to content pods
// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:advanced"}
PodLabels map[string]string `json:"pod_labels,omitempty"`
}

// Worker defines desired state of pulpcore-worker resources
Expand Down Expand Up @@ -633,6 +643,11 @@ type Worker struct {
// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:hidden"}
DeploymentAnnotations map[string]string `json:"deployment_annotations,omitempty"`

// Labels to add to worker pods
// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:advanced"}
PodLabels map[string]string `json:"pod_labels,omitempty"`
}

// Web defines desired state of pulpcore-web (reverse-proxy) resources
Expand Down Expand Up @@ -700,6 +715,11 @@ type Web struct {
// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:hidden"}
DeploymentAnnotations map[string]string `json:"deployment_annotations,omitempty"`

// Labels to add to web pods
// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:advanced"}
PodLabels map[string]string `json:"pod_labels,omitempty"`
}

// Database defines desired state of postgres
Expand Down Expand Up @@ -807,6 +827,11 @@ type Database struct {
// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:io.kubernetes:Probe","urn:alm:descriptor:com.tectonic.ui:advanced"}
LivenessProbe *corev1.Probe `json:"livenessProbe,omitempty"`

// Labels to add to database pods
// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:advanced"}
PodLabels map[string]string `json:"pod_labels,omitempty"`
}

// Cache defines desired state of redis resources
Expand Down Expand Up @@ -888,6 +913,11 @@ type Cache struct {
// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:hidden"}
DeploymentAnnotations map[string]string `json:"deployment_annotations,omitempty"`

// Labels to add to cache pods
// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:com.tectonic.ui:advanced"}
PodLabels map[string]string `json:"pod_labels,omitempty"`
}

// Telemetry defines the configuration for OpenTelemetry used by Pulp
Expand Down
42 changes: 42 additions & 0 deletions apis/repo-manager.pulpproject.org/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 31 additions & 1 deletion bundle/manifests/pulp-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ metadata:
capabilities: Full Lifecycle
categories: Integration & Delivery
containerImage: quay.io/pulp/pulp-operator:v1.0.0
createdAt: "2025-11-15T11:04:25Z"
createdAt: "2025-11-24T09:59:39Z"
description: Pulp is a platform for managing repositories of software packages
and making them available to a large number of consumers.
metadata.annotations.support: Community
Expand Down Expand Up @@ -260,6 +260,11 @@ spec:
path: api.pdb
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:hidden
- description: Labels to add to api pods
displayName: Pod Labels
path: api.pod_labels
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced
- description: Periodic probe of container service readiness. Container will
be removed from service endpoints if the probe fails.
displayName: Readiness Probe
Expand Down Expand Up @@ -333,6 +338,11 @@ spec:
path: cache.node_selector
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced
- description: Labels to add to cache pods
displayName: Pod Labels
path: cache.pod_labels
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced
- description: PersistenVolumeClaim name that will be used by Redis pods If
defined, the PVC must be provisioned by the user and the operator will only
configure the deployment to use it
Expand Down Expand Up @@ -459,6 +469,11 @@ spec:
path: content.pdb
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:hidden
- description: Labels to add to content pods
displayName: Pod Labels
path: content.pod_labels
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced
- description: Periodic probe of container service readiness. Container will
be removed from service endpoints if the probe fails.
displayName: Readiness Probe
Expand Down Expand Up @@ -528,6 +543,11 @@ spec:
path: database.node_selector
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced
- description: Labels to add to database pods
displayName: Pod Labels
path: database.pod_labels
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced
- description: 'Registry path to the PostgreSQL container to use. Default: "/var/lib/postgresql/data/pgdata"'
displayName: Postgres Data Path
path: database.postgres_data_path
Expand Down Expand Up @@ -959,6 +979,11 @@ spec:
path: web.pdb
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:hidden
- description: Labels to add to web pods
displayName: Pod Labels
path: web.pod_labels
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced
- description: Periodic probe of container service readiness. Container will
be removed from service endpoints if the probe fails.
displayName: Readiness Probe
Expand Down Expand Up @@ -1038,6 +1063,11 @@ spec:
path: worker.pdb
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:hidden
- description: Labels to add to worker pods
displayName: Pod Labels
path: worker.pod_labels
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced
- description: Periodic probe of container service readiness. Container will
be removed from service endpoints if the probe fails.
displayName: Readiness Probe
Expand Down
30 changes: 30 additions & 0 deletions bundle/manifests/repo-manager.pulpproject.org_pulps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1910,6 +1910,11 @@ spec:
if they encounter an unrecognized policy in this field.
type: string
type: object
pod_labels:
additionalProperties:
type: string
description: Labels to add to api pods
type: object
readinessProbe:
description: |-
Periodic probe of container service readiness.
Expand Down Expand Up @@ -3488,6 +3493,11 @@ spec:
type: string
description: NodeSelector for the Pulp pods.
type: object
pod_labels:
additionalProperties:
type: string
description: Labels to add to cache pods
type: object
pvc:
description: |-
PersistenVolumeClaim name that will be used by Redis pods
Expand Down Expand Up @@ -5451,6 +5461,11 @@ spec:
if they encounter an unrecognized policy in this field.
type: string
type: object
pod_labels:
additionalProperties:
type: string
description: Labels to add to content pods
type: object
readinessProbe:
description: |-
Periodic probe of container service readiness.
Expand Down Expand Up @@ -7022,6 +7037,11 @@ spec:
type: string
description: NodeSelector for the database pod.
type: object
pod_labels:
additionalProperties:
type: string
description: Labels to add to database pods
type: object
postgres_data_path:
description: |-
Registry path to the PostgreSQL container to use.
Expand Down Expand Up @@ -8601,6 +8621,11 @@ spec:
if they encounter an unrecognized policy in this field.
type: string
type: object
pod_labels:
additionalProperties:
type: string
description: Labels to add to web pods
type: object
readinessProbe:
description: |-
Periodic probe of container service readiness.
Expand Down Expand Up @@ -10503,6 +10528,11 @@ spec:
if they encounter an unrecognized policy in this field.
type: string
type: object
pod_labels:
additionalProperties:
type: string
description: Labels to add to worker pods
type: object
readinessProbe:
description: |-
Periodic probe of container service readiness.
Expand Down
30 changes: 30 additions & 0 deletions config/crd/bases/repo-manager.pulpproject.org_pulps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1910,6 +1910,11 @@ spec:
if they encounter an unrecognized policy in this field.
type: string
type: object
pod_labels:
additionalProperties:
type: string
description: Labels to add to api pods
type: object
readinessProbe:
description: |-
Periodic probe of container service readiness.
Expand Down Expand Up @@ -3488,6 +3493,11 @@ spec:
type: string
description: NodeSelector for the Pulp pods.
type: object
pod_labels:
additionalProperties:
type: string
description: Labels to add to cache pods
type: object
pvc:
description: |-
PersistenVolumeClaim name that will be used by Redis pods
Expand Down Expand Up @@ -5451,6 +5461,11 @@ spec:
if they encounter an unrecognized policy in this field.
type: string
type: object
pod_labels:
additionalProperties:
type: string
description: Labels to add to content pods
type: object
readinessProbe:
description: |-
Periodic probe of container service readiness.
Expand Down Expand Up @@ -7022,6 +7037,11 @@ spec:
type: string
description: NodeSelector for the database pod.
type: object
pod_labels:
additionalProperties:
type: string
description: Labels to add to database pods
type: object
postgres_data_path:
description: |-
Registry path to the PostgreSQL container to use.
Expand Down Expand Up @@ -8601,6 +8621,11 @@ spec:
if they encounter an unrecognized policy in this field.
type: string
type: object
pod_labels:
additionalProperties:
type: string
description: Labels to add to web pods
type: object
readinessProbe:
description: |-
Periodic probe of container service readiness.
Expand Down Expand Up @@ -10503,6 +10528,11 @@ spec:
if they encounter an unrecognized policy in this field.
type: string
type: object
pod_labels:
additionalProperties:
type: string
description: Labels to add to worker pods
type: object
readinessProbe:
description: |-
Periodic probe of container service readiness.
Expand Down
Loading