Skip to content

Commit 5ab179c

Browse files
authored
Manifest changes for OpenShift (#697)
1 parent daac7f4 commit 5ab179c

File tree

19 files changed

+439
-207
lines changed

19 files changed

+439
-207
lines changed

.github/workflows/compatibility-tests.yaml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ jobs:
4848
- 3.3.0
4949
- 3.2.11
5050
- 3.2.10
51-
- 3.2.9
52-
- 3.2.7
53-
- 3.2.6
5451
include:
5552
- compatibilityVersion: 3.4.2
5653
coherence-image: "ghcr.io/oracle/coherence-ce:14.1.2-0-1"
@@ -96,18 +93,6 @@ jobs:
9693
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
9794
compatibilitySelector: control-plane=coherence
9895
k8s: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
99-
- compatibilityVersion: 3.2.9
100-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
101-
compatibilitySelector: control-plane=coherence
102-
k8s: kindest/node:v1.24.12@sha256:1e12918b8bc3d4253bc08f640a231bb0d3b2c5a9b28aa3f2ca1aee93e1e8db16
103-
- compatibilityVersion: 3.2.7
104-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
105-
compatibilitySelector: control-plane=coherence
106-
k8s: kindest/node:v1.24.12@sha256:1e12918b8bc3d4253bc08f640a231bb0d3b2c5a9b28aa3f2ca1aee93e1e8db16
107-
- compatibilityVersion: 3.2.6
108-
coherence-image: "ghcr.io/oracle/coherence-ce:22.06.10"
109-
compatibilitySelector: control-plane=coherence
110-
k8s: kindest/node:v1.24.12@sha256:1e12918b8bc3d4253bc08f640a231bb0d3b2c5a9b28aa3f2ca1aee93e1e8db16
11196

11297
steps:
11398
- uses: actions/checkout@v4

.github/workflows/release.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,4 +161,15 @@ jobs:
161161
upload_url: ${{ github.event.release.upload_url }}
162162
asset_path: /tmp/coherence-operator/_output/coherence-dashboards.tar.gz
163163
asset_name: coherence-dashboards.tar.gz
164-
asset_content_type: text/plain
164+
asset_content_type: application/tar+gzip
165+
166+
- name: Upload Docs
167+
id: upload-docs
168+
uses: actions/upload-release-asset@v1
169+
env:
170+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
171+
with:
172+
upload_url: ${{ github.event.release.upload_url }}
173+
asset_path: /tmp/coherence-operator/_output/docs.tar.gz
174+
asset_name: docs.tar.gz
175+
asset_content_type: application/tar+gzip

Dockerfile

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,34 @@ ARG target
1010
ARG version
1111
ARG coherence_image
1212
ARG operator_image
13+
ARG release
1314

1415
LABEL "com.oracle.coherence.application"="operator"
1516
LABEL "com.oracle.coherence.version"="$version"
17+
LABEL "org.opencontainers.image.revision"="$release"
1618
LABEL "org.opencontainers.image.description"="The Oracle Coherece Kubernetes Operator image ($target)"
1719
LABEL "org.opencontainers.image.source"="https://github.com/oracle/coherence-operator"
20+
LABEL "org.opencontainers.image.authors"="To contact the authors use this link https://github.com/oracle/coherence-operator/discussions"
21+
LABEL "org.opencontainers.image.licenses"="UPL-1.0"
22+
LABEL "org.opencontainers.image.description"="The Oracle Coherece Kubernetes Operator allows full lifecycle management of Oracle Coherence workloads in Kubernetes."
23+
24+
LABEL "name"="Oracle Coherence Kubernetes Operator"
25+
LABEL "vendor"="Oracle"
26+
LABEL "version"="$version"
27+
LABEL "release"="$release"
28+
LABEL "maintainer"="Oracle Coherence Engieering Team"
29+
LABEL "summary"="A Kubernetes Operator for managing Oracle Coherence clusters"
30+
LABEL "description"="The Oracle Coherece Kubernetes Operator allows full lifecycle management of Oracle Coherence workloads in Kubernetes."
1831

1932
ENV COHERENCE_IMAGE=$coherence_image \
2033
OPERATOR_IMAGE=$operator_image
2134

35+
COPY LICENSE.txt /licenses/LICENSE.txt
2236
COPY bin/linux/$target/* /files/
2337
COPY java/coherence-operator/target/docker/lib/*.jar /files/lib/
2438
COPY java/coherence-operator/target/docker/logging/logging.properties /files/logging/logging.properties
2539

40+
USER 1000
41+
2642
ENTRYPOINT ["/files/runner"]
2743
CMD ["-h"]

Makefile

Lines changed: 237 additions & 150 deletions
Large diffs are not rendered by default.

PROJECT

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
domain: oracle.com
2-
layout: go.kubebuilder.io/v3
2+
layout:
3+
- go.kubebuilder.io/v4
34
projectName: coherence-operator
45
repo: github.com/oracle/coherence-operator
56
resources:

config/manager/manager.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ spec:
3131
spec:
3232
serviceAccountName: service-account
3333
terminationGracePeriodSeconds: 10
34+
securityContext:
35+
runAsNonRoot: true
36+
seccompProfile:
37+
type: RuntimeDefault
3438
containers:
3539
- name: manager
3640
image: controller:latest
@@ -91,6 +95,11 @@ spec:
9195
initialDelaySeconds: 10
9296
periodSeconds: 10
9397
failureThreshold: 3
98+
securityContext:
99+
allowPrivilegeEscalation: false
100+
capabilities:
101+
drop:
102+
- "ALL"
94103
volumes:
95104
- name: cert
96105
secret:
@@ -108,6 +117,19 @@ spec:
108117
app.kubernetes.io/instance: coherence-operator-manager
109118
app.kubernetes.io/version: "3.4.3"
110119
affinity:
120+
nodeAffinity:
121+
requiredDuringSchedulingIgnoredDuringExecution:
122+
nodeSelectorTerms:
123+
- matchExpressions:
124+
- key: kubernetes.io/arch
125+
operator: In
126+
values:
127+
- amd64
128+
- arm64
129+
- key: kubernetes.io/os
130+
operator: In
131+
values:
132+
- linux
111133
podAntiAffinity:
112134
preferredDuringSchedulingIgnoredDuringExecution:
113135
- podAffinityTerm:

config/manifests/bases/coherence-operator.clusterserviceversion.yaml

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,42 @@ apiVersion: operators.coreos.com/v1alpha1
22
kind: ClusterServiceVersion
33
metadata:
44
annotations:
5-
alm-examples: '[ { "apiVersion": "coherence.oracle.com/v1", "kind": "Coherence",
6-
"metadata": { "name": "coherence-example" }, "spec": { "replicas": 3 } }]'
5+
alm-examples: "[ \n {\n \"apiVersion\": \"coherence.oracle.com/v1\", \n \"kind\":
6+
\"Coherence\",\n \"metadata\": { \n \"name\": \"coherence-example\"
7+
\n }, \n \"spec\": { \n \"replicas\": 3 \n } \n }\n]"
78
capabilities: Full Lifecycle
89
categories: Database
9-
certified: 'false'
10-
createdAt: ''
11-
description: >-
12-
Coherence Operator implements features to assist with deploying and
13-
managing Coherence clusters in a Kubernetes environment.
14-
containerImage: 'ghcr.io/oracle/coherence-operator:3.4.3'
15-
support: ''
16-
repository: 'https://github.com/oracle/coherence-operator'
17-
operators.operatorframework.io/builder: operator-sdk-v1.0.0
18-
operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
19-
name: coherence-operator.v3.4.3
20-
namespace: placeholder
10+
certified: "false"
11+
containerImage: ghcr.io/oracle/coherence-operator:3.4.3
12+
description: The Oracle Coherence Kubernetes Operator enables easy management
13+
of Coherence clusters in a Kubernetes environment.
14+
operators.operatorframework.io/builder: operator-sdk-v1.39.1
15+
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
16+
repository: https://github.com/oracle/coherence-operator
17+
support: ""
18+
name: coherence-operator.v3.4.2
2119
spec:
2220
apiservicedefinitions: {}
2321
customresourcedefinitions:
2422
owned:
25-
- description: Coherence is the Schema for the Coherence Operator API.
23+
- description: Coherence is the Schema for the Coherence Cluster API.
2624
displayName: Coherence
2725
kind: Coherence
28-
name: coherence.coherence.oracle.com.oracle.com
26+
name: coherence.coherence.oracle.com
27+
version: v1
28+
- description: CoherenceJob is the Schema for the Coherence Job API.
29+
displayName: CoherenceJob
30+
kind: CoherenceJob
31+
name: coherencejob.coherence.oracle.com
2932
version: v1
3033
description: |
31-
The Coherence Operator implements features to assist with deploying and
32-
managing Coherence clusters in a Kubernetes environment.
34+
The Oracle Coherence Kubernetes Operator enables easy management of Coherence clusters in a Kubernetes environment.
3335
3436
### Installation Guide & Configuration
3537
3638
For the complete installation guide and all configuration options please refer to
3739
[Coherence Operator Documentation](https://oracle.github.io/coherence-operator/docs/latest/#/about/01_overview).
38-
displayName: Coherence
40+
displayName: Coherence Kubernetes Operator
3941
icon:
4042
- base64data: iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAAAXNSR0IArs4c6QAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAIK2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyIKICAgICAgICAgICAgeG1sbnM6ZXhpZj0iaHR0cDovL25zLmFkb2JlLmNvbS9leGlmLzEuMC8iCiAgICAgICAgICAgIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIKICAgICAgICAgICAgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iCiAgICAgICAgICAgIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiCiAgICAgICAgICAgIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIKICAgICAgICAgICAgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIj4KICAgICAgICAgPHRpZmY6UmVzb2x1dGlvblVuaXQ+MjwvdGlmZjpSZXNvbHV0aW9uVW5pdD4KICAgICAgICAgPHRpZmY6T3JpZW50YXRpb24+MTwvdGlmZjpPcmllbnRhdGlvbj4KICAgICAgICAgPGV4aWY6UGl4ZWxYRGltZW5zaW9uPjYwMDwvZXhpZjpQaXhlbFhEaW1lbnNpb24+CiAgICAgICAgIDxleGlmOkNvbG9yU3BhY2U+NjU1MzU8L2V4aWY6Q29sb3JTcGFjZT4KICAgICAgICAgPGV4aWY6UGl4ZWxZRGltZW5zaW9uPjExMjwvZXhpZjpQaXhlbFlEaW1lbnNpb24+CiAgICAgICAgIDxkYzpmb3JtYXQ+aW1hZ2UvcG5nPC9kYzpmb3JtYXQ+CiAgICAgICAgIDx4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ+eG1wLmRpZDpkNDMwYzI2Yi05YTNhLTQzN2ItYWZlMy02NWRjYjgyZTY1NTc8L3htcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD4KICAgICAgICAgPHhtcE1NOkhpc3Rvcnk+CiAgICAgICAgICAgIDxyZGY6U2VxPgogICAgICAgICAgICAgICA8cmRmOmxpIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OnNvZnR3YXJlQWdlbnQ+QWRvYmUgUGhvdG9zaG9wIENDIDIwMTUgKE1hY2ludG9zaCk8L3N0RXZ0OnNvZnR3YXJlQWdlbnQ+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDp3aGVuPjIwMjAtMDUtMjlUMDc6NTI6MjUtMDQ6MDA8L3N0RXZ0OndoZW4+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDppbnN0YW5jZUlEPnhtcC5paWQ6ZDQzMGMyNmItOWEzYS00MzdiLWFmZTMtNjVkY2I4MmU2NTU3PC9zdEV2dDppbnN0YW5jZUlEPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6YWN0aW9uPmNyZWF0ZWQ8L3N0RXZ0OmFjdGlvbj4KICAgICAgICAgICAgICAgPC9yZGY6bGk+CiAgICAgICAgICAgIDwvcmRmOlNlcT4KICAgICAgICAgPC94bXBNTTpIaXN0b3J5PgogICAgICAgICA8eG1wTU06SW5zdGFuY2VJRD54bXAuaWlkOmQ0MzBjMjZiLTlhM2EtNDM3Yi1hZmUzLTY1ZGNiODJlNjU1NzwveG1wTU06SW5zdGFuY2VJRD4KICAgICAgICAgPHhtcE1NOkRvY3VtZW50SUQ+eG1wLmRpZDpkNDMwYzI2Yi05YTNhLTQzN2ItYWZlMy02NWRjYjgyZTY1NTc8L3ht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
4143
mediatype: image/png
@@ -55,14 +57,13 @@ spec:
5557
keywords:
5658
- coherence
5759
links:
58-
- name: Coherence Operator
60+
- name: Coherence Kubernetes Operator
5961
url: https://oracle.github.io/coherence-operator/docs/latest
62+
- name: Oracle Coherence
63+
url: https://coherence.community
6064
maturity: alpha
61-
minKubeVersion: "1.18"
62-
maintainers:
63-
- name: Jonathan Knight
64-
65+
minKubeVersion: 1.26.0
6566
provider:
66-
name: Oracle
67-
url: https://oracle.github.io/coherence-operator/docs/latest
67+
name: Oracle Corporation
68+
url: https://github.com/oracle/coherence-operator
6869
version: 3.4.3

config/samples/coherence.oracle.com_v1_coherence.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ kind: Coherence
33
metadata:
44
name: coherence-sample
55
spec:
6-
replicas: 1
6+
replicas: 3

hack/coherence-certification.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# by the test suite to install the operator.
1313
#
1414
# * The Operator image and its test images wil be pushed to an image registry.
15-
# The registry to use should be set using the RELEASE_IMAGE_PREFIX environment
15+
# The registry to use should be set using the OPERATOR_IMAGE_REGISTRY environment
1616
# variable. If the registry requires credentials to push to then the
1717
# docker login command should already have been executed before this script.
1818
#

hack/ensure-sdk.sh

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
#!/bin/sh
22

3-
REQUIRED_VERSION=$1
3+
REQUIRED_VERSION="$(curl -s https://api.github.com/repos/operator-framework/operator-sdk/releases/latest | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')"
44
OPERATOR_SDK_HOME=$2
55

66
UNAME_S=$(uname -s)
7+
UNAME_M=$(uname -m)
8+
79
OPERATOR_SDK=${OPERATOR_SDK_HOME}/operator-sdk
810
OK=0
911

@@ -25,12 +27,20 @@ if [ ${OK} != 0 ]; then
2527
echo "Operator SDK not found or not correct version"
2628

2729
if [ "${UNAME_S}" = "Darwin" ]; then
28-
URL="https://github.com/operator-framework/operator-sdk/releases/download/${REQUIRED_VERSION}/operator-sdk_darwin_amd64"
30+
if [ "${UNAME_S}" = "x86_64" ]; then
31+
URL="https://github.com/operator-framework/operator-sdk/releases/download/${REQUIRED_VERSION}/operator-sdk_darwin_amd64"
32+
else
33+
URL="https://github.com/operator-framework/operator-sdk/releases/download/${REQUIRED_VERSION}/operator-sdk_darwin_arm64"
34+
fi
2935
else
30-
URL="https://github.com/operator-framework/operator-sdk/releases/download/${REQUIRED_VERSION}/operator-sdk-linux-amd64"
36+
if [ "${UNAME_S}" = "x86_64" ]; then
37+
URL="https://github.com/operator-framework/operator-sdk/releases/download/${REQUIRED_VERSION}/operator-sdk-linux-amd64"
38+
else
39+
URL="https://github.com/operator-framework/operator-sdk/releases/download/${REQUIRED_VERSION}/operator-sdk-linux-arm64"
40+
fi
3141
fi
3242

33-
echo "Downloading Operator SDK ${UNAME_S} version from ${URL}"
43+
echo "Downloading Operator SDK ${UNAME_S}/${UNAME_M} version ${REQUIRED_VERSION} from ${URL}"
3444
curl -L ${URL} -o ${OPERATOR_SDK}
3545
chmod +x ${OPERATOR_SDK}
3646
fi

0 commit comments

Comments
 (0)