✨Namespace and PVC probes #2535
+273
−21
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,204 @@ | ||
| Feature: Install ClusterExtensionRevision | ||
|
|
||
| As an OLM user I would like to install a cluster extension revision. | ||
|
|
||
| Background: | ||
| Given OLM is available | ||
| And ServiceAccount "olm-sa" with needed permissions is available in ${TEST_NAMESPACE} | ||
|
|
||
| @BoxcutterRuntime | ||
| Scenario: Install simple revision | ||
|
Contributor
There was a problem hiding this comment. how is this scenario related to the logic introduced in PR? We have plenty of scenarios under
Contributor
Author
There was a problem hiding this comment. IMO it's an easy way to prove that CERs can be used to install content without a ClusterExtension owner. I thought this was necessary since we had discussed the possibility that users might (but probably won't) use the API directly - plus its runtime is only about 1.5 seconds. I can remove it if you think it's unnecessary. |
||
| When ClusterExtensionRevision is applied | ||
| """ | ||
| apiVersion: olm.operatorframework.io/v1 | ||
| kind: ClusterExtensionRevision | ||
| metadata: | ||
| annotations: | ||
| olm.operatorframework.io/service-account-name: olm-sa | ||
| olm.operatorframework.io/service-account-namespace: ${TEST_NAMESPACE} | ||
| name: ${CER_NAME} | ||
| spec: | ||
| lifecycleState: Active | ||
| collisionProtection: Prevent | ||
| phases: | ||
| - name: policies | ||
| objects: | ||
| - object: | ||
| apiVersion: networking.k8s.io/v1 | ||
| kind: NetworkPolicy | ||
| metadata: | ||
| name: test-operator-network-policy | ||
| namespace: ${TEST_NAMESPACE} | ||
| spec: | ||
| podSelector: {} | ||
| policyTypes: | ||
| - Ingress | ||
| - name: deploy | ||
| objects: | ||
| - object: | ||
| apiVersion: v1 | ||
| data: | ||
| httpd.sh: | | ||
| #!/bin/sh | ||
| echo "Version 1.2.0" | ||
| echo true > /var/www/started | ||
| echo true > /var/www/ready | ||
| echo true > /var/www/live | ||
| exec httpd -f -h /var/www -p 80 | ||
| kind: ConfigMap | ||
| metadata: | ||
| name: httpd-script | ||
| namespace: ${TEST_NAMESPACE} | ||
| - object: | ||
| apiVersion: v1 | ||
| data: | ||
| name: test-configmap | ||
| version: v1.2.0 | ||
| kind: ConfigMap | ||
| metadata: | ||
| annotations: | ||
| shouldNotTemplate: | | ||
| The namespace is {{ $labels.namespace }}. The templated $labels.namespace is NOT expected to be processed by OLM's rendering engine for registry+v1 bundles. | ||
| name: test-configmap | ||
| namespace: ${TEST_NAMESPACE} | ||
| revision: 1 | ||
| """ | ||
|
|
||
| And ClusterExtensionRevision "${CER_NAME}" reports Progressing as True with Reason Succeeded | ||
| And ClusterExtensionRevision "${CER_NAME}" reports Available as True with Reason ProbesSucceeded | ||
| And resource "networkpolicy/test-operator-network-policy" is installed | ||
| And resource "configmap/test-configmap" is installed | ||
|
|
||
| @BoxcutterRuntime | ||
| Scenario: Probe failure for PersistentVolumeClaim halts phase progression | ||
| When ClusterExtensionRevision is applied | ||
| """ | ||
| apiVersion: olm.operatorframework.io/v1 | ||
| kind: ClusterExtensionRevision | ||
| metadata: | ||
| annotations: | ||
| olm.operatorframework.io/service-account-name: olm-sa | ||
| olm.operatorframework.io/service-account-namespace: ${TEST_NAMESPACE} | ||
| name: ${CER_NAME} | ||
| spec: | ||
| lifecycleState: Active | ||
| collisionProtection: Prevent | ||
| phases: | ||
| - name: pvc | ||
| objects: | ||
| - object: | ||
| apiVersion: v1 | ||
| kind: PersistentVolumeClaim | ||
| metadata: | ||
| name: test-pvc | ||
| namespace: ${TEST_NAMESPACE} | ||
| spec: | ||
| accessModes: | ||
| - ReadWriteOnce | ||
| storageClassName: "" | ||
| volumeName: test-pv | ||
| resources: | ||
| requests: | ||
| storage: 1Mi | ||
| - name: configmap | ||
| objects: | ||
| - object: | ||
| apiVersion: v1 | ||
| kind: ConfigMap | ||
| metadata: | ||
| annotations: | ||
| shouldNotTemplate: | | ||
| The namespace is {{ $labels.namespace }}. The templated $labels.namespace is NOT expected to be processed by OLM's rendering engine for registry+v1 bundles. | ||
| name: test-configmap | ||
| namespace: ${TEST_NAMESPACE} | ||
| data: | ||
| name: test-configmap | ||
| version: v1.2.0 | ||
| revision: 1 | ||
| """ | ||
|
|
||
| And resource "persistentvolumeclaim/test-pvc" is installed | ||
| And ClusterExtensionRevision "${CER_NAME}" reports Available as False with Reason ProbeFailure | ||
|
Contributor
There was a problem hiding this comment. is there any message we could assert? |
||
| And resource "configmap/test-configmap" is not installed | ||
|
|
||
| @BoxcutterRuntime | ||
| Scenario: Phases progress when PersistentVolumeClaim becomes "Bound" | ||
| When ClusterExtensionRevision is applied | ||
| """ | ||
| apiVersion: olm.operatorframework.io/v1 | ||
| kind: ClusterExtensionRevision | ||
| metadata: | ||
| annotations: | ||
| olm.operatorframework.io/service-account-name: olm-sa | ||
| olm.operatorframework.io/service-account-namespace: ${TEST_NAMESPACE} | ||
| name: ${CER_NAME} | ||
| spec: | ||
| lifecycleState: Active | ||
| collisionProtection: Prevent | ||
| phases: | ||
| - name: pvc | ||
| objects: | ||
| - object: | ||
| apiVersion: v1 | ||
| kind: PersistentVolumeClaim | ||
| metadata: | ||
| name: test-pvc | ||
| namespace: ${TEST_NAMESPACE} | ||
| spec: | ||
| accessModes: | ||
| - ReadWriteOnce | ||
| storageClassName: "" | ||
| volumeName: test-pv | ||
| resources: | ||
| requests: | ||
| storage: 1Mi | ||
| - object: | ||
| apiVersion: v1 | ||
| kind: PersistentVolume | ||
| metadata: | ||
| name: test-pv | ||
| spec: | ||
| accessModes: | ||
| - ReadWriteOnce | ||
| capacity: | ||
| storage: 1Mi | ||
| claimRef: | ||
| apiVersion: v1 | ||
| kind: PersistentVolumeClaim | ||
| name: test-pvc | ||
| namespace: ${TEST_NAMESPACE} | ||
| persistentVolumeReclaimPolicy: Delete | ||
| storageClassName: "" | ||
| volumeMode: Filesystem | ||
| local: | ||
| path: /tmp/persistent-volume | ||
| nodeAffinity: | ||
| required: | ||
| nodeSelectorTerms: | ||
| - matchExpressions: | ||
| - key: kubernetes.io/hostname | ||
| operator: NotIn | ||
| values: | ||
| - a-node-name-that-should-not-exist | ||
| - name: configmap | ||
| objects: | ||
| - object: | ||
| apiVersion: v1 | ||
| kind: ConfigMap | ||
| metadata: | ||
| annotations: | ||
| shouldNotTemplate: | | ||
| The namespace is {{ $labels.namespace }}. The templated $labels.namespace is NOT expected to be processed by OLM's rendering engine for registry+v1 bundles. | ||
| name: test-configmap | ||
| namespace: ${TEST_NAMESPACE} | ||
| data: | ||
| name: test-configmap | ||
| version: v1.2.0 | ||
| revision: 1 | ||
| """ | ||
|
|
||
| And ClusterExtensionRevision "${CER_NAME}" reports Progressing as True with Reason Succeeded | ||
| And ClusterExtensionRevision "${CER_NAME}" reports Available as True with Reason ProbesSucceeded | ||
| And resource "persistentvolume/test-pv" is installed | ||
| And resource "persistentvolumeclaim/test-pvc" is installed | ||
| And resource "configmap/test-configmap" is installed | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
initializeProbes()is only invoked fromSetupWithManager, but unit tests (and any direct calls toReconcilewithout callingSetupWithManager) construct the reconciler and callReconciledirectly. In that casenamespaceActiveProbe/pvcBoundProberemain zero values, so the new readiness probes are effectively disabled (and could diverge from production behavior). Consider initializing these probes via async.Onceguard that’s called fromtoBoxcutterRevision/Reconcile(and optionally fromSetupWithManager), so probes are always available when reconciliation runs.