Skip to content

Commit

Permalink
Temporarily pin the pulp-web version in CI samples
Browse files Browse the repository at this point in the history
pulp-oci-image repo has been updated and we are currently missing
the amd64 architecture for pulp-web image in Quay. As a workaround,
this commit pins to an older image that still supports amd64.
It also updates the check for docker installation in CI because
the ubuntu 24.04 (GH runner) does not come with the daemon.json
file by default.

[noissue]
  • Loading branch information
git-hyagi committed Dec 23, 2024
1 parent 2006d36 commit d62101a
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 15 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ jobs:
shell: bash
- name: Updating registries configuration
run: |
if [ -f "/etc/docker/daemon.json" ]
if [ -f "/etc/docker/daemon.json" ] || sudo systemctl is-active --quiet docker
then
echo "INFO:
Updating docker configuration
Expand Down Expand Up @@ -294,7 +294,7 @@ jobs:
shell: bash
- name: Updating registries configuration
run: |
if [ -f "/etc/docker/daemon.json" ]
if [ -f "/etc/docker/daemon.json" ] || sudo systemctl is-active --quiet docker
then
echo "INFO:
Updating docker configuration
Expand Down Expand Up @@ -399,7 +399,7 @@ jobs:
shell: bash
- name: Updating registries configuration
run: |
if [ -f "/etc/docker/daemon.json" ]
if [ -f "/etc/docker/daemon.json" ] || sudo systemctl is-active --quiet docker
then
echo "INFO:
Updating docker configuration
Expand Down Expand Up @@ -643,7 +643,7 @@ jobs:
shell: bash
- name: Updating registries configuration
run: |
if [ -f "/etc/docker/daemon.json" ]
if [ -f "/etc/docker/daemon.json" ] || sudo systemctl is-active --quiet docker
then
echo "INFO:
Updating docker configuration
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/k8s_versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
shell: bash
- name: Updating registries configuration
run: |
if [ -f "/etc/docker/daemon.json" ]
if [ -f "/etc/docker/daemon.json" ] || sudo systemctl is-active --quiet docker
then
echo "INFO:
Updating docker configuration
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
shell: bash
- name: Updating registries configuration
run: |
if [ -f "/etc/docker/daemon.json" ]
if [ -f "/etc/docker/daemon.json" ] || sudo systemctl is-active --quiet docker
then
echo "INFO:
Updating docker configuration
Expand Down Expand Up @@ -239,7 +239,7 @@ jobs:
shell: bash
- name: Updating registries configuration
run: |
if [ -f "/etc/docker/daemon.json" ]
if [ -f "/etc/docker/daemon.json" ] || sudo systemctl is-active --quiet docker
then
echo "INFO:
Updating docker configuration
Expand Down
3 changes: 2 additions & 1 deletion config/samples/k8s_versions_ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ metadata:
name: example-pulp
spec:
image_version: stable
image_web_version: stable
image_web_version: 3.63.4
inhibit_version_constraint: true

api:
replicas: 1
Expand Down
3 changes: 2 additions & 1 deletion config/samples/ldap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ metadata:
spec:
image: localhost/pulp-minimal
image_version: stable
image_web_version: stable
image_web_version: 3.63.4
inhibit_version_constraint: true
ldap:
config: pulp-ldap-secret
api:
Expand Down
3 changes: 2 additions & 1 deletion config/samples/simple-external-db.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ spec:
external_db_secret: external-database

image_version: stable
image_web_version: stable
image_web_version: 3.63.4
inhibit_version_constraint: true
api:
replicas: 1
content:
Expand Down
3 changes: 2 additions & 1 deletion config/samples/simple-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ spec:
enabled: true
deployment_type: pulp
image_version: stable
image_web_version: stable
image_web_version: 3.63.4
inhibit_version_constraint: true
api:
replicas: 1
content:
Expand Down
3 changes: 2 additions & 1 deletion config/samples/simple-with-reduced-migration-cpu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ spec:
enabled: true
deployment_type: pulp
image_version: stable
image_web_version: stable
image_web_version: 3.63.4
inhibit_version_constraint: true
api:
replicas: 1
content:
Expand Down
3 changes: 2 additions & 1 deletion config/samples/simple.ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ metadata:
spec:
deployment_type: pulp
image_version: stable
image_web_version: stable
image_web_version: 3.63.4
inhibit_version_constraint: true
# affinity:
# nodeAffinity:
# requiredDuringSchedulingIgnoredDuringExecution:
Expand Down
3 changes: 2 additions & 1 deletion config/samples/simple.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ metadata:
spec:
deployment_type: pulp
image_version: stable
image_web_version: stable
image_web_version: 3.63.4
inhibit_version_constraint: true
# affinity:
# nodeAffinity:
# requiredDuringSchedulingIgnoredDuringExecution:
Expand Down
3 changes: 2 additions & 1 deletion config/samples/telemetry.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ spec:
telemetry:
enabled: true
image_version: stable
image_web_version: stable
image_web_version: 3.63.4
inhibit_version_constraint: true
api:
replicas: 1
content:
Expand Down

0 comments on commit d62101a

Please sign in to comment.