From f96411134a4c64dfa32f789a3e8305f6cb7f9ed6 Mon Sep 17 00:00:00 2001 From: samdulam Date: Thu, 12 May 2022 09:13:22 +0530 Subject: [PATCH] 2.13.1 Update (#112) --- charts/portainer/Chart.yaml | 4 ++-- charts/portainer/templates/NOTES.txt | 6 +++++- charts/portainer/values.yaml | 2 +- deploy/manifests/agent/ee/agent-stack-windows.yml | 2 +- deploy/manifests/agent/ee/agent-stack.yml | 2 +- .../manifests/agent/ee/portainer-agent-edge-k8s.yaml | 2 +- .../manifests/agent/ee/portainer-agent-k8s-lb.yaml | 2 +- .../agent/ee/portainer-agent-k8s-nodeport.yaml | 2 +- deploy/manifests/agent/portainer-agent-edge-k8s.yaml | 2 +- deploy/manifests/agent/portainer-agent-k8s-lb.yaml | 2 +- .../agent/portainer-agent-k8s-nodeport.yaml | 2 +- deploy/manifests/portainer/portainer-ee.yaml | 12 ++++++------ deploy/manifests/portainer/portainer-lb-ee.yaml | 12 ++++++------ deploy/manifests/portainer/portainer-lb.yaml | 10 +++++----- deploy/manifests/portainer/portainer.yaml | 10 +++++----- 15 files changed, 38 insertions(+), 34 deletions(-) diff --git a/charts/portainer/Chart.yaml b/charts/portainer/Chart.yaml index 7862656..ff2ce29 100644 --- 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.29 +version: 1.0.30 # 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.13.0 +appVersion: ce-latest-ee-2.13.1 sources: - https://github.com/portainer/k8s diff --git a/charts/portainer/templates/NOTES.txt b/charts/portainer/templates/NOTES.txt index 604843e..6f113ec 100644 --- a/charts/portainer/templates/NOTES.txt +++ b/charts/portainer/templates/NOTES.txt @@ -7,7 +7,11 @@ {{- end }} {{- else if contains "NodePort" .Values.service.type }} Get the application URL by running these commands: - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[1].nodePort}" services {{ include "portainer.fullname" . }}) + {{- if .Values.tls.force }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "portainer.fullname" . }}) + {{- else }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[1].nodePort}" services {{ include "portainer.fullname" . }}) + {{- end}} export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") echo https://$NODE_IP:$NODE_PORT {{- else if contains "LoadBalancer" .Values.service.type }} diff --git a/charts/portainer/values.yaml b/charts/portainer/values.yaml index 2d8c23a..94d7e68 100644 --- a/charts/portainer/values.yaml +++ b/charts/portainer/values.yaml @@ -9,7 +9,7 @@ enterpriseEdition: enabled: false image: repository: portainer/portainer-ee - tag: 2.13.0 + tag: 2.13.1 pullPolicy: Always image: diff --git a/deploy/manifests/agent/ee/agent-stack-windows.yml b/deploy/manifests/agent/ee/agent-stack-windows.yml index c558675..981d0b2 100644 --- 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.13.0 + image: portainer/agent:2.13.1 ports: - target: 9001 published: 9001 diff --git a/deploy/manifests/agent/ee/agent-stack.yml b/deploy/manifests/agent/ee/agent-stack.yml index 124f10c..e54d2f1 100644 --- 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.13.0 + image: portainer/agent:2.13.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 index e97ed2a..e013bdf 100644 --- 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.13.0 + image: portainer/agent:2.13.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 index 3490959..add7753 100644 --- 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.13.0 + image: portainer/agent:2.13.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 index 8c9becd..81e0517 100644 --- 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.13.0 + image: portainer/agent:2.13.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 index e97ed2a..e013bdf 100644 --- 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.13.0 + image: portainer/agent:2.13.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 index 3490959..add7753 100644 --- 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.13.0 + image: portainer/agent:2.13.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 index 8c9becd..81e0517 100644 --- 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.13.0 + image: portainer/agent:2.13.1 imagePullPolicy: Always env: - name: LOG_LEVEL diff --git a/deploy/manifests/portainer/portainer-ee.yaml b/deploy/manifests/portainer/portainer-ee.yaml index 88c2af4..79c31b5 100644 --- 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.13.0" + app.kubernetes.io/version: "ce-latest-ee-2.13.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.13.0" + app.kubernetes.io/version: "ce-latest-ee-2.13.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.13.0" + app.kubernetes.io/version: "ce-latest-ee-2.13.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.13.0" + app.kubernetes.io/version: "ce-latest-ee-2.13.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.13.0" + app.kubernetes.io/version: "ce-latest-ee-2.13.1" spec: replicas: 1 strategy: @@ -121,7 +121,7 @@ spec: claimName: portainer containers: - name: portainer - image: "portainer/portainer-ee:2.13.0" + image: "portainer/portainer-ee:2.13.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 index 5bf4819..0b945d4 100644 --- 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.13.0" + app.kubernetes.io/version: "ce-latest-ee-2.13.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.13.0" + app.kubernetes.io/version: "ce-latest-ee-2.13.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.13.0" + app.kubernetes.io/version: "ce-latest-ee-2.13.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.13.0" + app.kubernetes.io/version: "ce-latest-ee-2.13.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.13.0" + app.kubernetes.io/version: "ce-latest-ee-2.13.1" spec: replicas: 1 strategy: @@ -118,7 +118,7 @@ spec: claimName: portainer containers: - name: portainer - image: "portainer/portainer-ee:2.13.0" + image: "portainer/portainer-ee:2.13.1" imagePullPolicy: Always args: volumeMounts: diff --git a/deploy/manifests/portainer/portainer-lb.yaml b/deploy/manifests/portainer/portainer-lb.yaml index 75cbf71..01725cf 100644 --- 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.13.0" + app.kubernetes.io/version: "ce-latest-ee-2.13.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.13.0" + app.kubernetes.io/version: "ce-latest-ee-2.13.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.13.0" + app.kubernetes.io/version: "ce-latest-ee-2.13.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.13.0" + app.kubernetes.io/version: "ce-latest-ee-2.13.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.13.0" + app.kubernetes.io/version: "ce-latest-ee-2.13.1" spec: replicas: 1 strategy: diff --git a/deploy/manifests/portainer/portainer.yaml b/deploy/manifests/portainer/portainer.yaml index f67f620..81e2359 100644 --- 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.13.0" + app.kubernetes.io/version: "ce-latest-ee-2.13.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.13.0" + app.kubernetes.io/version: "ce-latest-ee-2.13.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.13.0" + app.kubernetes.io/version: "ce-latest-ee-2.13.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.13.0" + app.kubernetes.io/version: "ce-latest-ee-2.13.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.13.0" + app.kubernetes.io/version: "ce-latest-ee-2.13.1" spec: replicas: 1 strategy: