Skip to content

Commit 4ec79e5

Browse files
authored
Merge pull request #866 from snyk/fix/prevent-ocp-4.9-upgrades
fix: the snyk-operator does not use OCP 4.9 due to deprecated APIs
2 parents b5c7be9 + cb0c387 commit 4ec79e5

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

snyk-operator-certified/Dockerfile

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

44
LABEL name="Snyk Operator" \
55
maintainer="[email protected]" \

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.7"
17+
LABEL com.redhat.openshift.versions="v4.5-v4.8"
1818
LABEL com.redhat.delivery.operator.bundle=true
1919
LABEL com.redhat.delivery.backport=true
2020

snyk-operator-certified/bundle/manifests/snyk-monitor.clusterserviceversion.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ metadata:
3939
}
4040
}
4141
]
42+
"olm.properties": '[{"type": "olm.maxOpenShiftVersion", "value": "4.8"}]'
4243
capabilities: Basic Install
4344
categories: Developer Tools
4445
certified: "true"

snyk-operator/deploy/olm-catalog/snyk-operator/0.0.0/snyk-operator.v0.0.0.clusterserviceversion.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ metadata:
3434
}
3535
}
3636
]
37+
"olm.properties": '[{"type": "olm.maxOpenShiftVersion", "value": "4.8"}]'
3738
capabilities: Basic Install
3839
categories: Developer Tools, Security
3940
containerImage: docker.io/snyk/kubernetes-operator:SNYK_OPERATOR_IMAGE_TAG_OVERRIDE
@@ -272,11 +273,11 @@ spec:
272273
livenessProbe:
273274
exec:
274275
command:
275-
- "true"
276+
- "true"
276277
readinessProbe:
277278
exec:
278279
command:
279-
- "true"
280+
- "true"
280281
securityContext:
281282
privileged: false
282283
runAsNonRoot: true

0 commit comments

Comments
 (0)