Skip to content

Commit

Permalink
Update for Release 2.21.2 and kind cluster version upgrade for test (#…
Browse files Browse the repository at this point in the history
…149)

Co-authored-by: samdulam <[email protected]>
  • Loading branch information
jamescarppe and samdulam authored Sep 24, 2024
1 parent c3a4bb1 commit 4272809
Show file tree
Hide file tree
Showing 15 changed files with 52 additions and 52 deletions.
32 changes: 16 additions & 16 deletions .github/workflows/on-push-lint-charts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,42 +62,42 @@ jobs:
run: ct lint --config .ci/ct-config.yaml

# Refer to https://github.com/kubernetes-sigs/kind/releases when updating the node_images
- name: Create 1.23 kind cluster
- name: Create 1.28 kind cluster
uses: helm/[email protected]
with:
node_image: kindest/node:v1.23.13@sha256:ef453bb7c79f0e3caba88d2067d4196f427794086a7d0df8df4f019d5e336b61
cluster_name: kubernetes-1.23
node_image: kindest/node:v1.28.13@sha256:45d319897776e11167e4698f6b14938eb4d52eb381d9e3d7a9086c16c69a8110
cluster_name: kubernetes-1.28
if: steps.list-changed.outputs.changed == 'true'

- name: Run chart-testing (install) against 1.23
- name: Run chart-testing (install) against 1.28
run: ct install --config .ci/ct-config.yaml

- name: Create 1.24 kind cluster
- name: Create 1.29 kind cluster
uses: helm/[email protected]
with:
node_image: kindest/node:v1.24.12@sha256:1e12918b8bc3d4253bc08f640a231bb0d3b2c5a9b28aa3f2ca1aee93e1e8db16
cluster_name: kubernetes-1.24
node_image: kindest/node:v1.29.8@sha256:d46b7aa29567e93b27f7531d258c372e829d7224b25e3fc6ffdefed12476d3aa
cluster_name: kubernetes-1.29
if: steps.list-changed.outputs.changed == 'true'

- name: Run chart-testing (install) against 1.24
- name: Run chart-testing (install) against 1.29
run: ct install --config .ci/ct-config.yaml

- name: Create 1.25 kind cluster
- name: Create 1.30 kind cluster
uses: helm/[email protected]
with:
node_image: kindest/node:v1.25.8@sha256:00d3f5314cc35327706776e95b2f8e504198ce59ac545d0200a89e69fce10b7f
cluster_name: kubernetes-1.25
node_image: kindest/node:v1.30.4@sha256:976ea815844d5fa93be213437e3ff5754cd599b040946b5cca43ca45c2047114
cluster_name: kubernetes-1.30
if: steps.list-changed.outputs.changed == 'true'

- name: Run chart-testing (install) against 1.25
- name: Run chart-testing (install) against 1.30
run: ct install --config .ci/ct-config.yaml

- name: Create 1.26 kind cluster
- name: Create 1.31 kind cluster
uses: helm/[email protected]
with:
node_image: kindest/node:v1.26.3@sha256:61b92f38dff6ccc29969e7aa154d34e38b89443af1a2c14e6cfbd2df6419c66f
cluster_name: kubernetes-1.26
node_image: kindest/node:v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865
cluster_name: kubernetes-1.31
if: steps.list-changed.outputs.changed == 'true'

- name: Run chart-testing (install) against 1.26
- name: Run chart-testing (install) against 1.31
run: ct install --config .ci/ct-config.yaml
4 changes: 2 additions & 2 deletions charts/portainer/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.53
version: 1.0.54

# 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.21.1
appVersion: ce-latest-ee-2.21.2

sources:
- https://github.com/portainer/k8s
Expand Down
4 changes: 2 additions & 2 deletions charts/portainer/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ enterpriseEdition:
enabled: false
image:
repository: portainer/portainer-ee
tag: 2.21.1
tag: 2.21.2
pullPolicy: Always

image:
repository: portainer/portainer-ce
tag: 2.21.1
tag: 2.21.2
pullPolicy: Always

imagePullSecrets: []
Expand Down
2 changes: 1 addition & 1 deletion deploy/manifests/agent/ee/agent-stack-windows.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3.3'
services:
agent:
image: portainer/agent:2.21.1
image: portainer/agent:2.21.2
ports:
- target: 9001
published: 9001
Expand Down
2 changes: 1 addition & 1 deletion deploy/manifests/agent/ee/agent-stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3.2'

services:
agent:
image: portainer/agent:2.21.1
image: portainer/agent:2.21.2
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- /var/lib/docker/volumes:/var/lib/docker/volumes
Expand Down
2 changes: 1 addition & 1 deletion deploy/manifests/agent/ee/portainer-agent-edge-k8s.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ spec:
serviceAccountName: portainer-sa-clusteradmin
containers:
- name: portainer-agent
image: portainer/agent:2.21.1
image: portainer/agent:2.21.2
imagePullPolicy: Always
env:
- name: LOG_LEVEL
Expand Down
2 changes: 1 addition & 1 deletion deploy/manifests/agent/ee/portainer-agent-k8s-lb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ spec:
serviceAccountName: portainer-sa-clusteradmin
containers:
- name: portainer-agent
image: portainer/agent:2.21.1
image: portainer/agent:2.21.2
imagePullPolicy: Always
env:
- name: LOG_LEVEL
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ spec:
serviceAccountName: portainer-sa-clusteradmin
containers:
- name: portainer-agent
image: portainer/agent:2.21.1
image: portainer/agent:2.21.2
imagePullPolicy: Always
env:
- name: LOG_LEVEL
Expand Down
2 changes: 1 addition & 1 deletion deploy/manifests/agent/portainer-agent-edge-k8s.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ spec:
serviceAccountName: portainer-sa-clusteradmin
containers:
- name: portainer-agent
image: portainer/agent:2.21.1
image: portainer/agent:2.21.2
imagePullPolicy: Always
env:
- name: LOG_LEVEL
Expand Down
2 changes: 1 addition & 1 deletion deploy/manifests/agent/portainer-agent-k8s-lb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ spec:
serviceAccountName: portainer-sa-clusteradmin
containers:
- name: portainer-agent
image: portainer/agent:2.21.1
image: portainer/agent:2.21.2
imagePullPolicy: Always
env:
- name: LOG_LEVEL
Expand Down
2 changes: 1 addition & 1 deletion deploy/manifests/agent/portainer-agent-k8s-nodeport.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ spec:
serviceAccountName: portainer-sa-clusteradmin
containers:
- name: portainer-agent
image: portainer/agent:2.21.1
image: portainer/agent:2.21.2
imagePullPolicy: Always
env:
- name: LOG_LEVEL
Expand Down
12 changes: 6 additions & 6 deletions deploy/manifests/portainer/portainer-ee.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ metadata:
labels:
app.kubernetes.io/name: portainer
app.kubernetes.io/instance: portainer
app.kubernetes.io/version: "ce-latest-ee-2.21.1"
app.kubernetes.io/version: "ce-latest-ee-2.21.2"
---
# Source: portainer/templates/pvc.yaml
kind: "PersistentVolumeClaim"
Expand All @@ -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.21.1"
app.kubernetes.io/version: "ce-latest-ee-2.21.2"
spec:
accessModes:
- "ReadWriteOnce"
Expand All @@ -44,7 +44,7 @@ metadata:
labels:
app.kubernetes.io/name: portainer
app.kubernetes.io/instance: portainer
app.kubernetes.io/version: "ce-latest-ee-2.21.1"
app.kubernetes.io/version: "ce-latest-ee-2.21.2"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand All @@ -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.21.1"
app.kubernetes.io/version: "ce-latest-ee-2.21.2"
spec:
type: NodePort
ports:
Expand Down Expand Up @@ -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.21.1"
app.kubernetes.io/version: "ce-latest-ee-2.21.2"
spec:
replicas: 1
strategy:
Expand All @@ -121,7 +121,7 @@ spec:
claimName: portainer
containers:
- name: portainer
image: "portainer/portainer-ee:2.21.1"
image: "portainer/portainer-ee:2.21.2"
imagePullPolicy: Always
args:
- '--tunnel-port=30776'
Expand Down
12 changes: 6 additions & 6 deletions deploy/manifests/portainer/portainer-lb-ee.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ metadata:
labels:
app.kubernetes.io/name: portainer
app.kubernetes.io/instance: portainer
app.kubernetes.io/version: "ce-latest-ee-2.21.1"
app.kubernetes.io/version: "ce-latest-ee-2.21.2"
---
# Source: portainer/templates/pvc.yaml
kind: "PersistentVolumeClaim"
Expand All @@ -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.21.1"
app.kubernetes.io/version: "ce-latest-ee-2.21.2"
spec:
accessModes:
- "ReadWriteOnce"
Expand All @@ -44,7 +44,7 @@ metadata:
labels:
app.kubernetes.io/name: portainer
app.kubernetes.io/instance: portainer
app.kubernetes.io/version: "ce-latest-ee-2.21.1"
app.kubernetes.io/version: "ce-latest-ee-2.21.2"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand All @@ -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.21.1"
app.kubernetes.io/version: "ce-latest-ee-2.21.2"
spec:
type: LoadBalancer
ports:
Expand Down Expand Up @@ -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.21.1"
app.kubernetes.io/version: "ce-latest-ee-2.21.2"
spec:
replicas: 1
strategy:
Expand All @@ -118,7 +118,7 @@ spec:
claimName: portainer
containers:
- name: portainer
image: "portainer/portainer-ee:2.21.1"
image: "portainer/portainer-ee:2.21.2"
imagePullPolicy: Always
args:
volumeMounts:
Expand Down
12 changes: 6 additions & 6 deletions deploy/manifests/portainer/portainer-lb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ metadata:
labels:
app.kubernetes.io/name: portainer
app.kubernetes.io/instance: portainer
app.kubernetes.io/version: "ce-latest-ee-2.21.1"
app.kubernetes.io/version: "ce-latest-ee-2.21.2"
---
# Source: portainer/templates/pvc.yaml
kind: "PersistentVolumeClaim"
Expand All @@ -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.21.1"
app.kubernetes.io/version: "ce-latest-ee-2.21.2"
spec:
accessModes:
- "ReadWriteOnce"
Expand All @@ -44,7 +44,7 @@ metadata:
labels:
app.kubernetes.io/name: portainer
app.kubernetes.io/instance: portainer
app.kubernetes.io/version: "ce-latest-ee-2.21.1"
app.kubernetes.io/version: "ce-latest-ee-2.21.2"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand All @@ -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.21.1"
app.kubernetes.io/version: "ce-latest-ee-2.21.2"
spec:
type: LoadBalancer
ports:
Expand Down Expand Up @@ -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.21.1"
app.kubernetes.io/version: "ce-latest-ee-2.21.2"
spec:
replicas: 1
strategy:
Expand All @@ -118,7 +118,7 @@ spec:
claimName: portainer
containers:
- name: portainer
image: "portainer/portainer-ce:2.21.1"
image: "portainer/portainer-ce:2.21.2"
imagePullPolicy: Always
args:
volumeMounts:
Expand Down
12 changes: 6 additions & 6 deletions deploy/manifests/portainer/portainer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ metadata:
labels:
app.kubernetes.io/name: portainer
app.kubernetes.io/instance: portainer
app.kubernetes.io/version: "ce-latest-ee-2.21.1"
app.kubernetes.io/version: "ce-latest-ee-2.21.2"
---
# Source: portainer/templates/pvc.yaml
kind: "PersistentVolumeClaim"
Expand All @@ -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.21.1"
app.kubernetes.io/version: "ce-latest-ee-2.21.2"
spec:
accessModes:
- "ReadWriteOnce"
Expand All @@ -44,7 +44,7 @@ metadata:
labels:
app.kubernetes.io/name: portainer
app.kubernetes.io/instance: portainer
app.kubernetes.io/version: "ce-latest-ee-2.21.1"
app.kubernetes.io/version: "ce-latest-ee-2.21.2"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand All @@ -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.21.1"
app.kubernetes.io/version: "ce-latest-ee-2.21.2"
spec:
type: NodePort
ports:
Expand Down Expand Up @@ -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.21.1"
app.kubernetes.io/version: "ce-latest-ee-2.21.2"
spec:
replicas: 1
strategy:
Expand All @@ -121,7 +121,7 @@ spec:
claimName: portainer
containers:
- name: portainer
image: "portainer/portainer-ce:2.21.1"
image: "portainer/portainer-ce:2.21.2"
imagePullPolicy: Always
args:
- '--tunnel-port=30776'
Expand Down

0 comments on commit 4272809

Please sign in to comment.