Manifest changes for OpenShift

.github/workflows/release.yml

@@ -161,4 +161,15 @@ jobs:
         upload_url: ${{ github.event.release.upload_url }}
         asset_path: /tmp/coherence-operator/_output/coherence-dashboards.tar.gz
         asset_name: coherence-dashboards.tar.gz
-        asset_content_type: text/plain
+        asset_content_type: application/tar+gzip
+
+    - name: Upload Docs
+      id: upload-docs
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: /tmp/coherence-operator/_output/docs.tar.gz
+        asset_name: docs.tar.gz
+        asset_content_type: application/tar+gzip

Dockerfile

@@ -10,18 +10,34 @@ ARG target
 ARG version
 ARG coherence_image
 ARG operator_image
+ARG release
 
 LABEL "com.oracle.coherence.application"="operator"
 LABEL "com.oracle.coherence.version"="$version"
+LABEL "org.opencontainers.image.revision"="$release"
 LABEL "org.opencontainers.image.description"="The Oracle Coherece Kubernetes Operator image ($target)"
 LABEL "org.opencontainers.image.source"="https://github.com/oracle/coherence-operator"
+LABEL "org.opencontainers.image.authors"="To contact the authors use this link https://github.com/oracle/coherence-operator/discussions"
+LABEL "org.opencontainers.image.licenses"="UPL-1.0"
+LABEL "org.opencontainers.image.description"="The Oracle Coherece Kubernetes Operator allows full lifecycle management of Oracle Coherence workloads in Kubernetes."
+
+LABEL "name"="Oracle Coherence Kubernetes Operator"
+LABEL "vendor"="Oracle"
+LABEL "version"="$version"
+LABEL "release"="$release"
+LABEL "maintainer"="Oracle Coherence Engieering Team"
+LABEL "summary"="A Kubernetes Operator for managing Oracle Coherence clusters"
+LABEL "description"="The Oracle Coherece Kubernetes Operator allows full lifecycle management of Oracle Coherence workloads in Kubernetes."
 
 ENV COHERENCE_IMAGE=$coherence_image \
     OPERATOR_IMAGE=$operator_image
 
+COPY LICENSE.txt                                                       /licenses/LICENSE.txt
 COPY bin/linux/$target/*                                               /files/
 COPY java/coherence-operator/target/docker/lib/*.jar                   /files/lib/
 COPY java/coherence-operator/target/docker/logging/logging.properties  /files/logging/logging.properties
 
+USER 1000
+
 ENTRYPOINT ["/files/runner"]
 CMD ["-h"]

PROJECT

@@ -1,5 +1,6 @@
 domain: oracle.com
-layout: go.kubebuilder.io/v3
+layout:
+- go.kubebuilder.io/v4
 projectName: coherence-operator
 repo: github.com/oracle/coherence-operator
 resources:

config/manager/manager.yaml

@@ -31,6 +31,10 @@ spec:
     spec:
       serviceAccountName: service-account
       terminationGracePeriodSeconds: 10
+      securityContext:
+        runAsNonRoot: true
+        seccompProfile:
+          type: RuntimeDefault
       containers:
       - name: manager
         image: controller:latest
@@ -91,6 +95,11 @@ spec:
           initialDelaySeconds: 10
           periodSeconds: 10
           failureThreshold: 3
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+              - "ALL"
       volumes:
       - name: cert
         secret:
@@ -108,6 +117,19 @@ spec:
               app.kubernetes.io/instance: coherence-operator-manager
               app.kubernetes.io/version: "3.4.3"
       affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+              - matchExpressions:
+                  - key: kubernetes.io/arch
+                    operator: In
+                    values:
+                      - amd64
+                      - arm64
+                  - key: kubernetes.io/os
+                    operator: In
+                    values:
+                      - linux
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
             - podAffinityTerm:

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

@@ -2,40 +2,42 @@ apiVersion: operators.coreos.com/v1alpha1
 kind: ClusterServiceVersion
 metadata:
   annotations:
-    alm-examples: '[ { "apiVersion": "coherence.oracle.com/v1", "kind": "Coherence",
-      "metadata": { "name": "coherence-example" }, "spec": { "replicas": 3 } }]'
+    alm-examples: "[ \n  {\n    \"apiVersion\": \"coherence.oracle.com/v1\", \n    \"kind\":
+      \"Coherence\",\n    \"metadata\": { \n      \"name\": \"coherence-example\"
+      \n    }, \n    \"spec\": { \n      \"replicas\": 3 \n    } \n  }\n]"
     capabilities: Full Lifecycle
     categories: Database
-    certified: 'false'
-    createdAt: ''
-    description: >-
-      Coherence Operator implements features to assist with deploying and
-      managing Coherence clusters in a Kubernetes environment.
-    containerImage: 'ghcr.io/oracle/coherence-operator:3.4.3'
-    support: ''
-    repository: 'https://github.com/oracle/coherence-operator'
-    operators.operatorframework.io/builder: operator-sdk-v1.0.0
-    operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
-  name: coherence-operator.v3.4.3
-  namespace: placeholder
+    certified: "false"
+    containerImage: ghcr.io/oracle/coherence-operator:3.4.3
+    description: The Oracle Coherence Kubernetes Operator enables easy management
+      of Coherence clusters in a Kubernetes environment.
+    operators.operatorframework.io/builder: operator-sdk-v1.39.1
+    operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
+    repository: https://github.com/oracle/coherence-operator
+    support: ""
+  name: coherence-operator.v3.4.2
 spec:
   apiservicedefinitions: {}
   customresourcedefinitions:
     owned:
-    - description: Coherence is the Schema for the Coherence Operator API.
+    - description: Coherence is the Schema for the Coherence Cluster API.
       displayName: Coherence
       kind: Coherence
-      name: coherence.coherence.oracle.com.oracle.com
+      name: coherence.coherence.oracle.com
+      version: v1
+    - description: CoherenceJob is the Schema for the Coherence Job API.
+      displayName: CoherenceJob
+      kind: CoherenceJob
+      name: coherencejob.coherence.oracle.com
       version: v1
   description: |
-    The Coherence Operator implements features to assist with deploying and
-    managing Coherence clusters in a Kubernetes environment.
+    The Oracle Coherence Kubernetes Operator enables easy management of Coherence clusters in a Kubernetes environment.
 
     ### Installation Guide & Configuration
 
     For the complete installation guide and all configuration options please refer to
     [Coherence Operator Documentation](https://oracle.github.io/coherence-operator/docs/latest/#/about/01_overview).
-  displayName: Coherence
+  displayName: Coherence Kubernetes Operator
   icon:
   - base64data: iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAAAXNSR0IArs4c6QAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAIK2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNS40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyIKICAgICAgICAgICAgeG1sbnM6ZXhpZj0iaHR0cDovL25zLmFkb2JlLmNvbS9leGlmLzEuMC8iCiAgICAgICAgICAgIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIKICAgICAgICAgICAgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iCiAgICAgICAgICAgIHhtbG5zOnN0RXZ0PSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VFdmVudCMiCiAgICAgICAgICAgIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIKICAgICAgICAgICAgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIj4KICAgICAgICAgPHRpZmY6UmVzb2x1dGlvblVuaXQ+MjwvdGlmZjpSZXNvbHV0aW9uVW5pdD4KICAgICAgICAgPHRpZmY6T3JpZW50YXRpb24+MTwvdGlmZjpPcmllbnRhdGlvbj4KICAgICAgICAgPGV4aWY6UGl4ZWxYRGltZW5zaW9uPjYwMDwvZXhpZjpQaXhlbFhEaW1lbnNpb24+CiAgICAgICAgIDxleGlmOkNvbG9yU3BhY2U+NjU1MzU8L2V4aWY6Q29sb3JTcGFjZT4KICAgICAgICAgPGV4aWY6UGl4ZWxZRGltZW5zaW9uPjExMjwvZXhpZjpQaXhlbFlEaW1lbnNpb24+CiAgICAgICAgIDxkYzpmb3JtYXQ+aW1hZ2UvcG5nPC9kYzpmb3JtYXQ+CiAgICAgICAgIDx4bXBNTTpPcmlnaW5hbERvY3VtZW50SUQ+eG1wLmRpZDpkNDMwYzI2Yi05YTNhLTQzN2ItYWZlMy02NWRjYjgyZTY1NTc8L3htcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD4KICAgICAgICAgPHhtcE1NOkhpc3Rvcnk+CiAgICAgICAgICAgIDxyZGY6U2VxPgogICAgICAgICAgICAgICA8cmRmOmxpIHJkZjpwYXJzZVR5cGU9IlJlc291cmNlIj4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OnNvZnR3YXJlQWdlbnQ+QWRvYmUgUGhvdG9zaG9wIENDIDIwMTUgKE1hY2ludG9zaCk8L3N0RXZ0OnNvZnR3YXJlQWdlbnQ+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDp3aGVuPjIwMjAtMDUtMjlUMDc6NTI6MjUtMDQ6MDA8L3N0RXZ0OndoZW4+CiAgICAgICAgICAgICAgICAgIDxzdEV2dDppbnN0YW5jZUlEPnhtcC5paWQ6ZDQzMGMyNmItOWEzYS00MzdiLWFmZTMtNjVkY2I4MmU2NTU3PC9zdEV2dDppbnN0YW5jZUlEPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6YWN0aW9uPmNyZWF0ZWQ8L3N0RXZ0OmFjdGlvbj4KICAgICAgICAgICAgICAgPC9yZGY6bGk+CiAgICAgICAgICAgIDwvcmRmOlNlcT4KICAgICAgICAgPC94bXBNTTpIaXN0b3J5PgogICAgICAgICA8eG1wTU06SW5zdGFuY2VJRD54bXAuaWlkOmQ0MzBjMjZiLTlhM2EtNDM3Yi1hZmUzLTY1ZGNiODJlNjU1NzwveG1wTU06SW5zdGFuY2VJRD4KICAgICAgICAgPHhtcE1NOkRvY3VtZW50SUQ+eG1wLmRpZDpkNDMwYzI2Yi05YTNhLTQzN2ItYWZlMy02NWRjYjgyZTY1NTc8L3htcE1NOkRvY3VtZW50SUQ+CiAgICAgICAgIDx4bXA6Q3JlYXRlRGF0ZT4yMDIwLTA1LTI5VDA3OjUyOjI1LTA0OjAwPC94bXA6Q3JlYXRlRGF0ZT4KICAgICAgICAgPHhtcDpNZXRhZGF0YURhdGU+MjAyMC0wNi0wM1QwNDoyNzoyMC0wNDowMDwveG1wOk1ldGFkYXRhRGF0ZT4KICAgICAgICAgPHhtcDpNb2RpZnlEYXRlPjIwMjAtMDYtMDNUMDQ6Mjc6MjAtMDQ6MDA8L3htcDpNb2RpZnlEYXRlPgogICAgICAgICA8eG1wOkNyZWF0b3JUb29sPkFkb2JlIFBob3Rvc2hvcCBDQyAyMDE1IChNYWNpbnRvc2gpPC94bXA6Q3JlYXRvclRvb2w+CiAgICAgICAgIDxwaG90b3Nob3A6Q29sb3JNb2RlPjM8L3Bob3Rvc2hvcDpDb2xvck1vZGU+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgoVhnKPAAAMyklEQVR4Ae1dW3LbOBa9kGRXzVerVzDyCsb5nYo78graWcHYK0i8AscrsHsFdlZg9wrMHqXmN95BNDvQfPVUJAp9DkjYlE2RIAmCTJVUZfMB4AK4h7gvAKTI7rfjwI4DOw7sOLDjQD0OqHrFui/1p0wnw0F8obScoDXjpEX6UWv1277MbrtvYb0W/HCAaJmOV7L+KEp/QJdTIF52Xj+KlvM9+RK9TOn79Q8FyEqOTtZKrtDoiSNj71d6eP43ieaO+TvP9kMA8l3+eajU8ArcmtbimFaXIxlcK4kWtcoHLNRrQCieloP4CnritClPtMgcYuyy7/qlt4B8l6OPSskFgNiiJ2pDFInWl33VL70DZClvp1qpGzRsUpvlDgW1ktt4Pbzsm37pDSA0Y0cqvgEvpw789JVlITCT9+Tfn3wRbEqnc0CMGQt/AvL9Y9PO1C1P/TKAmTyS2X1dGr7KdQoI9MQp9AStJ996oi5/Iq3j8335z2NdAk3LdQII9YQYINRh0w6wPPUBLLEJTqf4a/5Tcj2CfunCTA4KSKonOCJOmnPNUIjg+J1Zxex5xC10YiZfe2qrE5kggLiFO5zaazIVyfxMXTSZG/9Yl9L6LJSZ3DogfGohni5Q0aQxd0ScraK2R6OHvuSSaA2QRE8oPqXT3Jor3qSe2FsPz6vKde9+TcthGO+A+Ax3pJh58aw9e/7UL7DG/If5vQKylF8+FYfF3YcFZbfv2JN/n8d/mN8bIN/V0TcQm7izvCBny2KhcfT4ZdPRXl/e/uAl7brXnsDg/MUBO1dVV1RpNx2/PT07hu/y3ozEKoXz8ir9Lu92nXveAKlT+XMZDn19DCa9tz7Fc1p7ZwyV7OvZATzLS9SyaK8md8pdA0LleLanv7wJZefnsYYjEiPzDS25vPSQ97oDhOEJiKc2LJU6DOTI3F/PzjhSUT6qQ8NHmS4AYbjjYG89q+xT+OhwGQ2OVOoXjlzkDS7GggGSmLFGTxyH1BNlAGxL58jlCE71y7Zs3u+HAIThjksqzy71RB3O0dJL9csByt/XoVG1TKuAUEnyKfNlo1ftnK/8HNG0AKlfvJjJBQ1rCxBO9LyhkmzTnyjoVytJHOEc6QyboIJW9ItXQPj0JGbs7LjLWbdW0MgQhX4xFqLAUszc7tcp41iMFfWrVe23hmEYE8Nrv6pdDTsO7DgAKdjgZ2blZDVp05xNpmRXhyKDqQz0TwjJ45w/DfGYu0higcRHk0Nh+nWt/qtFz/dkeN+2gcHF4E2XEtUCZGNewWPomUwkyEOJwXx5B+ZP0cAJ73v4IW4Wt2psLNXRAwybSZM1XqOqHeUc+UrFV2AWnlA/vxSEE6X0v0TiQ0MVPfP8G2MF/QPa/bNnuhvk+ADB/7pbyhFN/8prvJwBeV5LZUXGRjtqXRggzC6o+DQhUGvAVql7zH5YEcuRvpSYi/V+BRFEFDSWlX6JqhAsyDvFA/AVE3eV1gKU+iFkGobinSj1sEVmF7QpP8kwYnB0hbW83zBJdJqfq/27K7V6SFdOTlHbCftoVsl4rJr9g0T5xjl9F7KFgJAImPbVNNaFmkMeY7eTZkdreVcymrOZVMC5D1iyBcKhJ5WyQFzKFae52f+ikoWApEN5XESgShqfPspxj4q6SvXgv1zbSLPOt9CQRSbViLrnJm0lIzwI23/OOmQ7CbeUVAfduOUuzgV9P0fn5qJg3q7V//Jy64H+O8TFxKYhpPMZcahbe60EO3btReZI2pnL4KdBADFmsorv6vTOMAgOhKzlD1hgjxsxsjyO2krW9iT/SH8BD8njK7GF9bz5JcLcDQKIsWQqbDkwIGj5LYYzZ0RMEeMb8GmkR8fpFut3IGOsrP3UyrKmOO+HcCptN4IAkvgXEDIlPwJBp2ov0MaZ1HP/BANj45eIVzOijf5cSXz1p56+sfpnI7Pni0Kl7q+u3BDHBnmCsYeVH01DDxtE61683kQ05lsj6pKrUi4QIOVNUlp9bjvWVN4Km+P1A5Q1EGyuNo6hAFmUNZ5WUVmegOn3r+rSCkZF+79QgERlXaFH69tLLqtzWzpiUJcUoZn0iG+CyFy3dhoGEMSIXHoAR/Smq9m3JUI5CBFpRmzZ1mSJKRY1YG2AWQcc6LUcQQAxATvX+WelL5bq7Vdj6big6CGPiTM9h3IYFOQ+SGG7N/weD3WVkQgCiOkcVipyWVBZg5J0KFUG+gZHN/QH3Mq450qivHhjRLoGQIky5m2GwjRzHvQ0GCDsFZcFuYMCHxp6hRFhihFfIyaJGqweCDijvQko62iD666jeaOQn4uggLDJdkHzC6VZ1pupGTEmWnr00T7ZZYWy6YyycrSthNPB1qxVh7w2IpWLrDH7iZjXOdcdZ8uGPA8OCDtnZHOy4OwMc+OPrh2Grz9hGNvML0CclYWySZf6gQBysmio4oeRjFCfrVM/JtdJm7jCkmuuXNvTRr5OALEd4YJm7g2hJZOKsoVNKzmOKc7IZIqzPHOZIo5/BJCxNNC7x7lZ6MAYFmYHj3nsjzOa9DhILKuEuWIsmbWc4Uk+B/NOEPv68CxWykpjIYSSKUDBCzHV55UMbhlz4iueaLou9dtjEzDUWGUIOclfCkJkLnr2r9MR8pIXZFTdUUNxBivggkYArTOFty+QvtEPLyvq8XWvAMnyiaOGBgBXz0PRkrlRNr3onOJMYEXRn6E4q2MEFNFvM623gNhOP4+a2TF3XkHeXLtbaOoQ4uyGRgA98TZ8GttOX8feA8Knm8qZR1pJsta/UzdgFLwHE+4dGTGG/uCCDa8+jWPdlbL1HhBjIVH8wFIiEFYncN6Em2gg0n6m7/Bsypb2f5qIM1pnxStASim1kKG3gJglM3AEMX16S4fNHHMYkIq0a2s+U6Qhm4v5DOtsmGsy51QT7FbvALEhEuMzpH4DHbbUVC1kDA0BetkYORw1LoYAHEZxcjALK/aY2CtAkpfXUDxhuScZ2yCEkZjPM+MAgl9REc8wUi6K0kOm9cIxtB3WsrpXGsEMGT7ae02PSZxKIjPylOJSpHEOzZOce53c6hUg6dyDNzCyHCUwWk8PGOGFr36YTevTea9EFgOBnLXLi035YJrRQ3rwuw9abdHoFSDo5IJ/WOY5pxNnFbyvzhugk++ObJCsMkezUbCFi56JrBlMXLk1oQ44cRAt4+/6iK/SuyY4DJW7WFuWTwTVYTfWgu+At2W6PvYKkG3MoCiDf8Ew+hx64A0/YcG8fCnm/6GkR7I+fSqr9D9wPkZ4ZaIknpj7uMj/8RNJa7z3dzbPTw9/tzkgav0rQtyR9aB9dIGjgEs3R9hQytB5shIFGwjAaM7wIcx+ynpw/nm0xXJC3q0/4DNnqB7W3HWVEbeVIBLMQyPNd5c1B4QWi5KHqlu3ijrHtHQd7ZznXBO11DH0SxzFsr+AGDL3Y2y+GUk8Zp7yH2YJlYoUVtH7XDtMUerz8xoeAElYwZA3oqonS/2L988/pE/x9RPTtRzY85U+wnsT881YboemgfA0ereKLkvN/Uj9hGAlRedJ0Wh0p5jkLKQFE5SO1ElVohQJTbYGV60vZH4aHOkWhota9WLq+OkBySFQaPYiHlTLZgfKE5iSd5zv/hHmIHL4knuLZvOS+yMxM5mbofzmwi6q2Ja1cISwEGfdGnu2iMB29fmHbR2vcp9hesS7KJ6mVcq9yuvwkoVSQMycgRre8al/VUG1G3wD6SV9imrFustN8eTtK3FKbs2atJLulALC8kZuevssEd/R2/+vcNKMRWieosnRitvKaWyVc//OlRMgtqrUsrjB9dTea3Ds5Vc4fZqxDMlU/RJcJUAs82t8AtUWfX2EXO3DVzizZuzrRla9U18K1ALENi+ZUCr6SLDNWXzU3ByT6Jfb4pz+UzNm7AdQbyyeOL/PybG6LW0ECCv1qfhALsISz8siO71uR/PK9XGkNwbEdtSbaQiClL11vqZj21J29NlW1LXxYbKyusvSvQFiK6LzhNjWBQhP7L2ax0rWiUsdPq1FilkuV/U9mr0DQsb4lMvsuI8wjE8ztk1/qhVA7NPq13IRzIlXf0ObmXXEXErjaAM7FSDi0CogFpgumNKHh8H2v8oxCCC2QdQv8H4ZE/JhXuaGYfooLm3/XY5BAWGDMgy7cGlgUR7ql1gPnz5/4dHL9m5QFPUjm1YYfs9m9HXOyabMJyCi+nT1I62c7Bt6zCIITM3Wp5mY3Pz8UVdfdAg+Ql4yq8ZTzahxoTdcU39EIZ3Sl3yw150DYhviZJZWtHJcjAmKva7CNrbv2WNvAGGjqF+2zD808oa3GhM9CWxmAenlOUMbZrsz9oeYp9xDKxOwn14wc0ex5oHsjsSOAzsO7Diw48COA73hwF/JV5eOHd1hjQAAAABJRU5ErkJggg==
     mediatype: image/png
@@ -55,14 +57,13 @@ spec:
   keywords:
   - coherence
   links:
-  - name: Coherence Operator
+  - name: Coherence Kubernetes Operator
     url: https://oracle.github.io/coherence-operator/docs/latest
+  - name: Oracle Coherence
+    url: https://coherence.community
   maturity: alpha
-  minKubeVersion: "1.18"
-  maintainers:
-    - name: Jonathan Knight
-      email: jonathan.knight@oracle.com
+  minKubeVersion: 1.26.0
   provider:
-    name: Oracle
-    url: https://oracle.github.io/coherence-operator/docs/latest
+    name: Oracle Corporation
+    url: https://github.com/oracle/coherence-operator
   version: 3.4.3

config/samples/coherence.oracle.com_v1_coherence.yaml

@@ -3,4 +3,4 @@ kind: Coherence
 metadata:
   name: coherence-sample
 spec:
-  replicas: 1
+  replicas: 3

hack/coherence-certification.sh

@@ -12,7 +12,7 @@
 #   by the test suite to install the operator.
 #
 # * The Operator image and its test images wil be pushed to an image registry.
-#   The registry to use should be set using the RELEASE_IMAGE_PREFIX environment
+#   The registry to use should be set using the OPERATOR_IMAGE_REGISTRY environment
 #   variable. If the registry requires credentials to push to then the
 #   docker login command should already have been executed before this script.
 #

hack/ensure-sdk.sh

@@ -1,9 +1,11 @@
 #!/bin/sh
 
-REQUIRED_VERSION=$1
+REQUIRED_VERSION="$(curl -s https://api.github.com/repos/operator-framework/operator-sdk/releases/latest | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')"
 OPERATOR_SDK_HOME=$2
 
 UNAME_S=$(uname -s)
+UNAME_M=$(uname -m)
+
 OPERATOR_SDK=${OPERATOR_SDK_HOME}/operator-sdk
 OK=0
 
@@ -25,12 +27,20 @@ if [ ${OK} != 0 ]; then
   echo "Operator SDK not found or not correct version"
 
   if [ "${UNAME_S}" = "Darwin" ]; then
-    URL="https://github.com/operator-framework/operator-sdk/releases/download/${REQUIRED_VERSION}/operator-sdk_darwin_amd64"
+    if [ "${UNAME_S}" = "x86_64" ]; then
+      URL="https://github.com/operator-framework/operator-sdk/releases/download/${REQUIRED_VERSION}/operator-sdk_darwin_amd64"
+    else
+      URL="https://github.com/operator-framework/operator-sdk/releases/download/${REQUIRED_VERSION}/operator-sdk_darwin_arm64"
+    fi
   else
-    URL="https://github.com/operator-framework/operator-sdk/releases/download/${REQUIRED_VERSION}/operator-sdk-linux-amd64"
+    if [ "${UNAME_S}" = "x86_64" ]; then
+      URL="https://github.com/operator-framework/operator-sdk/releases/download/${REQUIRED_VERSION}/operator-sdk-linux-amd64"
+    else
+      URL="https://github.com/operator-framework/operator-sdk/releases/download/${REQUIRED_VERSION}/operator-sdk-linux-arm64"
+    fi
   fi
 
-  echo "Downloading Operator SDK ${UNAME_S} version from ${URL}"
+  echo "Downloading Operator SDK ${UNAME_S}/${UNAME_M} version ${REQUIRED_VERSION} from ${URL}"
   curl -L ${URL} -o ${OPERATOR_SDK}
   chmod +x ${OPERATOR_SDK}
 fi

hack/k8s-certification.sh

@@ -12,7 +12,7 @@
 #   by the test suite to install the operator.
 #
 # * The Operator image and its test images wil be pushed to an image registry.
-#   The registry to use should be set using the RELEASE_IMAGE_PREFIX environment
+#   The registry to use should be set using the OPERATOR_IMAGE_REGISTRY environment
 #   variable. If the registry requires credentials to push to then the
 #   docker login command should already have been executed before this script.
 #

hack/preflight.yaml

@@ -0,0 +1,64 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: preflight
+data:
+  registry-config.json: |
+    {
+      "auths": {
+        "default-route-openshift-image-registry.apps-crc.testing": {
+          "auth": "registry-credential-placeholder"
+        }
+      }
+    }
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: preflight
+spec:
+  template:
+    spec:
+      imagePullSecrets:
+        - name: default-dockercfg-l28bp
+      containers:
+        - name: preflight
+          image: "quay.io/opdev/preflight:stable"
+          command:
+            - preflight
+            - check
+            - container
+            - --insecure
+            - image-placeholder
+          env:
+            - name: PFLT_LOGLEVEL
+              value: trace
+            - name: PFLT_LOGFILE
+              value: "/artifacts/preflight.log"
+            - name: PFLT_ARTIFACTS
+              value: "/artifacts"
+            - name: PFLT_DOCKERCONFIG
+              value: /registry-creds/registry-config.json
+            - name: PFLT_CHANNEL
+              value: "beta"
+          volumeMounts:
+            - name: "outputdir"
+              mountPath: "/artifacts"
+            - name: registry-config
+              mountPath: /registry-creds
+#            - name: "kubeconfig"
+#              mountPath: "/creds"
+      restartPolicy: Never
+      volumes:
+        - name: "outputdir"
+          emptyDir:
+            medium: ""
+        - name: registry-config
+          configMap:
+            name: preflight
+            optional: false
+#        - name: kubeconfig
+#          secret:
+#            secretName: test-cluster-kubeconfig
+#            optional: false
+  backoffLimit: 2

hack/setup-podman.sh

@@ -0,0 +1,21 @@
+#
+# Copyright (c) 2020, 2025, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at
+# http://oss.oracle.com/licenses/upl.
+#
+
+#!/usr/bin/env bash
+
+# --------------------------------------------------------------------
+# This script exports various environment variables so that
+# Make targets will be executed using Podman and OpenShift.
+# --------------------------------------------------------------------
+
+export DOCKER_CMD=podman
+export PUSH_ARGS=--tls-verify=false
+export REGISTRY=$(oc get route/default-route -n openshift-image-registry -o=jsonpath='{.spec.host}')
+export OPERATOR_IMAGE_REGISTRY=${REGISTRY}/oracle
+export PREFLIGHT_REGISTRY_CRED=$(echo -n bogus:$(oc whoami -t) | base64)
+
+podman login -u bogus -p $(oc whoami -t) --tls-verify=false ${REGISTRY}
+

helm-charts/coherence-operator/Chart.yaml

@@ -4,10 +4,11 @@
 
 name: coherence-operator
 description: A Kubernetes Operator for Coherence
-apiVersion: v1
+apiVersion: v2
 version: ${VERSION}
 appVersion: ${VERSION}
 home: https://github.com/oracle/coherence-operator
 sources:
 - https://github.com/oracle/coherence-operator
 icon: "https://docs.oracle.com/en/dcommon/img/oracle-doc-logo.png"
+kubeVersion: ">=1.26"