Skip to content

Commit 8bf9ad1

Browse files
ivanstanevivanstanev
committed
fix: prepare certified Operator for OpenShift v4.9
1 parent c87726e commit 8bf9ad1

File tree

7 files changed

+61
-57
lines changed

7 files changed

+61
-57
lines changed

‎snyk-operator-certified/bundle.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1
1414

1515
# Labels added in accord with the documentation
1616
# https://redhat-connect.gitbook.io/certified-operator-guide/ocp-deployment/operator-metadata/bundle-directory/managing-openshift-versions
17-
LABEL com.redhat.openshift.versions="v4.5-v4.8"
17+
LABEL com.redhat.openshift.versions="v4.5-v4.9"
1818
LABEL com.redhat.delivery.operator.bundle=true
1919
LABEL com.redhat.delivery.backport=true
2020

‎snyk-operator-certified/bundle/manifests/charts.snyk.io_snykmonitors.yaml‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
apiVersion: apiextensions.k8s.io/v1beta1
1+
apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
name: snykmonitors.charts.snyk.io
5+
annotations:
6+
"api-approved.kubernetes.io": "https://github.com/kubernetes/enhancements/pull/1111"
57
spec:
68
group: charts.snyk.io
79
names:
@@ -10,70 +12,68 @@ spec:
1012
plural: snykmonitors
1113
singular: snykmonitor
1214
scope: Namespaced
13-
subresources:
14-
status: {}
15-
validation:
16-
openAPIV3Schema:
17-
description: SnykMonitor is the Schema for the snykmonitors API
18-
type: object
19-
properties:
20-
apiVersion:
21-
description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
22-
type: string
23-
kind:
24-
description: "Kind is a string value representing the REST resource this 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"
25-
type: string
26-
metadata:
27-
type: object
28-
spec:
29-
description: Spec defines the desired state of SnykMonitor
15+
versions:
16+
- name: v1alpha1
17+
served: true
18+
storage: true
19+
schema:
20+
openAPIV3Schema:
21+
description: SnykMonitor is the Schema for the snykmonitors API
3022
type: object
31-
x-kubernetes-preserve-unknown-fields: true
3223
properties:
33-
monitorSecrets:
34-
description: >-
35-
The name of the secret object that stores the Snyk controller secrets.
36-
The secret needs to contain the following data fields:
37-
- integrationId
38-
- dockercfg.json
24+
apiVersion:
25+
description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources"
26+
type: string
27+
kind:
28+
description: "Kind is a string value representing the REST resource this 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"
3929
type: string
40-
image:
30+
metadata:
31+
type: object
32+
spec:
33+
description: Spec defines the desired state of SnykMonitor
34+
type: object
35+
x-kubernetes-preserve-unknown-fields: true
4136
properties:
42-
pullPolicy:
37+
monitorSecrets:
38+
description: >-
39+
The name of the secret object that stores the Snyk controller secrets.
40+
The secret needs to contain the following data fields:
41+
- integrationId
42+
- dockercfg.json
4343
type: string
4444
image:
45+
properties:
46+
pullPolicy:
47+
type: string
48+
image:
49+
type: string
50+
type: object
51+
scope:
4552
type: string
46-
type: object
47-
scope:
48-
type: string
49-
clusterName:
50-
type: string
51-
integrationApi:
52-
type: string
53-
temporaryStorageSize:
54-
type: string
55-
pvc:
56-
properties:
57-
enabled:
58-
type: boolean
59-
name:
53+
clusterName:
6054
type: string
61-
type: object
62-
initContainerImage:
63-
properties:
64-
image:
55+
integrationApi:
6556
type: string
66-
pullPolicy:
57+
temporaryStorageSize:
6758
type: string
59+
pvc:
60+
properties:
61+
enabled:
62+
type: boolean
63+
name:
64+
type: string
65+
type: object
66+
initContainerImage:
67+
properties:
68+
image:
69+
type: string
70+
pullPolicy:
71+
type: string
72+
type: object
73+
status:
74+
description: Status defines the observed state of SnykMonitor
6875
type: object
69-
status:
70-
description: Status defines the observed state of SnykMonitor
71-
type: object
72-
x-kubernetes-preserve-unknown-fields: true
73-
versions:
74-
- name: v1alpha1
75-
served: true
76-
storage: true
76+
x-kubernetes-preserve-unknown-fields: true
7777
status:
7878
acceptedNames:
7979
kind: ""

‎snyk-operator-certified/bundle/manifests/snyk-monitor-metrics-reader_rbac.authorization.k8s.io_v1beta1_clusterrole.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: rbac.authorization.k8s.io/v1beta1
1+
apiVersion: rbac.authorization.k8s.io/v1
22
kind: ClusterRole
33
metadata:
44
creationTimestamp: null

‎snyk-operator-certified/bundle/metadata/annotations.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ annotations:
1010
operators.operatorframework.io.metrics.project_layout: helm.sdk.operatorframework.io/v1
1111
operators.operatorframework.io.test.config.v1: tests/scorecard/
1212
operators.operatorframework.io.test.mediatype.v1: scorecard+v1
13+
com.redhat.openshift.versions: "v4.6-v4.9"

‎snyk-operator/certified-operator/bundle.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1
1414

1515
# Labels added in accord with the documentation
1616
# https://redhat-connect.gitbook.io/certified-operator-guide/ocp-deployment/operator-metadata/bundle-directory
17-
LABEL com.redhat.openshift.versions="v4.5,v4.6,v4.7"
17+
LABEL com.redhat.openshift.versions="v4.5-v4.9"
1818
LABEL com.redhat.delivery.operator.bundle=true
1919
LABEL com.redhat.delivery.backport=true
2020

‎snyk-operator/certified-operator/bundle/metadata/annotations.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ annotations:
1010
operators.operatorframework.io.metrics.project_layout: helm.sdk.operatorframework.io/v1
1111
operators.operatorframework.io.test.config.v1: tests/scorecard/
1212
operators.operatorframework.io.test.mediatype.v1: scorecard+v1
13+
com.redhat.openshift.versions: "v4.6-v4.9"

‎snyk-operator/deploy/olm-catalog/snyk-operator/0.0.0/snykmonitors.charts.helm.k8s.io.crd.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
name: snykmonitors.charts.helm.k8s.io
5+
annotations:
6+
"api-approved.kubernetes.io": "https://github.com/kubernetes/enhancements/pull/1111"
57
spec:
68
group: charts.helm.k8s.io
79
names:

0 commit comments

Comments
 (0)