Python kopf 1.35.4 (#580)

* Python kopf s2i v1.35.4

* Update for python-kopf-s2i with odo 2.5

Author: jkupferer

build-s2i-python-kopf/Dockerfile

@@ -2,8 +2,8 @@ FROM registry.access.redhat.com/ubi8/python-39:latest
 
 MAINTAINER Johnathan Kupferer <[email protected]>
 
-ENV OPENSHIFT_CLIENT_VERSION=4.8.2 \
-    HELM_VERSION=3.6.3
+ENV OPENSHIFT_CLIENT_VERSION=4.10.9 \
+    HELM_VERSION=3.8.2
 
 LABEL io.k8s.description="Python Kopf - Kubernetes Operator Framework" \
       io.k8s.display-name="Kopf Operator" \

build-s2i-python-kopf/examples/kopf-simple/devfile.yaml

@@ -1,42 +1,27 @@
-schemaVersion: 2.0.0
-metadata:
-  name: kopf-simple
-  version: 1.0.0
-components:
-- name: s2i-builder
-  container:
-    env:
-    - name: ODO_S2I_SCRIPTS_URL
-      value: /usr/libexec/s2i
-    - name: ODO_S2I_SCRIPTS_PROTOCOL
-      value: image://
-    - name: ODO_S2I_SRC_BIN_PATH
-      value: /tmp
-    - name: ODO_S2I_DEPLOYMENT_DIR
-      value: ""
-    - name: ODO_S2I_WORKING_DIR
-      value: /opt/app-root/src
-    - name: ODO_S2I_BUILDER_IMG
-      value: quay.io/redhat-cop/python-kopf-s2i:latest
-    - name: ODO_SRC_BACKUP_DIR
-      value: /opt/app-root/src-backup
-    - name: ODO_S2I_CONVERTED_DEVFILE
-      value: "true"
-    image: quay.io/redhat-cop/python-kopf-s2i:latest
-    mountSources: true
-    sourceMapping: /tmp/projects
 commands:
-- id: s2i-assemble
-  exec:
-    commandLine: /opt/odo/bin/s2i-setup && /opt/odo/bin/assemble-and-restart
+- exec:
+    commandLine: /usr/libexec/s2i/assemble
     component: s2i-builder
     group:
       isDefault: true
       kind: build
-- id: s2i-run
-  exec:
-    commandLine: /opt/odo/bin/run
+    workingDir: ${PROJECT_SOURCE}
+  id: s2i-assemble
+- exec:
+    commandLine: /usr/libexec/s2i/run
     component: s2i-builder
     group:
       isDefault: true
       kind: run
+    workingDir: ${PROJECT_SOURCE}
+  id: s2i-run
+components:
+- container:
+    image: quay.io/redhat-cop/python-kopf-s2i
+    mountSources: true
+    sourceMapping: /tmp/projects
+  name: s2i-builder
+metadata:
+  name: kopf-simple
+  version: 1.0.0
+schemaVersion: 2.0.0

build-s2i-python-kopf/examples/openshift-template-deployer/devfile.yaml

@@ -1,42 +1,27 @@
-schemaVersion: 2.0.0
-metadata:
-  name: openshift-template-deployer
-  version: 1.0.0
-components:
-- name: s2i-builder
-  container:
-    env:
-    - name: ODO_S2I_SCRIPTS_URL
-      value: /usr/libexec/s2i
-    - name: ODO_S2I_SCRIPTS_PROTOCOL
-      value: image://
-    - name: ODO_S2I_SRC_BIN_PATH
-      value: /tmp
-    - name: ODO_S2I_DEPLOYMENT_DIR
-      value: ""
-    - name: ODO_S2I_WORKING_DIR
-      value: /opt/app-root/src
-    - name: ODO_S2I_BUILDER_IMG
-      value: quay.io/redhat-cop/python-kopf-s2i:latest
-    - name: ODO_SRC_BACKUP_DIR
-      value: /opt/app-root/src-backup
-    - name: ODO_S2I_CONVERTED_DEVFILE
-      value: "true"
-    image: quay.io/redhat-cop/python-kopf-s2i:latest
-    mountSources: true
-    sourceMapping: /tmp/projects
 commands:
-- id: s2i-assemble
-  exec:
-    commandLine: /opt/odo/bin/s2i-setup && /opt/odo/bin/assemble-and-restart
+- exec:
+    commandLine: /usr/libexec/s2i/assemble
     component: s2i-builder
     group:
       isDefault: true
       kind: build
-- id: s2i-run
-  exec:
-    commandLine: /opt/odo/bin/run
+    workingDir: ${PROJECT_SOURCE}
+  id: s2i-assemble
+- exec:
+    commandLine: /usr/libexec/s2i/run
     component: s2i-builder
     group:
       isDefault: true
       kind: run
+    workingDir: ${PROJECT_SOURCE}
+  id: s2i-run
+components:
+- container:
+    image: quay.io/redhat-cop/python-kopf-s2i
+    mountSources: true
+    sourceMapping: /tmp/projects
+  name: s2i-builder
+metadata:
+  name: openshift-template-deployer
+  version: 1.0.0
+schemaVersion: 2.0.0

build-s2i-python-kopf/install/requirements.txt

@@ -1,4 +1,4 @@
-kopf==1.35.3
-kubernetes==12.0.1
-openshift==0.12.1
-pykube-ng==21.3.0
+kopf==1.35.4
+kubernetes==23.6.0
+openshift==0.13.1
+pykube-ng==22.1.0

build-s2i-python-kopf/s2i/assemble

@@ -10,18 +10,23 @@ shopt -s dotglob
 
 
 mkdir /opt/app-root/src -p
-cp --preserve=mode --recursive /tmp/src/operator /opt/app-root/
-rm -rf /tmp/src/operator
-cp --preserve=mode --recursive /tmp/src/* /opt/app-root/src/
-rm -rf /tmp/src
+if [[ -d /tmp/src ]]; then
+    cp --preserve=mode --recursive /tmp/src/operator /opt/app-root/
+    rm -rf /tmp/src/operator
+    cp --preserve=mode --recursive /tmp/src/* /opt/app-root/src/
+    cd /opt/app-root/src
+    rm -rf /tmp/src
+else
+    cp --preserve=mode --recursive operator /opt/app-root/
+fi
 
 if [[ -s /opt/app-root/src/requirements.txt ]]; then
-    pip3 install --upgrade --cache-dir /tmp/.pip-cache -r /opt/app-root/src/requirements.txt
+    pip3 install --upgrade --cache-dir /tmp/.pip-cache -r requirements.txt
     rm -rf /tmp/.pip-cache
 fi
 
-if [[ -s /opt/app-root/src/kopf-opt.sh ]]; then
-    mv /opt/app-root/src/kopf-opt.sh /opt/app-root/kopf-opt.sh
+if [[ -s kopf-opt.sh ]]; then
+    mv kopf-opt.sh /opt/app-root/kopf-opt.sh
 fi
 
 # Fix up permissions.

build-s2i-python-kopf/version.json

@@ -1 +1 @@
-{"version":"v1.35.3"}
+{"version":"v1.35.4"}