Skip to content

Commit 49b0ba6

Browse files
ivanstanevivanstanev
authored
Merge pull request #909 from snyk/feat/operator-openshift-4.9
Feat/operator openshift 4.9
2 parents 0194db7 + 8e9448b commit 49b0ba6

32 files changed

+186
-168
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM fedora:32 AS skopeo-build
55

66
RUN dnf install -y golang git make
77
RUN dnf install -y go-md2man gpgme-devel libassuan-devel btrfs-progs-devel device-mapper-devel
8-
RUN git clone --depth 1 -b 'v1.4.0' https://github.com/containers/skopeo $GOPATH/src/github.com/containers/skopeo
8+
RUN git clone --depth 1 -b 'v1.4.1' https://github.com/containers/skopeo $GOPATH/src/github.com/containers/skopeo
99
RUN cd $GOPATH/src/github.com/containers/skopeo \
1010
&& make bin/skopeo DISABLE_CGO=1 \
1111
&& make install

‎snyk-operator-certified/Dockerfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# Build the manager binary
2-
FROM quay.io/operator-framework/helm-operator:v1.12
1+
FROM quay.io/operator-framework/helm-operator:v1.13
32

43
LABEL name="Snyk Operator" \
54
maintainer="[email protected]" \

‎snyk-operator-certified/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Current Operator version
2-
VERSION ?= 1.64.1
2+
VERSION ?= 1.67.2
33
# Default bundle image tag
44
BUNDLE_IMG ?= snyk/snyk-operator-bundle:$(VERSION)
55
# Options for 'bundle-build'

‎snyk-operator-certified/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ chmod +x opm
66
```
77

88
```sh
9-
export VERSION=1.64.1-pre0
9+
export VERSION=1.67.2-pre0
1010
make docker-build
1111
docker tag snyk/snyk-operator-bundle:$VERSION <operator-certification-repo>:$VERSION
1212
docker push registry.connect.redhat.com/snyk/kubernetes-operator:$VERSION
@@ -26,7 +26,7 @@ metadata:
2626
namespace: openshift-marketplace
2727
spec:
2828
sourceType: grpc
29-
image: docker.io/snyk/snyk-operator-index:1.64.1
29+
image: docker.io/snyk/snyk-operator-index:1.67.2
3030
displayName: Snyk Operator Bundle
3131
publisher: Snyk Ltd.
3232
updateStrategy:

‎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/manifests/snyk-monitor.clusterserviceversion.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: ClusterServiceVersion
33
metadata:
44
labels:
55
app.kubernetes.io/instance: snyk-operator-marketplace
6-
app.kubernetes.io/version: 1.64.1
6+
app.kubernetes.io/version: 1.67.2
77
app.kubernetes.io/name: snyk-operator-marketplace
88
app.kubernetes.io/managed-by: snyk-operator-marketplace
99
annotations:
@@ -16,14 +16,14 @@ metadata:
1616
"name": "snyk-monitor",
1717
"labels": {
1818
"app.kubernetes.io/instance": "snyk-monitor",
19-
"app.kubernetes.io/version": "1.64.1",
19+
"app.kubernetes.io/version": "1.67.2",
2020
"app.kubernetes.io/name": "snyk-monitor",
2121
"app.kubernetes.io/managed-by": "snyk-operator"
2222
},
2323
"annotations": {
2424
"productID": "snyk-operator-marketplace",
2525
"productName": "snyk-operator-marketplace",
26-
"productVersion": "1.64.1"
26+
"productVersion": "1.67.2"
2727
}
2828
},
2929
"spec": {
@@ -45,15 +45,15 @@ metadata:
4545
certified: "true"
4646
productID: snyk-operator-marketplace
4747
productName: snyk-operator-marketplace
48-
productVersion: 1.64.1
49-
containerImage: registry.connect.redhat.com/snyk/kubernetes-operator:1.64.1
48+
productVersion: 1.67.2
49+
containerImage: registry.connect.redhat.com/snyk/kubernetes-operator:1.67.2
5050
createdAt: "2021-06-04T00:20:21Z"
5151
description: A Kubernetes Operator for creating and managing Snyk controller instances.
5252
operators.operatorframework.io/builder: operator-sdk-v1.3.0
5353
operators.operatorframework.io/project_layout: helm.sdk.operatorframework.io/v1
5454
repository: https://github.com/docker.io/snyk/kubernetes-monitor
5555
support: Snyk Ltd.
56-
name: snyk-operator-marketplace.v1.64.1
56+
name: snyk-operator-marketplace.v1.67.2
5757
spec:
5858
apiservicedefinitions: {}
5959
customresourcedefinitions:
@@ -248,7 +248,7 @@ spec:
248248
control-plane: controller-manager
249249
spec:
250250
containers:
251-
- image: registry.connect.redhat.com/snyk/kubernetes-operator:1.64.1
251+
- image: registry.connect.redhat.com/snyk/kubernetes-operator:1.67.2
252252
name: operator
253253
resources:
254254
limits:
@@ -277,7 +277,7 @@ spec:
277277
- name: OPERATOR_NAME
278278
value: snyk-operator
279279
- name: RELATED_IMAGE_DEPLOYMENT
280-
value: registry.connect.redhat.com/snyk/kubernetes-monitor:1.64.1
280+
value: registry.connect.redhat.com/snyk/kubernetes-monitor:1.67.2
281281
- name: RELATED_IMAGE_DEPLOYMENT_INIT
282282
value: registry.access.redhat.com/ubi8-minimal:latest
283283
- args:
@@ -352,4 +352,4 @@ spec:
352352
maturity: stable
353353
provider:
354354
name: Snyk Ltd.
355-
version: 1.64.1
355+
version: 1.67.2

‎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/config/manager/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ kind: Kustomization
55
images:
66
- name: controller
77
newName: registry.connect.redhat.com/snyk/kubernetes-operator
8-
newTag: 1.64.1
8+
newTag: 1.67.2

0 commit comments

Comments
 (0)