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
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
base_images:
tls-scanner-tool:
name: tls-scanner
namespace: tls-scanner
tag: tls-scanner-tool
build_root:
from_repository: true
images:
Expand Down Expand Up @@ -146,6 +151,128 @@ tests:
requests:
cpu: 100m
workflow: ipi-gcp
- always_run: false
as: tls13-adherence
optional: true

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of another periodic job, I think making this required would be more reasonable.

steps:
cluster_profile: openshift-org-gcp
env:
PQC_CHECK: "false"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was comparing the changes with https://github.com/openshift/release/pull/82718/changes PR, but I cannot see PQC_CHECK envvar was defined there. Is false the default value?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes. By default its false.

# Enable post-quantum cryptography checks when requested by the step ref.
if [[ "${PQC_CHECK:-false}" == "true" ]]; then
SCANNER_ARGS="${SCANNER_ARGS} --pqc-check"
echo "PQC readiness mode enabled: checks TLS 1.3 support and mlkem or mlkem25519 support per target."
fi

SCAN_NAMESPACE: memcached-molecule-operator-system
SCANNER_CPU: "1"
SCANNER_MEMORY: 1Gi
TLS_13_ENABLE_TLS_ADHERENCE: "true"
TLS_13_TLS_ADHERENCE_POLICY: StrictAllComponents
test:
- as: deploy-operator
cli: latest
commands: |
mkdir -p /tmp/bin
ln -sf "$(command -v oc)" /tmp/bin/kubectl
export PATH="/tmp/bin:${PATH}"
cd testdata/memcached-molecule-operator
Comment on lines +170 to +173

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of modifying this here, can we not make the actual script configurable to deploy the operator, then proceed if required?

make deploy IMG="${IMAGE_FORMAT}"
oc wait --for=condition=Available --timeout=5m -n memcached-molecule-operator-system deployment/memcached-molecule-operator-controller-manager
Comment on lines +174 to +175

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We generally do some modifications before checking whether the pods are running or not

xref: https://github.com/openshift/ansible-operator-plugins/blob/2e572ad8a552f449fd166d776005a60f52dd8fdb/openshift/ci/tests/e2e-ansible-scaffolding.sh#L153-L199

Don't we need that here?

dependencies:
- env: IMAGE_FORMAT
name: ansible-operator-e2e
from: src
resources:
requests:
cpu: 100m
- ref: tls-13
- ref: tls-scanner-run
workflow: ipi-gcp
- as: tls13-adherence-periodic

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need a periodic job? Given the traffic on this repo, is the pre-merge test not enough?

cron: 0 6 * * 1
steps:
cluster_profile: openshift-org-gcp
env:
PQC_CHECK: "false"
SCAN_NAMESPACE: memcached-molecule-operator-system
SCANNER_CPU: "1"
SCANNER_MEMORY: 1Gi
TLS_13_ENABLE_TLS_ADHERENCE: "true"
TLS_13_TLS_ADHERENCE_POLICY: StrictAllComponents
test:
- as: deploy-operator
cli: latest
commands: |
mkdir -p /tmp/bin
ln -sf "$(command -v oc)" /tmp/bin/kubectl
export PATH="/tmp/bin:${PATH}"
cd testdata/memcached-molecule-operator
make deploy IMG="${IMAGE_FORMAT}"
oc wait --for=condition=Available --timeout=5m -n memcached-molecule-operator-system deployment/memcached-molecule-operator-controller-manager
dependencies:
- env: IMAGE_FORMAT
name: ansible-operator-e2e
from: src
resources:
requests:
cpu: 100m
- ref: tls-13
- ref: tls-scanner-run
workflow: ipi-gcp
- always_run: false
as: tls-pqc-readiness
optional: true
steps:
cluster_profile: openshift-org-gcp
env:
PQC_CHECK: "true"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SCAN_NAMESPACE: memcached-molecule-operator-system
SCANNER_CPU: "1"
SCANNER_MEMORY: 1Gi
test:
- as: deploy-operator
cli: latest
commands: |
mkdir -p /tmp/bin
ln -sf "$(command -v oc)" /tmp/bin/kubectl
export PATH="/tmp/bin:${PATH}"
cd testdata/memcached-molecule-operator
make deploy IMG="${IMAGE_FORMAT}"
oc wait --for=condition=Available --timeout=5m -n memcached-molecule-operator-system deployment/memcached-molecule-operator-controller-manager
dependencies:
- env: IMAGE_FORMAT
name: ansible-operator-e2e
from: src
resources:
requests:
cpu: 100m
- ref: tls-13
- ref: tls-scanner-run
workflow: ipi-gcp
- as: tls-pqc-readiness-periodic

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment as above to periodic job

cron: 0 6 * * 1
steps:
cluster_profile: openshift-org-gcp
env:
PQC_CHECK: "true"
SCAN_NAMESPACE: memcached-molecule-operator-system
SCANNER_CPU: "1"
SCANNER_MEMORY: 1Gi
test:
- as: deploy-operator
cli: latest
commands: |
mkdir -p /tmp/bin
ln -sf "$(command -v oc)" /tmp/bin/kubectl
export PATH="/tmp/bin:${PATH}"
cd testdata/memcached-molecule-operator
make deploy IMG="${IMAGE_FORMAT}"
oc wait --for=condition=Available --timeout=5m -n memcached-molecule-operator-system deployment/memcached-molecule-operator-controller-manager
dependencies:
- env: IMAGE_FORMAT
name: ansible-operator-e2e
from: src
resources:
requests:
cpu: 100m
- ref: tls-13
- ref: tls-scanner-run
workflow: ipi-gcp
- as: verify-deps
steps:
env:
Expand Down

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar comments for this repo as well, not adding them again.

Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
base_images:
tls-scanner-tool:
name: tls-scanner
namespace: tls-scanner
tag: tls-scanner-tool
build_root:
from_repository: true
images:
Expand Down Expand Up @@ -147,6 +152,136 @@ tests:
requests:
cpu: 100m
workflow: ipi-gcp
- always_run: false
as: tls13-adherence
optional: true
steps:
cluster_profile: openshift-org-gcp
env:
PQC_CHECK: "false"
SCAN_NAMESPACE: memcached-operator-system
SCANNER_CPU: "1"
SCANNER_MEMORY: 1Gi
TLS_13_ENABLE_TLS_ADHERENCE: "true"
TLS_13_TLS_ADHERENCE_POLICY: StrictAllComponents
test:
- as: deploy-operator
cli: latest
commands: |
mkdir -p /tmp/bin
ln -sf "$(command -v oc)" /tmp/bin/kubectl
export PATH="/tmp/bin:${PATH}"
make -f ci/prow.Makefile patch
cd testdata/helm/memcached-operator
oc adm policy add-cluster-role-to-user cluster-admin -z default || true
make deploy IMG="${IMAGE_FORMAT}"
oc wait --for=condition=Available --timeout=5m -n memcached-operator-system deployment/memcached-operator-controller-manager
dependencies:
- env: IMAGE_FORMAT
name: osdk-helm-e2e
from: src
resources:
requests:
cpu: 100m
- ref: tls-13
- ref: tls-scanner-run
workflow: ipi-gcp
- as: tls13-adherence-periodic
cron: 0 6 * * 1
steps:
cluster_profile: openshift-org-gcp
env:
PQC_CHECK: "false"
SCAN_NAMESPACE: memcached-operator-system
SCANNER_CPU: "1"
SCANNER_MEMORY: 1Gi
TLS_13_ENABLE_TLS_ADHERENCE: "true"
TLS_13_TLS_ADHERENCE_POLICY: StrictAllComponents
test:
- as: deploy-operator
cli: latest
commands: |
mkdir -p /tmp/bin
ln -sf "$(command -v oc)" /tmp/bin/kubectl
export PATH="/tmp/bin:${PATH}"
make -f ci/prow.Makefile patch
cd testdata/helm/memcached-operator
oc adm policy add-cluster-role-to-user cluster-admin -z default || true
make deploy IMG="${IMAGE_FORMAT}"
oc wait --for=condition=Available --timeout=5m -n memcached-operator-system deployment/memcached-operator-controller-manager
dependencies:
- env: IMAGE_FORMAT
name: osdk-helm-e2e
from: src
resources:
requests:
cpu: 100m
- ref: tls-13
- ref: tls-scanner-run
workflow: ipi-gcp
- always_run: false
as: tls-pqc-readiness
optional: true
steps:
cluster_profile: openshift-org-gcp
env:
PQC_CHECK: "true"
SCAN_NAMESPACE: memcached-operator-system
SCANNER_CPU: "1"
SCANNER_MEMORY: 1Gi
test:
- as: deploy-operator
cli: latest
commands: |
mkdir -p /tmp/bin
ln -sf "$(command -v oc)" /tmp/bin/kubectl
export PATH="/tmp/bin:${PATH}"
make -f ci/prow.Makefile patch
cd testdata/helm/memcached-operator
oc adm policy add-cluster-role-to-user cluster-admin -z default || true
make deploy IMG="${IMAGE_FORMAT}"
oc wait --for=condition=Available --timeout=5m -n memcached-operator-system deployment/memcached-operator-controller-manager
dependencies:
- env: IMAGE_FORMAT
name: osdk-helm-e2e
from: src
resources:
requests:
cpu: 100m
- ref: tls-13
- ref: tls-scanner-run
workflow: ipi-gcp
- as: tls-pqc-readiness-periodic
cron: 0 6 * * 1
steps:
cluster_profile: openshift-org-gcp
env:
PQC_CHECK: "true"
SCAN_NAMESPACE: memcached-operator-system
SCANNER_CPU: "1"
SCANNER_MEMORY: 1Gi
test:
- as: deploy-operator
cli: latest
commands: |
mkdir -p /tmp/bin
ln -sf "$(command -v oc)" /tmp/bin/kubectl
export PATH="/tmp/bin:${PATH}"
make -f ci/prow.Makefile patch
cd testdata/helm/memcached-operator
oc adm policy add-cluster-role-to-user cluster-admin -z default || true
make deploy IMG="${IMAGE_FORMAT}"
oc wait --for=condition=Available --timeout=5m -n memcached-operator-system deployment/memcached-operator-controller-manager
dependencies:
- env: IMAGE_FORMAT
name: osdk-helm-e2e
from: src
resources:
requests:
cpu: 100m
- ref: tls-13
- ref: tls-scanner-run
workflow: ipi-gcp
- as: verify-deps
steps:
env:
Expand Down
Loading