From 645923289eab9eda95aa557c4feee1e94ee86138 Mon Sep 17 00:00:00 2001 From: samdulam Date: Tue, 15 Mar 2022 03:10:10 +0530 Subject: [PATCH 1/3] Rel2.12.0 (#102) * EE 2.12.0 Release Updates * manifest updates * Updates for 2.12.1 --- charts/portainer/Chart.yaml | 5 +++-- charts/portainer/values.yaml | 2 +- deploy/manifests/agent/ee/agent-stack.yml | 2 +- .../manifests/agent/ee/portainer-agent-edge-k8s.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 +++++----- 8 files changed, 28 insertions(+), 27 deletions(-) diff --git a/charts/portainer/Chart.yaml b/charts/portainer/Chart.yaml index 9660acc..6447c5e 100644 --- a/charts/portainer/Chart.yaml +++ b/charts/portainer/Chart.yaml @@ -16,11 +16,12 @@ 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.23 + +version: 1.0.24 # 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.12.0 +appVersion: ce-latest-ee-2.12.1 sources: - https://github.com/portainer/k8s diff --git a/charts/portainer/values.yaml b/charts/portainer/values.yaml index 88e200e..3e5bc2b 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.12.0 + tag: 2.12.1 pullPolicy: Always image: diff --git a/deploy/manifests/agent/ee/agent-stack.yml b/deploy/manifests/agent/ee/agent-stack.yml index bbe15ad..2233470 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.12.0 + image: portainer/agent:2.12.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 29b24d0..3e746d3 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.12.0 + image: portainer/agent:2.12.1 imagePullPolicy: Always env: - name: LOG_LEVEL diff --git a/deploy/manifests/portainer/portainer-ee.yaml b/deploy/manifests/portainer/portainer-ee.yaml index 98b3919..249410e 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.12.0" + app.kubernetes.io/version: "ce-latest-ee-2.12.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.12.0" + app.kubernetes.io/version: "ce-latest-ee-2.12.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.12.0" + app.kubernetes.io/version: "ce-latest-ee-2.12.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.12.0" + app.kubernetes.io/version: "ce-latest-ee-2.12.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.12.0" + app.kubernetes.io/version: "ce-latest-ee-2.12.1" spec: replicas: 1 strategy: @@ -121,7 +121,7 @@ spec: claimName: portainer containers: - name: portainer - image: "portainer/portainer-ee:2.12.0" + image: "portainer/portainer-ee:2.12.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 978e92c..ceabd10 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.12.0" + app.kubernetes.io/version: "ce-latest-ee-2.12.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.12.0" + app.kubernetes.io/version: "ce-latest-ee-2.12.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.12.0" + app.kubernetes.io/version: "ce-latest-ee-2.12.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.12.0" + app.kubernetes.io/version: "ce-latest-ee-2.12.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.12.0" + app.kubernetes.io/version: "ce-latest-ee-2.12.1" spec: replicas: 1 strategy: @@ -118,7 +118,7 @@ spec: claimName: portainer containers: - name: portainer - image: "portainer/portainer-ee:2.12.0" + image: "portainer/portainer-ee:2.12.1" imagePullPolicy: Always args: volumeMounts: diff --git a/deploy/manifests/portainer/portainer-lb.yaml b/deploy/manifests/portainer/portainer-lb.yaml index 122e280..709884b 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.12.0" + app.kubernetes.io/version: "ce-latest-ee-2.12.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.12.0" + app.kubernetes.io/version: "ce-latest-ee-2.12.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.12.0" + app.kubernetes.io/version: "ce-latest-ee-2.12.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.12.0" + app.kubernetes.io/version: "ce-latest-ee-2.12.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.12.0" + app.kubernetes.io/version: "ce-latest-ee-2.12.1" spec: replicas: 1 strategy: diff --git a/deploy/manifests/portainer/portainer.yaml b/deploy/manifests/portainer/portainer.yaml index 4b21701..b62b064 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.12.0" + app.kubernetes.io/version: "ce-latest-ee-2.12.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.12.0" + app.kubernetes.io/version: "ce-latest-ee-2.12.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.12.0" + app.kubernetes.io/version: "ce-latest-ee-2.12.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.12.0" + app.kubernetes.io/version: "ce-latest-ee-2.12.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.12.0" + app.kubernetes.io/version: "ce-latest-ee-2.12.1" spec: replicas: 1 strategy: From e7aa7b564b7106d6af342371391b6d7b3457898b Mon Sep 17 00:00:00 2001 From: Oscar Zhou <100548325+oscarzhou-portainer@users.noreply.github.com> Date: Tue, 29 Mar 2022 10:27:37 +1300 Subject: [PATCH 2/3] fix(k8s/helm): change to https only causing service crash with helm install (#101) --- charts/portainer/Chart.yaml | 3 +- charts/portainer/templates/deployment.yaml | 36 ++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/charts/portainer/Chart.yaml b/charts/portainer/Chart.yaml index 6447c5e..121acdd 100644 --- a/charts/portainer/Chart.yaml +++ b/charts/portainer/Chart.yaml @@ -16,8 +16,7 @@ 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.24 +version: 1.0.25 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. diff --git a/charts/portainer/templates/deployment.yaml b/charts/portainer/templates/deployment.yaml index 1d750c6..3929e6a 100644 --- a/charts/portainer/templates/deployment.yaml +++ b/charts/portainer/templates/deployment.yaml @@ -83,8 +83,26 @@ spec: port: 9443 scheme: HTTPS {{- else }} + {{- if .Values.enterpriseEdition.enabled }} + {{- if eq (semver .Values.enterpriseEdition.image.tag | (semver "2.7.0").Compare) -1 }} + port: 9443 + scheme: HTTPS + {{- else }} port: 9000 scheme: HTTP + {{- end}} + {{- else }} + {{- if eq .Values.image.tag "latest" }} + port: 9443 + scheme: HTTPS + {{- else if eq (semver .Values.image.tag | (semver "2.6.0").Compare) -1 }} + port: 9443 + scheme: HTTPS + {{- else }} + port: 9000 + scheme: HTTP + {{- end }} + {{- end }} {{- end }} readinessProbe: httpGet: @@ -93,8 +111,26 @@ spec: port: 9443 scheme: HTTPS {{- else }} + {{- if .Values.enterpriseEdition.enabled }} + {{- if eq (semver .Values.enterpriseEdition.image.tag | (semver "2.7.0").Compare) -1 }} + port: 9443 + scheme: HTTPS + {{- else }} port: 9000 scheme: HTTP + {{- end }} + {{- else }} + {{- if eq .Values.image.tag "latest" }} + port: 9443 + scheme: HTTPS + {{- else if eq (semver .Values.image.tag | (semver "2.6.0").Compare) -1 }} + port: 9443 + scheme: HTTPS + {{- else }} + port: 9000 + scheme: HTTP + {{- end }} + {{- end }} {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} From 1d3bd8b97981abd08c48bb684a601cfc084d9e62 Mon Sep 17 00:00:00 2001 From: Oscar Zhou <100548325+oscarzhou-portainer@users.noreply.github.com> Date: Tue, 29 Mar 2022 14:58:11 +1300 Subject: [PATCH 3/3] fix(k8s/helm): add semantic version string check (#108) --- charts/portainer/Chart.yaml | 2 +- charts/portainer/templates/deployment.yaml | 64 +++++++++++++++++----- 2 files changed, 50 insertions(+), 16 deletions(-) diff --git a/charts/portainer/Chart.yaml b/charts/portainer/Chart.yaml index 121acdd..0ebb71b 100644 --- a/charts/portainer/Chart.yaml +++ b/charts/portainer/Chart.yaml @@ -16,7 +16,7 @@ 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.25 +version: 1.0.26 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. diff --git a/charts/portainer/templates/deployment.yaml b/charts/portainer/templates/deployment.yaml index 3929e6a..c1ac1bf 100644 --- a/charts/portainer/templates/deployment.yaml +++ b/charts/portainer/templates/deployment.yaml @@ -84,23 +84,40 @@ spec: scheme: HTTPS {{- else }} {{- if .Values.enterpriseEdition.enabled }} - {{- if eq (semver .Values.enterpriseEdition.image.tag | (semver "2.7.0").Compare) -1 }} + {{- if regexMatch "^[0-9]+\\.[0-9]+\\.[0-9]+$" .Values.enterpriseEdition.image.tag }} + {{- if eq (semver .Values.enterpriseEdition.image.tag | (semver "2.7.0").Compare) -1 }} port: 9443 scheme: HTTPS - {{- else }} + {{- else }} port: 9000 scheme: HTTP + {{- end }} + {{- else }} + {{- if eq .Values.enterpriseEdition.image.tag "latest" }} + port: 9443 + scheme: HTTPS + {{- else }} + port: 9000 + scheme: HTTP + {{- end }} {{- end}} {{- else }} - {{- if eq .Values.image.tag "latest" }} + {{- if regexMatch "^[0-9]+\\.[0-9]+\\.[0-9]+$" .Values.image.tag }} + {{- if eq (semver .Values.image.tag | (semver "2.6.0").Compare) -1 }} port: 9443 scheme: HTTPS - {{- else if eq (semver .Values.image.tag | (semver "2.6.0").Compare) -1 }} - port: 9443 - scheme: HTTPS - {{- else }} + {{- else }} port: 9000 scheme: HTTP + {{- end}} + {{- else }} + {{- if eq .Values.image.tag "latest" }} + port: 9443 + scheme: HTTPS + {{- else }} + port: 9000 + scheme: HTTP + {{- end }} {{- end }} {{- end }} {{- end }} @@ -112,23 +129,40 @@ spec: scheme: HTTPS {{- else }} {{- if .Values.enterpriseEdition.enabled }} - {{- if eq (semver .Values.enterpriseEdition.image.tag | (semver "2.7.0").Compare) -1 }} + {{- if regexMatch "^[0-9]+\\.[0-9]+\\.[0-9]+$" .Values.enterpriseEdition.image.tag }} + {{- if eq (semver .Values.enterpriseEdition.image.tag | (semver "2.7.0").Compare) -1 }} port: 9443 scheme: HTTPS - {{- else }} + {{- else }} port: 9000 scheme: HTTP - {{- end }} + {{- end }} + {{- else }} + {{- if eq .Values.enterpriseEdition.image.tag "latest" }} + port: 9443 + scheme: HTTPS + {{- else }} + port: 9000 + scheme: HTTP + {{- end }} + {{- end}} {{- else }} - {{- if eq .Values.image.tag "latest" }} + {{- if regexMatch "^[0-9]+\\.[0-9]+\\.[0-9]+$" .Values.image.tag }} + {{- if eq (semver .Values.image.tag | (semver "2.6.0").Compare) -1 }} port: 9443 scheme: HTTPS - {{- else if eq (semver .Values.image.tag | (semver "2.6.0").Compare) -1 }} - port: 9443 - scheme: HTTPS - {{- else }} + {{- else }} port: 9000 scheme: HTTP + {{- end}} + {{- else }} + {{- if eq .Values.image.tag "latest" }} + port: 9443 + scheme: HTTPS + {{- else }} + port: 9000 + scheme: HTTP + {{- end }} {{- end }} {{- end }} {{- end }}