Merge branch 'master' into master

portainer · Sep 22, 2024 · ba92f20 · ba92f20
2 parents a6b0bcd + c3a4bb1
commit ba92f20
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 36 deletions.
diff --git a/charts/portainer/Chart.yaml b/charts/portainer/Chart.yaml
@@ -17,11 +17,11 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 
-version: 1.0.51
+version: 1.0.53
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: ce-latest-ee-2.19.5
+appVersion: ce-latest-ee-2.21.1
 
 sources:
     - https://github.com/portainer/k8s

diff --git a/charts/portainer/templates/namespace.yaml b/charts/portainer/templates/namespace.yaml
@@ -3,4 +3,6 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: portainer
+  labels:
+    pod-security.kubernetes.io/enforce: privileged
 {{ end }}
diff --git a/charts/portainer/values.yaml b/charts/portainer/values.yaml
@@ -9,12 +9,12 @@ enterpriseEdition:
   enabled: false
   image:
     repository: portainer/portainer-ee
-    tag: 2.19.5
+    tag: 2.21.1
     pullPolicy: Always
 
 image:
   repository: portainer/portainer-ce
-  tag: 2.19.5
+  tag: 2.21.1
   pullPolicy: Always
 
 imagePullSecrets: []

diff --git a/deploy/manifests/agent/ee/agent-stack-windows.yml b/deploy/manifests/agent/ee/agent-stack-windows.yml
@@ -1,7 +1,7 @@
 version: '3.3'
 services:
   agent:
-    image: portainer/agent:2.19.5
+    image: portainer/agent:2.21.1
     ports:
       - target: 9001
         published: 9001

diff --git a/deploy/manifests/agent/ee/agent-stack.yml b/deploy/manifests/agent/ee/agent-stack.yml
@@ -2,7 +2,7 @@ version: '3.2'
 
 services:
   agent:
-    image: portainer/agent:2.19.5
+    image: portainer/agent:2.21.1
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - /var/lib/docker/volumes:/var/lib/docker/volumes

diff --git a/deploy/manifests/agent/ee/portainer-agent-edge-k8s.yaml b/deploy/manifests/agent/ee/portainer-agent-edge-k8s.yaml
@@ -65,7 +65,7 @@ spec:
       serviceAccountName: portainer-sa-clusteradmin
       containers:
       - name: portainer-agent
-        image: portainer/agent:2.19.5
+        image: portainer/agent:2.21.1
         imagePullPolicy: Always
         env:
         - name: LOG_LEVEL

diff --git a/deploy/manifests/agent/ee/portainer-agent-k8s-lb.yaml b/deploy/manifests/agent/ee/portainer-agent-k8s-lb.yaml
@@ -64,7 +64,7 @@ spec:
       serviceAccountName: portainer-sa-clusteradmin
       containers:
       - name: portainer-agent
-        image: portainer/agent:2.19.5
+        image: portainer/agent:2.21.1
         imagePullPolicy: Always
         env:
         - name: LOG_LEVEL

diff --git a/deploy/manifests/agent/ee/portainer-agent-k8s-nodeport.yaml b/deploy/manifests/agent/ee/portainer-agent-k8s-nodeport.yaml
@@ -65,7 +65,7 @@ spec:
       serviceAccountName: portainer-sa-clusteradmin
       containers:
       - name: portainer-agent
-        image: portainer/agent:2.19.5
+        image: portainer/agent:2.21.1
         imagePullPolicy: Always
         env:
         - name: LOG_LEVEL

diff --git a/deploy/manifests/agent/portainer-agent-edge-k8s.yaml b/deploy/manifests/agent/portainer-agent-edge-k8s.yaml
@@ -65,7 +65,7 @@ spec:
       serviceAccountName: portainer-sa-clusteradmin
       containers:
       - name: portainer-agent
-        image: portainer/agent:2.19.5
+        image: portainer/agent:2.21.1
         imagePullPolicy: Always
         env:
         - name: LOG_LEVEL

diff --git a/deploy/manifests/agent/portainer-agent-k8s-lb.yaml b/deploy/manifests/agent/portainer-agent-k8s-lb.yaml
@@ -64,7 +64,7 @@ spec:
       serviceAccountName: portainer-sa-clusteradmin
       containers:
       - name: portainer-agent
-        image: portainer/agent:2.19.5
+        image: portainer/agent:2.21.1
         imagePullPolicy: Always
         env:
         - name: LOG_LEVEL

diff --git a/deploy/manifests/agent/portainer-agent-k8s-nodeport.yaml b/deploy/manifests/agent/portainer-agent-k8s-nodeport.yaml
@@ -65,7 +65,7 @@ spec:
       serviceAccountName: portainer-sa-clusteradmin
       containers:
       - name: portainer-agent
-        image: portainer/agent:2.19.5
+        image: portainer/agent:2.21.1
         imagePullPolicy: Always
         env:
         - name: LOG_LEVEL

diff --git a/deploy/manifests/portainer/portainer-ee.yaml b/deploy/manifests/portainer/portainer-ee.yaml
@@ -14,7 +14,7 @@ metadata:
   labels:
     app.kubernetes.io/name: portainer
     app.kubernetes.io/instance: portainer
-    app.kubernetes.io/version: "ce-latest-ee-2.19.5"
+    app.kubernetes.io/version: "ce-latest-ee-2.21.1"
 ---
 # Source: portainer/templates/pvc.yaml
 kind: "PersistentVolumeClaim"
@@ -28,7 +28,7 @@ metadata:
     io.portainer.kubernetes.application.stack: portainer
     app.kubernetes.io/name: portainer
     app.kubernetes.io/instance: portainer
-    app.kubernetes.io/version: "ce-latest-ee-2.19.5"
+    app.kubernetes.io/version: "ce-latest-ee-2.21.1"
 spec:
   accessModes:
     - "ReadWriteOnce"
@@ -44,7 +44,7 @@ metadata:
   labels:
     app.kubernetes.io/name: portainer
     app.kubernetes.io/instance: portainer
-    app.kubernetes.io/version: "ce-latest-ee-2.19.5"
+    app.kubernetes.io/version: "ce-latest-ee-2.21.1"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -64,7 +64,7 @@ metadata:
     io.portainer.kubernetes.application.stack: portainer
     app.kubernetes.io/name: portainer
     app.kubernetes.io/instance: portainer
-    app.kubernetes.io/version: "ce-latest-ee-2.19.5"
+    app.kubernetes.io/version: "ce-latest-ee-2.21.1"
 spec:
   type: NodePort
   ports:
@@ -97,7 +97,7 @@ metadata:
     io.portainer.kubernetes.application.stack: portainer
     app.kubernetes.io/name: portainer
     app.kubernetes.io/instance: portainer
-    app.kubernetes.io/version: "ce-latest-ee-2.19.5"
+    app.kubernetes.io/version: "ce-latest-ee-2.21.1"
 spec:
   replicas: 1
   strategy:
@@ -121,7 +121,7 @@ spec:
             claimName: portainer
       containers:
         - name: portainer
-          image: "portainer/portainer-ee:2.19.5"
+          image: "portainer/portainer-ee:2.21.1"
           imagePullPolicy: Always
           args:
             - '--tunnel-port=30776'

diff --git a/deploy/manifests/portainer/portainer-lb-ee.yaml b/deploy/manifests/portainer/portainer-lb-ee.yaml
@@ -14,7 +14,7 @@ metadata:
   labels:
     app.kubernetes.io/name: portainer
     app.kubernetes.io/instance: portainer
-    app.kubernetes.io/version: "ce-latest-ee-2.19.5"
+    app.kubernetes.io/version: "ce-latest-ee-2.21.1"
 ---
 # Source: portainer/templates/pvc.yaml
 kind: "PersistentVolumeClaim"
@@ -28,7 +28,7 @@ metadata:
     io.portainer.kubernetes.application.stack: portainer
     app.kubernetes.io/name: portainer
     app.kubernetes.io/instance: portainer
-    app.kubernetes.io/version: "ce-latest-ee-2.19.5"
+    app.kubernetes.io/version: "ce-latest-ee-2.21.1"
 spec:
   accessModes:
     - "ReadWriteOnce"
@@ -44,7 +44,7 @@ metadata:
   labels:
     app.kubernetes.io/name: portainer
     app.kubernetes.io/instance: portainer
-    app.kubernetes.io/version: "ce-latest-ee-2.19.5"
+    app.kubernetes.io/version: "ce-latest-ee-2.21.1"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -64,7 +64,7 @@ metadata:
     io.portainer.kubernetes.application.stack: portainer
     app.kubernetes.io/name: portainer
     app.kubernetes.io/instance: portainer
-    app.kubernetes.io/version: "ce-latest-ee-2.19.5"
+    app.kubernetes.io/version: "ce-latest-ee-2.21.1"
 spec:
   type: LoadBalancer
   ports:
@@ -94,7 +94,7 @@ metadata:
     io.portainer.kubernetes.application.stack: portainer
     app.kubernetes.io/name: portainer
     app.kubernetes.io/instance: portainer
-    app.kubernetes.io/version: "ce-latest-ee-2.19.5"
+    app.kubernetes.io/version: "ce-latest-ee-2.21.1"
 spec:
   replicas: 1
   strategy:
@@ -118,7 +118,7 @@ spec:
             claimName: portainer
       containers:
         - name: portainer
-          image: "portainer/portainer-ee:2.19.5"
+          image: "portainer/portainer-ee:2.21.1"
           imagePullPolicy: Always
           args:
           volumeMounts:

diff --git a/deploy/manifests/portainer/portainer-lb.yaml b/deploy/manifests/portainer/portainer-lb.yaml
@@ -14,7 +14,7 @@ metadata:
   labels:
     app.kubernetes.io/name: portainer
     app.kubernetes.io/instance: portainer
-    app.kubernetes.io/version: "ce-latest-ee-2.19.5"
+    app.kubernetes.io/version: "ce-latest-ee-2.21.1"
 ---
 # Source: portainer/templates/pvc.yaml
 kind: "PersistentVolumeClaim"
@@ -28,7 +28,7 @@ metadata:
     io.portainer.kubernetes.application.stack: portainer
     app.kubernetes.io/name: portainer
     app.kubernetes.io/instance: portainer
-    app.kubernetes.io/version: "ce-latest-ee-2.19.5"
+    app.kubernetes.io/version: "ce-latest-ee-2.21.1"
 spec:
   accessModes:
     - "ReadWriteOnce"
@@ -44,7 +44,7 @@ metadata:
   labels:
     app.kubernetes.io/name: portainer
     app.kubernetes.io/instance: portainer
-    app.kubernetes.io/version: "ce-latest-ee-2.19.5"
+    app.kubernetes.io/version: "ce-latest-ee-2.21.1"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -64,7 +64,7 @@ metadata:
     io.portainer.kubernetes.application.stack: portainer
     app.kubernetes.io/name: portainer
     app.kubernetes.io/instance: portainer
-    app.kubernetes.io/version: "ce-latest-ee-2.19.5"
+    app.kubernetes.io/version: "ce-latest-ee-2.21.1"
 spec:
   type: LoadBalancer
   ports:
@@ -94,7 +94,7 @@ metadata:
     io.portainer.kubernetes.application.stack: portainer
     app.kubernetes.io/name: portainer
     app.kubernetes.io/instance: portainer
-    app.kubernetes.io/version: "ce-latest-ee-2.19.5"
+    app.kubernetes.io/version: "ce-latest-ee-2.21.1"
 spec:
   replicas: 1
   strategy:
@@ -118,7 +118,7 @@ spec:
             claimName: portainer
       containers:
         - name: portainer
-          image: "portainer/portainer-ce:2.19.5"
+          image: "portainer/portainer-ce:2.21.1"
           imagePullPolicy: Always
           args:
           volumeMounts:

diff --git a/deploy/manifests/portainer/portainer.yaml b/deploy/manifests/portainer/portainer.yaml
@@ -14,7 +14,7 @@ metadata:
   labels:
     app.kubernetes.io/name: portainer
     app.kubernetes.io/instance: portainer
-    app.kubernetes.io/version: "ce-latest-ee-2.19.5"
+    app.kubernetes.io/version: "ce-latest-ee-2.21.1"
 ---
 # Source: portainer/templates/pvc.yaml
 kind: "PersistentVolumeClaim"
@@ -28,7 +28,7 @@ metadata:
     io.portainer.kubernetes.application.stack: portainer
     app.kubernetes.io/name: portainer
     app.kubernetes.io/instance: portainer
-    app.kubernetes.io/version: "ce-latest-ee-2.19.5"
+    app.kubernetes.io/version: "ce-latest-ee-2.21.1"
 spec:
   accessModes:
     - "ReadWriteOnce"
@@ -44,7 +44,7 @@ metadata:
   labels:
     app.kubernetes.io/name: portainer
     app.kubernetes.io/instance: portainer
-    app.kubernetes.io/version: "ce-latest-ee-2.19.5"
+    app.kubernetes.io/version: "ce-latest-ee-2.21.1"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -64,7 +64,7 @@ metadata:
     io.portainer.kubernetes.application.stack: portainer
     app.kubernetes.io/name: portainer
     app.kubernetes.io/instance: portainer
-    app.kubernetes.io/version: "ce-latest-ee-2.19.5"
+    app.kubernetes.io/version: "ce-latest-ee-2.21.1"
 spec:
   type: NodePort
   ports:
@@ -97,7 +97,7 @@ metadata:
     io.portainer.kubernetes.application.stack: portainer
     app.kubernetes.io/name: portainer
     app.kubernetes.io/instance: portainer
-    app.kubernetes.io/version: "ce-latest-ee-2.19.5"
+    app.kubernetes.io/version: "ce-latest-ee-2.21.1"
 spec:
   replicas: 1
   strategy:
@@ -121,7 +121,7 @@ spec:
             claimName: portainer
       containers:
         - name: portainer
-          image: "portainer/portainer-ce:2.19.5"
+          image: "portainer/portainer-ce:2.21.1"
           imagePullPolicy: Always
           args:
             - '--tunnel-port=30776'