Merge branch 'release/2.2.1'

LEDfan · LEDfan · commit c68c41ed045a · 2025-07-31T10:40:59.000+02:00
diff --git a/docs/deployment/bases/clustered/resources/shinyproxy-operator.deployment.yaml b/docs/deployment/bases/clustered/resources/shinyproxy-operator.deployment.yaml
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
         - name: shinyproxy-operator
-          image: openanalytics/shinyproxy-operator:2.2.0
+          image: openanalytics/shinyproxy-operator:2.2.1
           imagePullPolicy: Always
           env:
             - name: SPO_MODE
diff --git a/docs/deployment/bases/namespaced/resources/shinyproxy-operator.deployment.yaml b/docs/deployment/bases/namespaced/resources/shinyproxy-operator.deployment.yaml
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
         - name: shinyproxy-operator
-          image: openanalytics/shinyproxy-operator:2.2.0
+          image: openanalytics/shinyproxy-operator:2.2.1
           imagePullPolicy: Always
           env:
             - name: SPO_MODE
diff --git a/docs/deployment/overlays/1-namespaced/kustomization.yaml b/docs/deployment/overlays/1-namespaced/kustomization.yaml
@@ -3,9 +3,9 @@ kind: Kustomization
 namespace: shinyproxy
 
 resources:
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/redis-sentinel?ref=v2.2.0
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/namespaced?ref=v2.2.0
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/shinyproxy?ref=v2.2.0
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/redis-sentinel?ref=v2.2.1
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/namespaced?ref=v2.2.1
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/shinyproxy?ref=v2.2.1
   - resources/shinyproxy.namespace.yaml
   - resources/shinyproxy.shinyproxy.yaml
 
diff --git a/docs/deployment/overlays/2-clustered/redis/kustomization.yaml b/docs/deployment/overlays/2-clustered/redis/kustomization.yaml
@@ -3,7 +3,7 @@ kind: Kustomization
 namespace: redis
 
 resources:
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/redis-sentinel?ref=v2.2.0
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/redis-sentinel?ref=v2.2.1
   - resources/redis.namespace.yaml
 
 patches:
diff --git a/docs/deployment/overlays/2-clustered/shinyproxy-dept2/kustomization.yaml b/docs/deployment/overlays/2-clustered/shinyproxy-dept2/kustomization.yaml
@@ -3,7 +3,7 @@ kind: Kustomization
 namespace: shinyproxy-dept2
 
 resources:
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/shinyproxy?ref=v2.2.0
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/shinyproxy?ref=v2.2.1
   - resources/redis.secret.yaml
   - resources/shinyproxy.shinyproxy.yaml
   - resources/shinyproxy.namespace.yaml
diff --git a/docs/deployment/overlays/2-clustered/shinyproxy-operator/kustomization.yaml b/docs/deployment/overlays/2-clustered/shinyproxy-operator/kustomization.yaml
@@ -3,5 +3,5 @@ kind: Kustomization
 namespace: shinyproxy-operator
 
 resources:
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/clustered?ref=v2.2.0
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/clustered?ref=v2.2.1
   - resources/shinyproxy-operator.namespace.yaml
diff --git a/docs/deployment/overlays/2-clustered/shinyproxy/kustomization.yaml b/docs/deployment/overlays/2-clustered/shinyproxy/kustomization.yaml
@@ -3,7 +3,7 @@ kind: Kustomization
 namespace: shinyproxy
 
 resources:
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/shinyproxy?ref=v2.2.0
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/shinyproxy?ref=v2.2.1
   - resources/redis.secret.yaml
   - resources/shinyproxy.shinyproxy.yaml
   - resources/shinyproxy.namespace.yaml
diff --git a/docs/deployment/overlays/3-namespaced-app-ns/shinyproxy/kustomization.yaml b/docs/deployment/overlays/3-namespaced-app-ns/shinyproxy/kustomization.yaml
@@ -3,9 +3,9 @@ kind: Kustomization
 namespace: shinyproxy
 
 resources:
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/redis-sentinel?ref=v2.2.0
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/namespaced?ref=v2.2.0
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/shinyproxy?ref=v2.2.0
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/redis-sentinel?ref=v2.2.1
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/namespaced?ref=v2.2.1
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/shinyproxy?ref=v2.2.1
   - resources/shinyproxy.namespace.yaml
   - resources/shinyproxy.shinyproxy.yaml
 
diff --git a/docs/deployment/overlays/4-namespaced-multi/kustomization.yaml b/docs/deployment/overlays/4-namespaced-multi/kustomization.yaml
@@ -3,9 +3,9 @@ kind: Kustomization
 namespace: shinyproxy
 
 resources:
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/redis-sentinel?ref=v2.2.0
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/namespaced?ref=v2.2.0
-  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/shinyproxy?ref=v2.2.0
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/redis-sentinel?ref=v2.2.1
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/namespaced?ref=v2.2.1
+  - github.com/openanalytics/shinyproxy-operator/docs/deployment/bases/shinyproxy?ref=v2.2.1
   - resources/shinyproxy.namespace.yaml
   - resources/shinyproxy1.shinyproxy.yaml
   - resources/shinyproxy2.shinyproxy.yaml
diff --git a/kubernetesPod.yaml b/kubernetesPod.yaml
@@ -4,6 +4,7 @@ metadata:
   labels:
     ci: shinyproxy-operator-build
 spec:
+  hostUsers: false
   volumes:
     - name: docker-socket
       emptyDir: { }
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>eu.openanalytics</groupId>
     <artifactId>shinyproxy-operator</artifactId>
-    <version>2.2.0</version>
+    <version>2.2.1</version>
     <inceptionYear>2021</inceptionYear>
     <name>ShinyProxy-Operator</name>
 
@@ -262,9 +262,9 @@
                                     <Multi-Release>true</Multi-Release>
                                 </manifestEntries>
                             </archive>
-                            <descriptorRefs>
-                                <descriptorRef>jar-with-dependencies</descriptorRef>
-                            </descriptorRefs>
+                            <descriptors>
+                                <descriptor>src/main/assembly/jar-with-dependencies.xml</descriptor>
+                            </descriptors>
                             <finalName>shinyproxy-operator</finalName>
                         </configuration>
                     </execution>
diff --git a/src/main/assembly/jar-with-dependencies.xml b/src/main/assembly/jar-with-dependencies.xml
@@ -0,0 +1,24 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 https://maven.apache.org/xsd/assembly-2.2.0.xsd">
+    <!-- based on https://maven.apache.org/plugins/maven-assembly-plugin/descriptor-refs.html#jar-with-dependencies  -->
+    <!-- https://stackoverflow.com/questions/47310215/merging-meta-inf-services-files-with-maven-assembly-plugin/49689041 -->
+    <id>jar-with-dependencies</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <useProjectArtifact>true</useProjectArtifact>
+            <unpack>true</unpack>
+            <scope>runtime</scope>
+        </dependencySet>
+    </dependencySets>
+    <containerDescriptorHandlers>
+        <containerDescriptorHandler>
+            <handlerName>metaInf-services</handlerName>
+        </containerDescriptorHandler>
+    </containerDescriptorHandlers>
+</assembly>
