Skip to content

Commit

Permalink
Release v0.1.60
Browse files Browse the repository at this point in the history
  • Loading branch information
rhmdnd committed Jan 26, 2023
1 parent a1ce8eb commit 4909c00
Show file tree
Hide file tree
Showing 10 changed files with 74 additions and 8 deletions.
27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,33 @@ Versioning](https://semver.org/spec/v2.0.0.html).

### Enhancements

-

### Fixes

-

### Internal Changes

-

### Deprecations

-

### Removals

-

### Security

-


## [0.1.60] - 2023-01-23

### Enhancements

- Added support for timeout for Scanner Pod. The timeout is
specified in the `ComplianceScanSettings` object as a duration string,
e.g. `1h30m`. If the scan is not completed within the timeout, the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ metadata:
]
capabilities: Seamless Upgrades
categories: Monitoring,Security
olm.skipRange: '>=0.1.17 <0.1.59'
olm.skipRange: '>=0.1.17 <0.1.60'
operatorframework.io/cluster-monitoring: "true"
operatorframework.io/suggested-namespace: openshift-compliance
operators.openshift.io/infrastructure-features: '["disconnected", "fips", "proxy-aware"]'
Expand All @@ -174,7 +174,7 @@ metadata:
operatorframework.io/arch.amd64: supported
operatorframework.io/arch.ppc64le: supported
operatorframework.io/arch.s390x: supported
name: compliance-operator.v0.1.59
name: compliance-operator.v0.1.60
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -1605,4 +1605,4 @@ spec:
name: operator
- image: ghcr.io/complianceascode/k8scontent:latest
name: profile
version: 0.1.59
version: 0.1.60
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ spec:
type: string
metadata:
type: object
rationale:
description: The rationale of the Rule
type: string
severity:
description: The severity of a check status
type: string
Expand Down
13 changes: 13 additions & 0 deletions bundle/manifests/compliance.openshift.io_compliancescans.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ spec:
object Defines a proxy for the scan to get external resources from.
This is useful for disconnected installations with access to a proxy.
type: string
maxRetryOnTimeout:
default: 3
description: MaxRetryOnTimeout is the maximum number of times the
scan will be retried if it times out.
type: integer
noExternalResources:
description: Defines that no external resources in the Data Stream
should be used. External resources could be, for instance, CVE feeds.
Expand Down Expand Up @@ -273,6 +278,11 @@ spec:
required:
- name
type: object
timeout:
default: 30m
description: Timeout is the maximum amount of time the scan can run.
If the scan hasn't finished by then, it will be aborted.
type: string
type: object
status:
description: The status will give valuable information on what's going
Expand Down Expand Up @@ -332,6 +342,9 @@ spec:
description: Is the phase where the scan is at. Normally, one must
wait for the scan to reach the phase DONE.
type: string
remainingRetries:
description: Is the number of retries left for the scan on timeout
type: integer
result:
description: Once the scan reaches the phase DONE, this will contain
the result of the scan. Where COMPLIANT means that the scan succeeded;
Expand Down
13 changes: 13 additions & 0 deletions bundle/manifests/compliance.openshift.io_compliancesuites.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@ spec:
from. This is useful for disconnected installations with access
to a proxy.
type: string
maxRetryOnTimeout:
default: 3
description: MaxRetryOnTimeout is the maximum number of times
the scan will be retried if it times out.
type: integer
name:
description: Contains a human readable name for the scan. This
is to identify the objects that it creates.
Expand Down Expand Up @@ -304,6 +309,11 @@ spec:
required:
- name
type: object
timeout:
default: 30m
description: Timeout is the maximum amount of time the scan
can run. If the scan hasn't finished by then, it will be aborted.
type: string
type: object
type: array
x-kubernetes-list-type: atomic
Expand Down Expand Up @@ -431,6 +441,9 @@ spec:
description: Is the phase where the scan is at. Normally, one
must wait for the scan to reach the phase DONE.
type: string
remainingRetries:
description: Is the number of retries left for the scan on timeout
type: integer
result:
description: Once the scan reaches the phase DONE, this will
contain the result of the scan. Where COMPLIANT means that
Expand Down
10 changes: 10 additions & 0 deletions bundle/manifests/compliance.openshift.io_scansettings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ spec:
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
maxRetryOnTimeout:
default: 3
description: MaxRetryOnTimeout is the maximum number of times the scan
will be retried if it times out.
type: integer
metadata:
type: object
noExternalResources:
Expand Down Expand Up @@ -242,6 +247,11 @@ spec:
be strict and error out. `false` means that we don't need to be strict
and we can proceed.
type: boolean
timeout:
default: 30m
description: Timeout is the maximum amount of time the scan can run. If
the scan hasn't finished by then, it will be aborted.
type: string
type: object
served: true
storage: true
Expand Down
4 changes: 2 additions & 2 deletions catalog/preamble.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"package": "compliance-operator",
"entries": [
{
"name": "compliance-operator.v0.1.59",
"skipRange": ">=0.1.17 <0.1.59"
"name": "compliance-operator.v0.1.60",
"skipRange": ">=0.1.17 <0.1.60"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ metadata:
]
capabilities: Seamless Upgrades
categories: Monitoring,Security
olm.skipRange: '>=0.1.17 <0.1.59'
olm.skipRange: '>=0.1.17 <0.1.60'
operatorframework.io/cluster-monitoring: "true"
operatorframework.io/suggested-namespace: openshift-compliance
operators.openshift.io/infrastructure-features: '["disconnected", "fips", "proxy-aware"]'
Expand Down
2 changes: 1 addition & 1 deletion version.Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)

VERSION?=0.1.59
VERSION?=0.1.60
2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package version

var (
Version = "0.1.59"
Version = "0.1.60"
)

0 comments on commit 4909c00

Please sign in to comment.