diff --git a/bundle/tests/scorecard/kind-kuttl/ingress-manage-tls/00-assert.yaml b/bundle/tests/scorecard/kind-kuttl/ingress-manage-tls/00-assert.yaml index 026c6f5d..dbb2f07e 100644 --- a/bundle/tests/scorecard/kind-kuttl/ingress-manage-tls/00-assert.yaml +++ b/bundle/tests/scorecard/kind-kuttl/ingress-manage-tls/00-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- # Check creation of CertManager certificates and secret apiVersion: cert-manager.io/v1 kind: Certificate @@ -65,4 +61,4 @@ metadata: name: manage-tls-rc spec: rules: - - host: runtimecomponentoperator.test \ No newline at end of file + - host: runtimecomponentoperator.test diff --git a/bundle/tests/scorecard/kind-kuttl/ingress-manage-tls/01-assert.yaml b/bundle/tests/scorecard/kind-kuttl/ingress-manage-tls/01-assert.yaml index 4d1b459e..34657dc9 100644 --- a/bundle/tests/scorecard/kind-kuttl/ingress-manage-tls/01-assert.yaml +++ b/bundle/tests/scorecard/kind-kuttl/ingress-manage-tls/01-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- kind: Deployment apiVersion: apps/v1 metadata: @@ -30,4 +26,4 @@ metadata: name: manage-tls-rc spec: rules: - - host: runtimecomponentoperator.test \ No newline at end of file + - host: runtimecomponentoperator.test diff --git a/bundle/tests/scorecard/kind-kuttl/ingress-manage-tls/02-assert.yaml b/bundle/tests/scorecard/kind-kuttl/ingress-manage-tls/02-assert.yaml index 93c4a025..6181bc98 100644 --- a/bundle/tests/scorecard/kind-kuttl/ingress-manage-tls/02-assert.yaml +++ b/bundle/tests/scorecard/kind-kuttl/ingress-manage-tls/02-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- # Verify that the deleted Certificate has been restored apiVersion: cert-manager.io/v1 kind: Certificate @@ -49,4 +45,4 @@ metadata: name: manage-tls-rc spec: rules: - - host: runtimecomponentoperator.test \ No newline at end of file + - host: runtimecomponentoperator.test diff --git a/bundle/tests/scorecard/kind-kuttl/ingress-manage-tls/03-assert.yaml b/bundle/tests/scorecard/kind-kuttl/ingress-manage-tls/03-assert.yaml index 5c88a2e2..fdb72d2c 100644 --- a/bundle/tests/scorecard/kind-kuttl/ingress-manage-tls/03-assert.yaml +++ b/bundle/tests/scorecard/kind-kuttl/ingress-manage-tls/03-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- # Verify the pod template spec defaults and that secretName uses *-cm naming convention apiVersion: apps/v1 kind: StatefulSet @@ -43,4 +39,4 @@ metadata: name: manage-tls-rc spec: rules: - - host: runtimecomponentoperator.test \ No newline at end of file + - host: runtimecomponentoperator.test diff --git a/bundle/tests/scorecard/kind-kuttl/ingress-manage-tls/04-assert.yaml b/bundle/tests/scorecard/kind-kuttl/ingress-manage-tls/04-assert.yaml index 191a396e..0ec6f216 100644 --- a/bundle/tests/scorecard/kind-kuttl/ingress-manage-tls/04-assert.yaml +++ b/bundle/tests/scorecard/kind-kuttl/ingress-manage-tls/04-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: v1 kind: Secret metadata: @@ -28,4 +24,4 @@ data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrVENDQVRlZ0F3SUJBZ0lSQVBHVW5FZDBCK0VFYmVpTTF5Sktsdjh3Q2dZSUtvWkl6ajBFQXdJd0tERW0KTUNRR0ExVUVBeE1kY25WdWRHbHRaV052YlhCdmJtVnVkRzl3WlhKaGRHOXlMblJsYzNRd0hoY05Nakl3TmpJMApNVFF6T0RFMVdoY05Nekl3TmpJME1UUXpPREUxV2pBb01TWXdKQVlEVlFRREV4MXlkVzUwYVcxbFkyOXRjRzl1ClpXNTBiM0JsY21GMGIzSXVkR1Z6ZERCWk1CTUdCeXFHU000OUFnRUdDQ3FHU000OUF3RUhBMElBQklCcmRNMW0KdzVIdEZzOE1WYmJhM1pQWVp6YzMvQzBEcXJGdloralc5QjM2ZEN0TW1iLzVINFo5ZjlhRzRBcTBNZklMT1BSdQpqUk9vMlZmTGN4ZTZKbytqUWpCQU1BNEdBMVVkRHdFQi93UUVBd0lDcERBUEJnTlZIUk1CQWY4RUJUQURBUUgvCk1CMEdBMVVkRGdRV0JCU2pIS2pvVVEvSHNvcHJPbDhjK0p4OHhqZFRLVEFLQmdncWhrak9QUVFEQWdOSUFEQkYKQWlFQWhmSktPYnNLUzVZZnhBYkdpL3NrVzVSVlZzRjdCV1pkNlpOZjJydkxPZDhDSUJIeEY1UHNldm1VUU94SApFSlZxZmlMZEZkbjVFNVhZYnV4Z2pIdFQxeE5JCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K tls.key: >- LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUVuSmFPa1F0cFVSd3o4ZWVBQnNRbTZjdDI3bWd5R01zM3BmcDh2a21EOFBvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFZ0d0MHpXYkRrZTBXend4VnR0cmRrOWhuTnpmOExRT3FzVzluNk5iMEhmcDBLMHladi9rZgpobjEvMW9iZ0NyUXg4Z3M0OUc2TkU2alpWOHR6RjdvbWp3PT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo= -type: kubernetes.io/tls \ No newline at end of file +type: kubernetes.io/tls diff --git a/bundle/tests/scorecard/kind-kuttl/ingress-manage-tls/05-assert.yaml b/bundle/tests/scorecard/kind-kuttl/ingress-manage-tls/05-assert.yaml index c1ab7b8c..05fb911a 100644 --- a/bundle/tests/scorecard/kind-kuttl/ingress-manage-tls/05-assert.yaml +++ b/bundle/tests/scorecard/kind-kuttl/ingress-manage-tls/05-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- # Verify the pod template spec defaults and that secretName uses BYO secret apiVersion: apps/v1 kind: StatefulSet @@ -47,4 +43,4 @@ spec: - runtimecomponentoperator.test secretName: byo-route-secret rules: - - host: runtimecomponentoperator.test \ No newline at end of file + - host: runtimecomponentoperator.test diff --git a/bundle/tests/scorecard/kuttl/auto1/00-assert.yaml b/bundle/tests/scorecard/kuttl/auto1/00-assert.yaml index caa35124..4b134858 100644 --- a/bundle/tests/scorecard/kuttl/auto1/00-assert.yaml +++ b/bundle/tests/scorecard/kuttl/auto1/00-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/auto1/01-assert.yaml b/bundle/tests/scorecard/kuttl/auto1/01-assert.yaml index 2b397341..6eb5f184 100644 --- a/bundle/tests/scorecard/kuttl/auto1/01-assert.yaml +++ b/bundle/tests/scorecard/kuttl/auto1/01-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/auto1/02-assert.yaml b/bundle/tests/scorecard/kuttl/auto1/02-assert.yaml index bdd90cc6..3f11f69a 100644 --- a/bundle/tests/scorecard/kuttl/auto1/02-assert.yaml +++ b/bundle/tests/scorecard/kuttl/auto1/02-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/auto1/03-assert.yaml b/bundle/tests/scorecard/kuttl/auto1/03-assert.yaml index bdd90cc6..3f11f69a 100644 --- a/bundle/tests/scorecard/kuttl/auto1/03-assert.yaml +++ b/bundle/tests/scorecard/kuttl/auto1/03-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/auto1/04-assert.yaml b/bundle/tests/scorecard/kuttl/auto1/04-assert.yaml index bdd90cc6..3f11f69a 100644 --- a/bundle/tests/scorecard/kuttl/auto1/04-assert.yaml +++ b/bundle/tests/scorecard/kuttl/auto1/04-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/auto2/00-assert.yaml b/bundle/tests/scorecard/kuttl/auto2/00-assert.yaml index dfd39b3f..d464a5a3 100644 --- a/bundle/tests/scorecard/kuttl/auto2/00-assert.yaml +++ b/bundle/tests/scorecard/kuttl/auto2/00-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/auto3/00-assert.yaml b/bundle/tests/scorecard/kuttl/auto3/00-assert.yaml index 38c9c2d8..6ea612a6 100644 --- a/bundle/tests/scorecard/kuttl/auto3/00-assert.yaml +++ b/bundle/tests/scorecard/kuttl/auto3/00-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/auto3/01-assert.yaml b/bundle/tests/scorecard/kuttl/auto3/01-assert.yaml index f564ab74..c900fc95 100644 --- a/bundle/tests/scorecard/kuttl/auto3/01-assert.yaml +++ b/bundle/tests/scorecard/kuttl/auto3/01-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/auto3/02-assert.yaml b/bundle/tests/scorecard/kuttl/auto3/02-assert.yaml index f2394bd5..3a2a4165 100644 --- a/bundle/tests/scorecard/kuttl/auto3/02-assert.yaml +++ b/bundle/tests/scorecard/kuttl/auto3/02-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/basic/00-assert.yaml b/bundle/tests/scorecard/kuttl/basic/00-assert.yaml index a558adc2..0dd9c724 100644 --- a/bundle/tests/scorecard/kuttl/basic/00-assert.yaml +++ b/bundle/tests/scorecard/kuttl/basic/00-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/basic/01-assert.yaml b/bundle/tests/scorecard/kuttl/basic/01-assert.yaml index df196cd4..5b364cbd 100644 --- a/bundle/tests/scorecard/kuttl/basic/01-assert.yaml +++ b/bundle/tests/scorecard/kuttl/basic/01-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/day2operation/00-assert.yaml b/bundle/tests/scorecard/kuttl/day2operation/00-assert.yaml index d61061f8..442c5d02 100644 --- a/bundle/tests/scorecard/kuttl/day2operation/00-assert.yaml +++ b/bundle/tests/scorecard/kuttl/day2operation/00-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: StatefulSet metadata: diff --git a/bundle/tests/scorecard/kuttl/day2operation/02-assert.yaml b/bundle/tests/scorecard/kuttl/day2operation/02-assert.yaml index 03e9e2ed..a26bdd3d 100644 --- a/bundle/tests/scorecard/kuttl/day2operation/02-assert.yaml +++ b/bundle/tests/scorecard/kuttl/day2operation/02-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: StatefulSet metadata: diff --git a/bundle/tests/scorecard/kuttl/day2operation/04-assert.yaml b/bundle/tests/scorecard/kuttl/day2operation/04-assert.yaml index 6db4ae87..7f40d3cd 100644 --- a/bundle/tests/scorecard/kuttl/day2operation/04-assert.yaml +++ b/bundle/tests/scorecard/kuttl/day2operation/04-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: StatefulSet metadata: diff --git a/bundle/tests/scorecard/kuttl/deployment-strategy/00-assert.yaml b/bundle/tests/scorecard/kuttl/deployment-strategy/00-assert.yaml index 5dacda77..7696eb16 100644 --- a/bundle/tests/scorecard/kuttl/deployment-strategy/00-assert.yaml +++ b/bundle/tests/scorecard/kuttl/deployment-strategy/00-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 90 ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -15,4 +11,4 @@ spec: status: replicas: 3 readyReplicas: 3 - updatedReplicas: 3 \ No newline at end of file + updatedReplicas: 3 diff --git a/bundle/tests/scorecard/kuttl/deployment-strategy/01-assert.yaml b/bundle/tests/scorecard/kuttl/deployment-strategy/01-assert.yaml index 6dee4873..91ff3b97 100644 --- a/bundle/tests/scorecard/kuttl/deployment-strategy/01-assert.yaml +++ b/bundle/tests/scorecard/kuttl/deployment-strategy/01-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -12,4 +8,4 @@ spec: status: replicas: 3 readyReplicas: 3 - updatedReplicas: 3 \ No newline at end of file + updatedReplicas: 3 diff --git a/bundle/tests/scorecard/kuttl/deployment-strategy/02-assert.yaml b/bundle/tests/scorecard/kuttl/deployment-strategy/02-assert.yaml index ebd69608..7bbc82f8 100644 --- a/bundle/tests/scorecard/kuttl/deployment-strategy/02-assert.yaml +++ b/bundle/tests/scorecard/kuttl/deployment-strategy/02-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -12,4 +8,4 @@ spec: status: replicas: 3 readyReplicas: 3 - updatedReplicas: 3 \ No newline at end of file + updatedReplicas: 3 diff --git a/bundle/tests/scorecard/kuttl/deployment-strategy/03-assert.yaml b/bundle/tests/scorecard/kuttl/deployment-strategy/03-assert.yaml index 6dee4873..91ff3b97 100644 --- a/bundle/tests/scorecard/kuttl/deployment-strategy/03-assert.yaml +++ b/bundle/tests/scorecard/kuttl/deployment-strategy/03-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -12,4 +8,4 @@ spec: status: replicas: 3 readyReplicas: 3 - updatedReplicas: 3 \ No newline at end of file + updatedReplicas: 3 diff --git a/bundle/tests/scorecard/kuttl/deployment-strategy/04-assert.yaml b/bundle/tests/scorecard/kuttl/deployment-strategy/04-assert.yaml index ebd69608..7bbc82f8 100644 --- a/bundle/tests/scorecard/kuttl/deployment-strategy/04-assert.yaml +++ b/bundle/tests/scorecard/kuttl/deployment-strategy/04-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -12,4 +8,4 @@ spec: status: replicas: 3 readyReplicas: 3 - updatedReplicas: 3 \ No newline at end of file + updatedReplicas: 3 diff --git a/bundle/tests/scorecard/kuttl/env/00-assert.yaml b/bundle/tests/scorecard/kuttl/env/00-assert.yaml index 7d2a6266..6ba39b1c 100644 --- a/bundle/tests/scorecard/kuttl/env/00-assert.yaml +++ b/bundle/tests/scorecard/kuttl/env/00-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- kind: ConfigMap apiVersion: v1 metadata: @@ -13,4 +9,4 @@ metadata: name: env-rc-secret type: Opaque data: - adminPassword: Passw0rd \ No newline at end of file + adminPassword: Passw0rd diff --git a/bundle/tests/scorecard/kuttl/env/01-assert.yaml b/bundle/tests/scorecard/kuttl/env/01-assert.yaml index 365d911f..e0e91402 100644 --- a/bundle/tests/scorecard/kuttl/env/01-assert.yaml +++ b/bundle/tests/scorecard/kuttl/env/01-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/env/02-assert.yaml b/bundle/tests/scorecard/kuttl/env/02-assert.yaml index 692a9614..dcc8df58 100644 --- a/bundle/tests/scorecard/kuttl/env/02-assert.yaml +++ b/bundle/tests/scorecard/kuttl/env/02-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/env/03-assert.yaml b/bundle/tests/scorecard/kuttl/env/03-assert.yaml index 42485569..48dc16bc 100644 --- a/bundle/tests/scorecard/kuttl/env/03-assert.yaml +++ b/bundle/tests/scorecard/kuttl/env/03-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: StatefulSet metadata: diff --git a/bundle/tests/scorecard/kuttl/env/04-assert.yaml b/bundle/tests/scorecard/kuttl/env/04-assert.yaml index e08db31b..3da54752 100644 --- a/bundle/tests/scorecard/kuttl/env/04-assert.yaml +++ b/bundle/tests/scorecard/kuttl/env/04-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: StatefulSet metadata: diff --git a/bundle/tests/scorecard/kuttl/image-stream/00-assert.yaml b/bundle/tests/scorecard/kuttl/image-stream/00-assert.yaml index 2f73b698..f13935af 100644 --- a/bundle/tests/scorecard/kuttl/image-stream/00-assert.yaml +++ b/bundle/tests/scorecard/kuttl/image-stream/00-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 90 ---- apiVersion: image.openshift.io/v1 kind: ImageStream metadata: diff --git a/bundle/tests/scorecard/kuttl/image-stream/01-assert.yaml b/bundle/tests/scorecard/kuttl/image-stream/01-assert.yaml index 07eb5e7e..24a76b60 100644 --- a/bundle/tests/scorecard/kuttl/image-stream/01-assert.yaml +++ b/bundle/tests/scorecard/kuttl/image-stream/01-assert.yaml @@ -1,8 +1,3 @@ - -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 90 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/image-stream/02-assert.yaml b/bundle/tests/scorecard/kuttl/image-stream/02-assert.yaml index d7193099..120ef039 100644 --- a/bundle/tests/scorecard/kuttl/image-stream/02-assert.yaml +++ b/bundle/tests/scorecard/kuttl/image-stream/02-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 90 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/image-stream/03-assert.yaml b/bundle/tests/scorecard/kuttl/image-stream/03-assert.yaml index e7554750..254870f8 100644 --- a/bundle/tests/scorecard/kuttl/image-stream/03-assert.yaml +++ b/bundle/tests/scorecard/kuttl/image-stream/03-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 90 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/image-stream/04-assert.yaml b/bundle/tests/scorecard/kuttl/image-stream/04-assert.yaml index bdd5e4ed..b2a73b4a 100644 --- a/bundle/tests/scorecard/kuttl/image-stream/04-assert.yaml +++ b/bundle/tests/scorecard/kuttl/image-stream/04-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 90 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/manage-tls/00-assert.yaml b/bundle/tests/scorecard/kuttl/manage-tls/00-assert.yaml index 55ccd4fd..7f77bcda 100644 --- a/bundle/tests/scorecard/kuttl/manage-tls/00-assert.yaml +++ b/bundle/tests/scorecard/kuttl/manage-tls/00-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- # Check creation of CertManager certificates and secret apiVersion: cert-manager.io/v1 kind: Certificate @@ -72,4 +68,4 @@ spec: port: targetPort: 9443-tcp tls: - termination: reencrypt \ No newline at end of file + termination: reencrypt diff --git a/bundle/tests/scorecard/kuttl/manage-tls/01-assert.yaml b/bundle/tests/scorecard/kuttl/manage-tls/01-assert.yaml index 35d402da..32d08600 100644 --- a/bundle/tests/scorecard/kuttl/manage-tls/01-assert.yaml +++ b/bundle/tests/scorecard/kuttl/manage-tls/01-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- kind: Deployment apiVersion: apps/v1 metadata: @@ -38,4 +34,4 @@ spec: targetPort: 9443-tcp tls: termination: reencrypt - wildcardPolicy: None \ No newline at end of file + wildcardPolicy: None diff --git a/bundle/tests/scorecard/kuttl/manage-tls/02-assert.yaml b/bundle/tests/scorecard/kuttl/manage-tls/02-assert.yaml index cb03f8c7..9117e8af 100644 --- a/bundle/tests/scorecard/kuttl/manage-tls/02-assert.yaml +++ b/bundle/tests/scorecard/kuttl/manage-tls/02-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- # Verify that the deleted Certificate has been restored apiVersion: cert-manager.io/v1 kind: Certificate @@ -43,4 +39,4 @@ spec: kind: Service apiVersion: v1 metadata: - name: manage-tls-rc \ No newline at end of file + name: manage-tls-rc diff --git a/bundle/tests/scorecard/kuttl/manage-tls/03-assert.yaml b/bundle/tests/scorecard/kuttl/manage-tls/03-assert.yaml index 6f5f0b48..4b9583da 100644 --- a/bundle/tests/scorecard/kuttl/manage-tls/03-assert.yaml +++ b/bundle/tests/scorecard/kuttl/manage-tls/03-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- # Verify the pod template spec defaults and that secretName uses *-ocp naming convention apiVersion: apps/v1 kind: StatefulSet @@ -46,4 +42,4 @@ apiVersion: v1 metadata: name: manage-tls-rc-svc-tls-ocp annotations: - service.beta.openshift.io/originating-service-name: manage-tls-rc \ No newline at end of file + service.beta.openshift.io/originating-service-name: manage-tls-rc diff --git a/bundle/tests/scorecard/kuttl/manage-tls/05-assert.yaml b/bundle/tests/scorecard/kuttl/manage-tls/05-assert.yaml index 30bf1518..fce14ba7 100644 --- a/bundle/tests/scorecard/kuttl/manage-tls/05-assert.yaml +++ b/bundle/tests/scorecard/kuttl/manage-tls/05-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- # Verify the pod template spec defaults and that secretName uses *-ocp naming convention apiVersion: apps/v1 kind: Deployment @@ -44,4 +40,4 @@ apiVersion: v1 metadata: name: manage-tls-rc-svc-tls-ocp annotations: - service.beta.openshift.io/originating-service-name: manage-tls-rc \ No newline at end of file + service.beta.openshift.io/originating-service-name: manage-tls-rc diff --git a/bundle/tests/scorecard/kuttl/manage-tls/06-assert.yaml b/bundle/tests/scorecard/kuttl/manage-tls/06-assert.yaml index 07a03c76..e3b9fd91 100644 --- a/bundle/tests/scorecard/kuttl/manage-tls/06-assert.yaml +++ b/bundle/tests/scorecard/kuttl/manage-tls/06-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -14,4 +10,4 @@ status: kind: Service apiVersion: v1 metadata: - name: manage-tls-rc \ No newline at end of file + name: manage-tls-rc diff --git a/bundle/tests/scorecard/kuttl/manage-tls/07-assert.yaml b/bundle/tests/scorecard/kuttl/manage-tls/07-assert.yaml index 191a396e..0ec6f216 100644 --- a/bundle/tests/scorecard/kuttl/manage-tls/07-assert.yaml +++ b/bundle/tests/scorecard/kuttl/manage-tls/07-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: v1 kind: Secret metadata: @@ -28,4 +24,4 @@ data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrVENDQVRlZ0F3SUJBZ0lSQVBHVW5FZDBCK0VFYmVpTTF5Sktsdjh3Q2dZSUtvWkl6ajBFQXdJd0tERW0KTUNRR0ExVUVBeE1kY25WdWRHbHRaV052YlhCdmJtVnVkRzl3WlhKaGRHOXlMblJsYzNRd0hoY05Nakl3TmpJMApNVFF6T0RFMVdoY05Nekl3TmpJME1UUXpPREUxV2pBb01TWXdKQVlEVlFRREV4MXlkVzUwYVcxbFkyOXRjRzl1ClpXNTBiM0JsY21GMGIzSXVkR1Z6ZERCWk1CTUdCeXFHU000OUFnRUdDQ3FHU000OUF3RUhBMElBQklCcmRNMW0KdzVIdEZzOE1WYmJhM1pQWVp6YzMvQzBEcXJGdloralc5QjM2ZEN0TW1iLzVINFo5ZjlhRzRBcTBNZklMT1BSdQpqUk9vMlZmTGN4ZTZKbytqUWpCQU1BNEdBMVVkRHdFQi93UUVBd0lDcERBUEJnTlZIUk1CQWY4RUJUQURBUUgvCk1CMEdBMVVkRGdRV0JCU2pIS2pvVVEvSHNvcHJPbDhjK0p4OHhqZFRLVEFLQmdncWhrak9QUVFEQWdOSUFEQkYKQWlFQWhmSktPYnNLUzVZZnhBYkdpL3NrVzVSVlZzRjdCV1pkNlpOZjJydkxPZDhDSUJIeEY1UHNldm1VUU94SApFSlZxZmlMZEZkbjVFNVhZYnV4Z2pIdFQxeE5JCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K tls.key: >- LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUVuSmFPa1F0cFVSd3o4ZWVBQnNRbTZjdDI3bWd5R01zM3BmcDh2a21EOFBvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFZ0d0MHpXYkRrZTBXend4VnR0cmRrOWhuTnpmOExRT3FzVzluNk5iMEhmcDBLMHladi9rZgpobjEvMW9iZ0NyUXg4Z3M0OUc2TkU2alpWOHR6RjdvbWp3PT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo= -type: kubernetes.io/tls \ No newline at end of file +type: kubernetes.io/tls diff --git a/bundle/tests/scorecard/kuttl/manage-tls/08-assert.yaml b/bundle/tests/scorecard/kuttl/manage-tls/08-assert.yaml index c3d84209..cdc15779 100644 --- a/bundle/tests/scorecard/kuttl/manage-tls/08-assert.yaml +++ b/bundle/tests/scorecard/kuttl/manage-tls/08-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- # Verify the pod template spec defaults and that secretName uses BYO secret apiVersion: apps/v1 kind: Deployment @@ -96,4 +92,4 @@ status: - host: runtimecomponentoperator.test conditions: - type: Admitted - status: 'True' \ No newline at end of file + status: 'True' diff --git a/bundle/tests/scorecard/kuttl/monitor/00-assert.yaml b/bundle/tests/scorecard/kuttl/monitor/00-assert.yaml index 07bdbcbb..784d1eb1 100644 --- a/bundle/tests/scorecard/kuttl/monitor/00-assert.yaml +++ b/bundle/tests/scorecard/kuttl/monitor/00-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/monitor/01-assert.yaml b/bundle/tests/scorecard/kuttl/monitor/01-assert.yaml index e6feca95..fa3d5340 100644 --- a/bundle/tests/scorecard/kuttl/monitor/01-assert.yaml +++ b/bundle/tests/scorecard/kuttl/monitor/01-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/monitor/02-assert.yaml b/bundle/tests/scorecard/kuttl/monitor/02-assert.yaml index befea5ee..5c82d0d2 100644 --- a/bundle/tests/scorecard/kuttl/monitor/02-assert.yaml +++ b/bundle/tests/scorecard/kuttl/monitor/02-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -21,7 +17,7 @@ spec: app.kubernetes.io/instance: service-monitor-rc endpoints: - path: "/path" - scheme: "myScheme" + scheme: "https" port: 3000-tcp params: params: diff --git a/bundle/tests/scorecard/kuttl/monitor/02-runtime-update-monitor.yaml b/bundle/tests/scorecard/kuttl/monitor/02-runtime-update-monitor.yaml index 724dfb77..02a66429 100644 --- a/bundle/tests/scorecard/kuttl/monitor/02-runtime-update-monitor.yaml +++ b/bundle/tests/scorecard/kuttl/monitor/02-runtime-update-monitor.yaml @@ -6,7 +6,7 @@ spec: monitoring: endpoints: - path: "/path" - scheme: "myScheme" + scheme: "https" params: params: - "param1" diff --git a/bundle/tests/scorecard/kuttl/network-policy-multiple-apps/00-assert.yaml b/bundle/tests/scorecard/kuttl/network-policy-multiple-apps/00-assert.yaml index 865c2681..676d9bcd 100644 --- a/bundle/tests/scorecard/kuttl/network-policy-multiple-apps/00-assert.yaml +++ b/bundle/tests/scorecard/kuttl/network-policy-multiple-apps/00-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: diff --git a/bundle/tests/scorecard/kuttl/network-policy/00-assert.yaml b/bundle/tests/scorecard/kuttl/network-policy/00-assert.yaml index d91e967a..31dbec53 100644 --- a/bundle/tests/scorecard/kuttl/network-policy/00-assert.yaml +++ b/bundle/tests/scorecard/kuttl/network-policy/00-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: diff --git a/bundle/tests/scorecard/kuttl/network-policy/01-assert.yaml b/bundle/tests/scorecard/kuttl/network-policy/01-assert.yaml index afa147b5..656e8ca7 100644 --- a/bundle/tests/scorecard/kuttl/network-policy/01-assert.yaml +++ b/bundle/tests/scorecard/kuttl/network-policy/01-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: diff --git a/bundle/tests/scorecard/kuttl/network-policy/02-assert.yaml b/bundle/tests/scorecard/kuttl/network-policy/02-assert.yaml index 17975114..b5406b58 100644 --- a/bundle/tests/scorecard/kuttl/network-policy/02-assert.yaml +++ b/bundle/tests/scorecard/kuttl/network-policy/02-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: diff --git a/bundle/tests/scorecard/kuttl/network-policy/03-assert.yaml b/bundle/tests/scorecard/kuttl/network-policy/03-assert.yaml index 6c4f800e..3b3e877c 100644 --- a/bundle/tests/scorecard/kuttl/network-policy/03-assert.yaml +++ b/bundle/tests/scorecard/kuttl/network-policy/03-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: diff --git a/bundle/tests/scorecard/kuttl/network-policy/04-assert.yaml b/bundle/tests/scorecard/kuttl/network-policy/04-assert.yaml index 40ad79ac..8c741e2d 100644 --- a/bundle/tests/scorecard/kuttl/network-policy/04-assert.yaml +++ b/bundle/tests/scorecard/kuttl/network-policy/04-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: diff --git a/bundle/tests/scorecard/kuttl/network-policy/05-assert.yaml b/bundle/tests/scorecard/kuttl/network-policy/05-assert.yaml index 8b45994c..bdebbf90 100644 --- a/bundle/tests/scorecard/kuttl/network-policy/05-assert.yaml +++ b/bundle/tests/scorecard/kuttl/network-policy/05-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: diff --git a/bundle/tests/scorecard/kuttl/network-policy/06-assert.yaml b/bundle/tests/scorecard/kuttl/network-policy/06-assert.yaml index 9166f134..eb373882 100644 --- a/bundle/tests/scorecard/kuttl/network-policy/06-assert.yaml +++ b/bundle/tests/scorecard/kuttl/network-policy/06-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: diff --git a/bundle/tests/scorecard/kuttl/network-policy/07-assert.yaml b/bundle/tests/scorecard/kuttl/network-policy/07-assert.yaml index 0c6e526a..559da240 100644 --- a/bundle/tests/scorecard/kuttl/network-policy/07-assert.yaml +++ b/bundle/tests/scorecard/kuttl/network-policy/07-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: diff --git a/bundle/tests/scorecard/kuttl/network-policy/08-assert.yaml b/bundle/tests/scorecard/kuttl/network-policy/08-assert.yaml index d91e967a..31dbec53 100644 --- a/bundle/tests/scorecard/kuttl/network-policy/08-assert.yaml +++ b/bundle/tests/scorecard/kuttl/network-policy/08-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: diff --git a/bundle/tests/scorecard/kuttl/network-policy/09-assert.yaml b/bundle/tests/scorecard/kuttl/network-policy/09-assert.yaml index b8ec98ec..21afb470 100644 --- a/bundle/tests/scorecard/kuttl/network-policy/09-assert.yaml +++ b/bundle/tests/scorecard/kuttl/network-policy/09-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: diff --git a/bundle/tests/scorecard/kuttl/network-policy/10-assert.yaml b/bundle/tests/scorecard/kuttl/network-policy/10-assert.yaml index 06641501..3aad9a32 100644 --- a/bundle/tests/scorecard/kuttl/network-policy/10-assert.yaml +++ b/bundle/tests/scorecard/kuttl/network-policy/10-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: diff --git a/bundle/tests/scorecard/kuttl/network-policy/11-assert.yaml b/bundle/tests/scorecard/kuttl/network-policy/11-assert.yaml index 31546cdd..2197b604 100644 --- a/bundle/tests/scorecard/kuttl/network-policy/11-assert.yaml +++ b/bundle/tests/scorecard/kuttl/network-policy/11-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: diff --git a/bundle/tests/scorecard/kuttl/probe/00-assert.yaml b/bundle/tests/scorecard/kuttl/probe/00-assert.yaml index 3d732956..79434c7f 100644 --- a/bundle/tests/scorecard/kuttl/probe/00-assert.yaml +++ b/bundle/tests/scorecard/kuttl/probe/00-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 120 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/probe/01-assert.yaml b/bundle/tests/scorecard/kuttl/probe/01-assert.yaml index 44ef1ed9..e4f57bbc 100644 --- a/bundle/tests/scorecard/kuttl/probe/01-assert.yaml +++ b/bundle/tests/scorecard/kuttl/probe/01-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 120 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/probe/02-assert.yaml b/bundle/tests/scorecard/kuttl/probe/02-assert.yaml index 554886d2..5cb4e5e5 100644 --- a/bundle/tests/scorecard/kuttl/probe/02-assert.yaml +++ b/bundle/tests/scorecard/kuttl/probe/02-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 120 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/probe/03-assert.yaml b/bundle/tests/scorecard/kuttl/probe/03-assert.yaml index 86c55145..cc77ceea 100644 --- a/bundle/tests/scorecard/kuttl/probe/03-assert.yaml +++ b/bundle/tests/scorecard/kuttl/probe/03-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 120 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/probe/04-assert.yaml b/bundle/tests/scorecard/kuttl/probe/04-assert.yaml index 6f2ba8b3..f7c7c2cf 100644 --- a/bundle/tests/scorecard/kuttl/probe/04-assert.yaml +++ b/bundle/tests/scorecard/kuttl/probe/04-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 120 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/probe/05-assert.yaml b/bundle/tests/scorecard/kuttl/probe/05-assert.yaml index 72a6fb77..cfdffa7c 100644 --- a/bundle/tests/scorecard/kuttl/probe/05-assert.yaml +++ b/bundle/tests/scorecard/kuttl/probe/05-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 120 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/runtime_pullpolicy/00-assert.yaml b/bundle/tests/scorecard/kuttl/runtime_pullpolicy/00-assert.yaml index 7504443b..1a391448 100644 --- a/bundle/tests/scorecard/kuttl/runtime_pullpolicy/00-assert.yaml +++ b/bundle/tests/scorecard/kuttl/runtime_pullpolicy/00-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 90 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/runtime_pullpolicy/01-assert.yaml b/bundle/tests/scorecard/kuttl/runtime_pullpolicy/01-assert.yaml index bfb5eabd..5c111ca9 100644 --- a/bundle/tests/scorecard/kuttl/runtime_pullpolicy/01-assert.yaml +++ b/bundle/tests/scorecard/kuttl/runtime_pullpolicy/01-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 90 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/runtime_pullpolicy/02-assert.yaml b/bundle/tests/scorecard/kuttl/runtime_pullpolicy/02-assert.yaml index b0e3d0cd..005c670d 100644 --- a/bundle/tests/scorecard/kuttl/runtime_pullpolicy/02-assert.yaml +++ b/bundle/tests/scorecard/kuttl/runtime_pullpolicy/02-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 90 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/runtime_pullpolicy/03-assert.yaml b/bundle/tests/scorecard/kuttl/runtime_pullpolicy/03-assert.yaml index 2c3552d3..5e84dffa 100644 --- a/bundle/tests/scorecard/kuttl/runtime_pullpolicy/03-assert.yaml +++ b/bundle/tests/scorecard/kuttl/runtime_pullpolicy/03-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 90 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/security-context/00-assert.yaml b/bundle/tests/scorecard/kuttl/security-context/00-assert.yaml index ad4f5fbc..dd1791b6 100644 --- a/bundle/tests/scorecard/kuttl/security-context/00-assert.yaml +++ b/bundle/tests/scorecard/kuttl/security-context/00-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- # Check the default security context apiVersion: apps/v1 kind: Deployment @@ -23,4 +19,4 @@ spec: status: replicas: 1 readyReplicas: 1 - updatedReplicas: 1 \ No newline at end of file + updatedReplicas: 1 diff --git a/bundle/tests/scorecard/kuttl/security-context/01-assert.yaml b/bundle/tests/scorecard/kuttl/security-context/01-assert.yaml index 7124bb28..0a5239a3 100644 --- a/bundle/tests/scorecard/kuttl/security-context/01-assert.yaml +++ b/bundle/tests/scorecard/kuttl/security-context/01-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -18,4 +14,4 @@ spec: status: replicas: 1 readyReplicas: 1 - availableReplicas: 1 \ No newline at end of file + availableReplicas: 1 diff --git a/bundle/tests/scorecard/kuttl/security-context/02-assert.yaml b/bundle/tests/scorecard/kuttl/security-context/02-assert.yaml index d8b773e1..6605c7ba 100644 --- a/bundle/tests/scorecard/kuttl/security-context/02-assert.yaml +++ b/bundle/tests/scorecard/kuttl/security-context/02-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -16,4 +12,4 @@ spec: status: replicas: 1 readyReplicas: 1 - availableReplicas: 1 \ No newline at end of file + availableReplicas: 1 diff --git a/bundle/tests/scorecard/kuttl/security-context/03-assert.yaml b/bundle/tests/scorecard/kuttl/security-context/03-assert.yaml index b9c18306..ae87654c 100644 --- a/bundle/tests/scorecard/kuttl/security-context/03-assert.yaml +++ b/bundle/tests/scorecard/kuttl/security-context/03-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -19,4 +15,4 @@ spec: status: replicas: 1 readyReplicas: 1 - availableReplicas: 1 \ No newline at end of file + availableReplicas: 1 diff --git a/bundle/tests/scorecard/kuttl/security-context/04-assert.yaml b/bundle/tests/scorecard/kuttl/security-context/04-assert.yaml index aafd1eb5..9d80245d 100644 --- a/bundle/tests/scorecard/kuttl/security-context/04-assert.yaml +++ b/bundle/tests/scorecard/kuttl/security-context/04-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -22,4 +18,4 @@ spec: status: replicas: 1 readyReplicas: 1 - updatedReplicas: 1 \ No newline at end of file + updatedReplicas: 1 diff --git a/bundle/tests/scorecard/kuttl/service-account-name/00-assert.yaml b/bundle/tests/scorecard/kuttl/service-account-name/00-assert.yaml index e35a61ab..219be4d9 100644 --- a/bundle/tests/scorecard/kuttl/service-account-name/00-assert.yaml +++ b/bundle/tests/scorecard/kuttl/service-account-name/00-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -18,4 +14,4 @@ status: kind: ServiceAccount apiVersion: v1 metadata: - name: sa-name-rc \ No newline at end of file + name: sa-name-rc diff --git a/bundle/tests/scorecard/kuttl/service-account-name/01-assert.yaml b/bundle/tests/scorecard/kuttl/service-account-name/01-assert.yaml index cc523b93..8ce22a1f 100644 --- a/bundle/tests/scorecard/kuttl/service-account-name/01-assert.yaml +++ b/bundle/tests/scorecard/kuttl/service-account-name/01-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -18,4 +14,4 @@ status: kind: ServiceAccount apiVersion: v1 metadata: - name: new-sa-name-rc \ No newline at end of file + name: new-sa-name-rc diff --git a/bundle/tests/scorecard/kuttl/service-account-name/02-assert.yaml b/bundle/tests/scorecard/kuttl/service-account-name/02-assert.yaml index e35a61ab..219be4d9 100644 --- a/bundle/tests/scorecard/kuttl/service-account-name/02-assert.yaml +++ b/bundle/tests/scorecard/kuttl/service-account-name/02-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -18,4 +14,4 @@ status: kind: ServiceAccount apiVersion: v1 metadata: - name: sa-name-rc \ No newline at end of file + name: sa-name-rc diff --git a/bundle/tests/scorecard/kuttl/service-account-name/03-assert.yaml b/bundle/tests/scorecard/kuttl/service-account-name/03-assert.yaml index 76c8162b..d3fe3b53 100644 --- a/bundle/tests/scorecard/kuttl/service-account-name/03-assert.yaml +++ b/bundle/tests/scorecard/kuttl/service-account-name/03-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: StatefulSet metadata: @@ -13,4 +9,4 @@ spec: status: replicas: 1 readyReplicas: 1 - updatedReplicas: 1 \ No newline at end of file + updatedReplicas: 1 diff --git a/bundle/tests/scorecard/kuttl/service-account-name/04-assert.yaml b/bundle/tests/scorecard/kuttl/service-account-name/04-assert.yaml index e64bb47a..5cef5585 100644 --- a/bundle/tests/scorecard/kuttl/service-account-name/04-assert.yaml +++ b/bundle/tests/scorecard/kuttl/service-account-name/04-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: StatefulSet metadata: @@ -18,4 +14,4 @@ status: kind: ServiceAccount apiVersion: v1 metadata: - name: sa-name-rc \ No newline at end of file + name: sa-name-rc diff --git a/bundle/tests/scorecard/kuttl/service-binding1/00-assert.yaml b/bundle/tests/scorecard/kuttl/service-binding1/00-assert.yaml index 5d32070c..93dc9c5d 100644 --- a/bundle/tests/scorecard/kuttl/service-binding1/00-assert.yaml +++ b/bundle/tests/scorecard/kuttl/service-binding1/00-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: rc.app.stacks/v1 kind: RuntimeComponent metadata: @@ -22,4 +18,4 @@ apiVersion: v1 kind: Secret type: Opaque metadata: - name: service-binding-rc-expose-binding \ No newline at end of file + name: service-binding-rc-expose-binding diff --git a/bundle/tests/scorecard/kuttl/service-binding1/01-assert.yaml b/bundle/tests/scorecard/kuttl/service-binding1/01-assert.yaml index a729bac0..0eaf2007 100644 --- a/bundle/tests/scorecard/kuttl/service-binding1/01-assert.yaml +++ b/bundle/tests/scorecard/kuttl/service-binding1/01-assert.yaml @@ -1,11 +1,7 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: v1 kind: Service metadata: name: service-binding-rc spec: ports: - - port: 8080 \ No newline at end of file + - port: 8080 diff --git a/bundle/tests/scorecard/kuttl/service-binding2/00-assert.yaml b/bundle/tests/scorecard/kuttl/service-binding2/00-assert.yaml index 5d32070c..93dc9c5d 100644 --- a/bundle/tests/scorecard/kuttl/service-binding2/00-assert.yaml +++ b/bundle/tests/scorecard/kuttl/service-binding2/00-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: rc.app.stacks/v1 kind: RuntimeComponent metadata: @@ -22,4 +18,4 @@ apiVersion: v1 kind: Secret type: Opaque metadata: - name: service-binding-rc-expose-binding \ No newline at end of file + name: service-binding-rc-expose-binding diff --git a/bundle/tests/scorecard/kuttl/service-binding2/01-assert.yaml b/bundle/tests/scorecard/kuttl/service-binding2/01-assert.yaml index a729bac0..0eaf2007 100644 --- a/bundle/tests/scorecard/kuttl/service-binding2/01-assert.yaml +++ b/bundle/tests/scorecard/kuttl/service-binding2/01-assert.yaml @@ -1,11 +1,7 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: v1 kind: Service metadata: name: service-binding-rc spec: ports: - - port: 8080 \ No newline at end of file + - port: 8080 diff --git a/bundle/tests/scorecard/kuttl/statefulset-strategy/00-assert.yaml b/bundle/tests/scorecard/kuttl/statefulset-strategy/00-assert.yaml index 0436b379..81ed8b83 100644 --- a/bundle/tests/scorecard/kuttl/statefulset-strategy/00-assert.yaml +++ b/bundle/tests/scorecard/kuttl/statefulset-strategy/00-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 90 ---- apiVersion: apps/v1 kind: StatefulSet metadata: diff --git a/bundle/tests/scorecard/kuttl/statefulset-strategy/01-assert.yaml b/bundle/tests/scorecard/kuttl/statefulset-strategy/01-assert.yaml index 5884c4b2..952a9943 100644 --- a/bundle/tests/scorecard/kuttl/statefulset-strategy/01-assert.yaml +++ b/bundle/tests/scorecard/kuttl/statefulset-strategy/01-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: StatefulSet metadata: @@ -12,4 +8,4 @@ spec: status: replicas: 3 readyReplicas: 3 - updatedReplicas: 3 \ No newline at end of file + updatedReplicas: 3 diff --git a/bundle/tests/scorecard/kuttl/statefulset-strategy/02-assert.yaml b/bundle/tests/scorecard/kuttl/statefulset-strategy/02-assert.yaml index 1087d73e..df7c14fc 100644 --- a/bundle/tests/scorecard/kuttl/statefulset-strategy/02-assert.yaml +++ b/bundle/tests/scorecard/kuttl/statefulset-strategy/02-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: StatefulSet metadata: @@ -12,4 +8,4 @@ spec: status: replicas: 3 readyReplicas: 3 - updatedReplicas: 3 \ No newline at end of file + updatedReplicas: 3 diff --git a/bundle/tests/scorecard/kuttl/storage/00-assert.yaml b/bundle/tests/scorecard/kuttl/storage/00-assert.yaml index 6d4d4a17..25ab2e91 100644 --- a/bundle/tests/scorecard/kuttl/storage/00-assert.yaml +++ b/bundle/tests/scorecard/kuttl/storage/00-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: StatefulSet metadata: diff --git a/bundle/tests/scorecard/kuttl/storage/01-assert.yaml b/bundle/tests/scorecard/kuttl/storage/01-assert.yaml index 594873b2..f5234311 100644 --- a/bundle/tests/scorecard/kuttl/storage/01-assert.yaml +++ b/bundle/tests/scorecard/kuttl/storage/01-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/bundle/tests/scorecard/kuttl/storage/03-assert.yaml b/bundle/tests/scorecard/kuttl/storage/03-assert.yaml index e2936ee0..cc256f21 100644 --- a/bundle/tests/scorecard/kuttl/storage/03-assert.yaml +++ b/bundle/tests/scorecard/kuttl/storage/03-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: StatefulSet metadata: diff --git a/bundle/tests/scorecard/kuttl/storage/05-assert.yaml b/bundle/tests/scorecard/kuttl/storage/05-assert.yaml index 693b156d..ac33989c 100644 --- a/bundle/tests/scorecard/kuttl/storage/05-assert.yaml +++ b/bundle/tests/scorecard/kuttl/storage/05-assert.yaml @@ -1,7 +1,3 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 60 ---- apiVersion: apps/v1 kind: StatefulSet metadata: diff --git a/scripts/pipeline/ocp-cluster-e2e.sh b/scripts/pipeline/ocp-cluster-e2e.sh index db8e1f93..70e402a7 100755 --- a/scripts/pipeline/ocp-cluster-e2e.sh +++ b/scripts/pipeline/ocp-cluster-e2e.sh @@ -204,7 +204,7 @@ main() { echo "sleep for 3 minutes to wait for rook-cepth, knative and cert-manager to start installing, then start monitoring for completion" sleep 3m echo "monitoring knative" - ./wait.sh deployment knative-serving + scripts/pipeline/wait.sh deployment knative-serving rc_kn=$? echo "rc_kn=$rc_kn" if [[ "$rc_kn" == 0 ]]; then @@ -212,7 +212,7 @@ main() { fi if [[ "${ARCHITECTURE}" == "X" ]]; then echo "monitoring rook-ceph if architecture is ${ARCHITECTURE}" - ./wait.sh deployment rook-ceph + scripts/pipeline/wait.sh deployment rook-ceph rc_rk=$? echo "rc_rk=$rc_rk" if [[ "$rc_rk" == 0 ]]; then @@ -408,4 +408,4 @@ parse_args() { done } -main "$@" \ No newline at end of file +main "$@" diff --git a/utils/utils.go b/utils/utils.go index 02ce516e..d7887c2a 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -1097,7 +1097,7 @@ func CustomizeServiceMonitor(sm *prometheusv1.ServiceMonitor, ba common.BaseComp } if ba.GetManageTLS() == nil || *ba.GetManageTLS() { if len(ba.GetMonitoring().GetEndpoints()) == 0 || ba.GetMonitoring().GetEndpoints()[0].TLSConfig == nil { - sm.Spec.Endpoints[0].Scheme = "HTTPS" + sm.Spec.Endpoints[0].Scheme = "https" if sm.Spec.Endpoints[0].TLSConfig == nil { sm.Spec.Endpoints[0].TLSConfig = &prometheusv1.TLSConfig{} }