Skip to content

Commit aeca4ff

Browse files
git-hyagigit-hyagi
committed
draft
1 parent 846bcef commit aeca4ff

File tree

6 files changed

+17
-70
lines changed

6 files changed

+17
-70
lines changed

‎bundle/manifests/pulp-operator.clusterserviceversion.yaml‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ metadata:
6464
capabilities: Full Lifecycle
6565
categories: Integration & Delivery
6666
containerImage: quay.io/pulp/pulp-operator:devel
67-
createdAt: "2025-04-08T20:22:53Z"
67+
createdAt: "2025-04-09T18:21:28Z"
6868
description: Pulp is a platform for managing repositories of software packages
6969
and making them available to a large number of consumers.
7070
metadata.annotations.support: Community
@@ -198,7 +198,7 @@ spec:
198198
- urn:alm:descriptor:io.kubernetes:Secret
199199
- urn:alm:descriptor:com.tectonic.ui:advanced
200200
- description: 'List of allowed checksum algorithms used to verify repository''s
201-
integrity. Valid options: ["md5","sha1","sha256","sha512"].'
201+
integrity. Valid options: ["md5","sha1","sha224","sha256","sha384","sha512"].'
202202
displayName: Allowed Content Checksums
203203
path: allowed_content_checksums
204204
x-descriptors:
@@ -601,25 +601,13 @@ spec:
601601
x-descriptors:
602602
- urn:alm:descriptor:io.kubernetes:Secret
603603
- urn:alm:descriptor:com.tectonic.ui:advanced
604-
- description: 'Define if the operator should or should not deploy the default
605-
Execution Environments. Default: false'
606-
displayName: Deploy EEDefaults
607-
path: deploy_ee_defaults
608-
x-descriptors:
609-
- urn:alm:descriptor:com.tectonic.ui:hidden
610604
- description: Disable database migrations. Useful for situations in which we
611605
don't want to automatically run the database migrations, for example, during
612606
restore.
613607
displayName: Disable Migrations
614608
path: disable_migrations
615609
x-descriptors:
616610
- urn:alm:descriptor:com.tectonic.ui:hidden
617-
- description: 'Name of the ConfigMap with the list of Execution Environments
618-
that should be synchronized. Default: ee-default-images'
619-
displayName: EEDefaults
620-
path: ee_defaults
621-
x-descriptors:
622-
- urn:alm:descriptor:com.tectonic.ui:hidden
623611
- description: 'By default Pulp logs at INFO level, but enabling DEBUG logging
624612
can be a helpful thing to get more insight when things don’t go as expected.
625613
Default: false'
@@ -657,7 +645,7 @@ spec:
657645
path: image
658646
x-descriptors:
659647
- urn:alm:descriptor:com.tectonic.ui:advanced
660-
- description: 'Image pull policy for container image. Default: "IfNotPresent"'
648+
- description: Image pull policy for container image.
661649
displayName: Image Pull Policy
662650
path: image_pull_policy
663651
x-descriptors:

‎bundle/manifests/repo-manager.pulpproject.org_pulps.yaml‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ spec:
241241
allowed_content_checksums:
242242
description: |-
243243
List of allowed checksum algorithms used to verify repository's integrity.
244-
Valid options: ["md5","sha1","sha256","sha512"].
244+
Valid options: ["md5","sha1","sha224","sha256","sha384","sha512"].
245245
items:
246246
type: string
247247
type: array
@@ -5691,9 +5691,8 @@ spec:
56915691
type: array
56925692
type: object
56935693
custom_pulp_settings:
5694-
description: |-
5695-
Name of the ConfigMap to define Pulp configurations not available
5696-
through this CR.
5694+
description: Name of the ConfigMap to define Pulp configurations not
5695+
available through this CR.
56975696
type: string
56985697
database:
56995698
description: Database defines desired state of postgres resources
@@ -7097,21 +7096,11 @@ spec:
70977096
Secret where the Fernet symmetric encryption key is stored.
70987097
Default: <operators's name>-"-db-fields-encryption"
70997098
type: string
7100-
deploy_ee_defaults:
7101-
description: |-
7102-
Define if the operator should or should not deploy the default Execution Environments.
7103-
Default: false
7104-
type: boolean
71057099
disable_migrations:
71067100
description: |-
71077101
Disable database migrations. Useful for situations in which we don't want
71087102
to automatically run the database migrations, for example, during restore.
71097103
type: boolean
7110-
ee_defaults:
7111-
description: |-
7112-
Name of the ConfigMap with the list of Execution Environments that should be synchronized.
7113-
Default: ee-default-images
7114-
type: string
71157104
enable_debugging:
71167105
description: |-
71177106
By default Pulp logs at INFO level, but enabling DEBUG logging can be a
@@ -7146,10 +7135,7 @@ spec:
71467135
Default: "quay.io/pulp/pulp-minimal:stable"
71477136
type: string
71487137
image_pull_policy:
7149-
default: IfNotPresent
7150-
description: |-
7151-
Image pull policy for container image.
7152-
Default: "IfNotPresent"
7138+
description: Image pull policy for container image.
71537139
enum:
71547140
- IfNotPresent
71557141
- Always

‎config/crd/bases/repo-manager.pulpproject.org_pulps.yaml‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ spec:
241241
allowed_content_checksums:
242242
description: |-
243243
List of allowed checksum algorithms used to verify repository's integrity.
244-
Valid options: ["md5","sha1","sha256","sha512"].
244+
Valid options: ["md5","sha1","sha224","sha256","sha384","sha512"].
245245
items:
246246
type: string
247247
type: array
@@ -5691,9 +5691,8 @@ spec:
56915691
type: array
56925692
type: object
56935693
custom_pulp_settings:
5694-
description: |-
5695-
Name of the ConfigMap to define Pulp configurations not available
5696-
through this CR.
5694+
description: Name of the ConfigMap to define Pulp configurations not
5695+
available through this CR.
56975696
type: string
56985697
database:
56995698
description: Database defines desired state of postgres resources
@@ -7097,21 +7096,11 @@ spec:
70977096
Secret where the Fernet symmetric encryption key is stored.
70987097
Default: <operators's name>-"-db-fields-encryption"
70997098
type: string
7100-
deploy_ee_defaults:
7101-
description: |-
7102-
Define if the operator should or should not deploy the default Execution Environments.
7103-
Default: false
7104-
type: boolean
71057099
disable_migrations:
71067100
description: |-
71077101
Disable database migrations. Useful for situations in which we don't want
71087102
to automatically run the database migrations, for example, during restore.
71097103
type: boolean
7110-
ee_defaults:
7111-
description: |-
7112-
Name of the ConfigMap with the list of Execution Environments that should be synchronized.
7113-
Default: ee-default-images
7114-
type: string
71157104
enable_debugging:
71167105
description: |-
71177106
By default Pulp logs at INFO level, but enabling DEBUG logging can be a
@@ -7146,9 +7135,7 @@ spec:
71467135
Default: "quay.io/pulp/pulp-minimal:stable"
71477136
type: string
71487137
image_pull_policy:
7149-
description: |-
7150-
Image pull policy for container image.
7151-
Default: "IfNotPresent"
7138+
description: Image pull policy for container image.
71527139
enum:
71537140
- IfNotPresent
71547141
- Always

‎config/manifests/bases/pulp-operator.clusterserviceversion.yaml‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ spec:
208208
- urn:alm:descriptor:io.kubernetes:Secret
209209
- urn:alm:descriptor:com.tectonic.ui:advanced
210210
- description: 'List of allowed checksum algorithms used to verify repository''s
211-
integrity. Valid options: ["md5","sha1","sha256","sha512"].'
211+
integrity. Valid options: ["md5","sha1","sha224","sha256","sha384","sha512"].'
212212
displayName: Allowed Content Checksums
213213
path: allowed_content_checksums
214214
x-descriptors:
@@ -611,25 +611,13 @@ spec:
611611
x-descriptors:
612612
- urn:alm:descriptor:io.kubernetes:Secret
613613
- urn:alm:descriptor:com.tectonic.ui:advanced
614-
- description: 'Define if the operator should or should not deploy the default
615-
Execution Environments. Default: false'
616-
displayName: Deploy EEDefaults
617-
path: deploy_ee_defaults
618-
x-descriptors:
619-
- urn:alm:descriptor:com.tectonic.ui:hidden
620614
- description: Disable database migrations. Useful for situations in which we
621615
don't want to automatically run the database migrations, for example, during
622616
restore.
623617
displayName: Disable Migrations
624618
path: disable_migrations
625619
x-descriptors:
626620
- urn:alm:descriptor:com.tectonic.ui:hidden
627-
- description: 'Name of the ConfigMap with the list of Execution Environments
628-
that should be synchronized. Default: ee-default-images'
629-
displayName: EEDefaults
630-
path: ee_defaults
631-
x-descriptors:
632-
- urn:alm:descriptor:com.tectonic.ui:hidden
633621
- description: 'By default Pulp logs at INFO level, but enabling DEBUG logging
634622
can be a helpful thing to get more insight when things don’t go as expected.
635623
Default: false'
@@ -667,7 +655,7 @@ spec:
667655
path: image
668656
x-descriptors:
669657
- urn:alm:descriptor:com.tectonic.ui:advanced
670-
- description: 'Image pull policy for container image. Default: "IfNotPresent"'
658+
- description: Image pull policy for container image.
671659
displayName: Image Pull Policy
672660
path: image_pull_policy
673661
x-descriptors:

‎controllers/repo_manager/README.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ PulpSpec defines the desired state of Pulp
213213
| image | The image name (repo name) for the pulp image. Default: \"quay.io/pulp/pulp-minimal:stable\" | string | false |
214214
| image_version | The image version for the pulp image. Default: \"stable\" | string | false |
215215
| inhibit_version_constraint | Relax the check of image_version and image_web_version not matching. Default: \"false\" | bool | false |
216-
| image_pull_policy | Image pull policy for container image. Default: \"IfNotPresent\" | string | false |
216+
| image_pull_policy | Image pull policy for container image. | string | false |
217217
| api | Api defines desired state of pulpcore-api resources | [Api](#api) | true |
218218
| database | Database defines desired state of postgres resources | [Database](#database) | false |
219219
| content | Content defines desired state of pulpcore-content resources | [Content](#content) | false |
@@ -229,14 +229,12 @@ PulpSpec defines the desired state of Pulp
229229
| sa_labels | ServiceAccount.metadata.labels that will be used in Pulp pods. | map[string]string | false |
230230
| sso_secret | Secret where Single Sign-on configuration can be found | string | false |
231231
| mount_trusted_ca | Define if the operator should or should not mount the custom CA certificates added to the cluster via cluster-wide proxy config. Default: false | bool | false |
232-
| deploy_ee_defaults | Define if the operator should or should not deploy the default Execution Environments. Default: false | bool | false |
233-
| ee_defaults | Name of the ConfigMap with the list of Execution Environments that should be synchronized. Default: ee-default-images | string | false |
234232
| admin_password_job | Job to reset pulp admin password | [PulpJob](#pulpjob) | false |
235233
| migration_job | Job to run django migrations | [PulpJob](#pulpjob) | false |
236234
| signing_job | Job to store signing metadata scripts | [PulpJob](#pulpjob) | false |
237235
| disable_migrations | Disable database migrations. Useful for situations in which we don't want to automatically run the database migrations, for example, during restore. | bool | false |
238236
| pulp_secret_key | Name of the Secret to provide Django cryptographic signing. Default: \"pulp-secret-key\" | string | false |
239-
| allowed_content_checksums | List of allowed checksum algorithms used to verify repository's integrity. Valid options: [\"md5\",\"sha1\",\"sha256\",\"sha512\"]. | []string | false |
237+
| allowed_content_checksums | List of allowed checksum algorithms used to verify repository's integrity. Valid options: [\"md5\",\"sha1\",\"sha224\",\"sha256\",\"sha384\",\"sha512\"]. | []string | false |
240238
| loadbalancer_protocol | Protocol used by pulp-web service when ingress_type==loadbalancer | string | false |
241239
| loadbalancer_port | Port exposed by pulp-web service when ingress_type==loadbalancer | int32 | false |
242240
| telemetry | Telemetry defines the OpenTelemetry configuration | [Telemetry](#telemetry) | false |

‎controllers/repo_manager/controller_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,7 @@ exec "${PULP_API_ENTRYPOINT[@]}" \
718718
Containers: []corev1.Container{{
719719
Name: "content",
720720
Image: "quay.io/pulp/pulp-minimal:latest",
721-
ImagePullPolicy: corev1.PullPolicy("IfNotPresent"),
721+
ImagePullPolicy: corev1.PullPolicy("Always"),
722722
Command: []string{"/bin/sh"},
723723
Args: []string{
724724
"-c",
@@ -806,7 +806,7 @@ exec "${PULP_CONTENT_ENTRYPOINT[@]}" \
806806
Containers: []corev1.Container{{
807807
Name: "worker",
808808
Image: "quay.io/pulp/pulp-minimal:latest",
809-
ImagePullPolicy: corev1.PullPolicy("IfNotPresent"),
809+
ImagePullPolicy: corev1.PullPolicy("Always"),
810810
Command: []string{"/usr/bin/pulp-worker"},
811811
Env: envVarsWorker,
812812
// LivenessProbe: livenessProbe,

0 commit comments

Comments
 (0)