Skip to content

Addon portainer: Update portainer from 2.15.1 to 2.27.7 #20956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions .github/workflows/update-portainer-version.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: "update-portainer-version"
on:
workflow_dispatch:
schedule:
# every Monday at around 3 am pacific/10 am UTC
- cron: "0 10 * * 1"
env:
GOPROXY: https://proxy.golang.org
GO_VERSION: '1.24.0'
permissions:
contents: read

jobs:
bump-portainer-version:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
with:
go-version: ${{env.GO_VERSION}}
- name: Bump portainer version
id: bumpPortainer
run: |
echo "OLD_VERSION=$(DEP=portainer make get-dependency-version)" >> "$GITHUB_OUTPUT"
make update-portainer-version
echo "NEW_VERSION=$(DEP=portainer make get-dependency-version)" >> "$GITHUB_OUTPUT"
# The following is to support multiline with GITHUB_OUTPUT, see https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings
echo "changes<<EOF" >> "$GITHUB_OUTPUT"
echo "$(git status --porcelain)" >> "$GITHUB_OUTPUT"
echo "EOF" >> "$GITHUB_OUTPUT"
- name: Create PR
if: ${{ steps.bumpPortainer.outputs.changes != '' }}
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e
with:
token: ${{ secrets.MINIKUBE_BOT_PAT }}
commit-message: 'Addon portainer: Update portainer image from ${{ steps.bumpPortainer.outputs.OLD_VERSION }} to ${{ steps.bumpPortainer.outputs.NEW_VERSION }}'
committer: minikube-bot <[email protected]>
author: minikube-bot <[email protected]>
branch: auto_bump_portainer_version
push-to-fork: minikube-bot/minikube
base: master
delete-branch: true
title: 'Addon portainer: Update portainer image from ${{ steps.bumpPortainer.outputs.OLD_VERSION }} to ${{ steps.bumpPortainer.outputs.NEW_VERSION }}'
labels: ok-to-test
body: |
The [portainer](https://github.com/portainer/portainer) project released a new portainer image

This PR was auto-generated by `make update-portainer-version` using [update-portainer-version.yml](https://github.com/kubernetes/minikube/tree/master/.github/workflows/update-portainer-version.yml) CI Workflow.
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1239,6 +1239,10 @@ update-headlamp-version:
update-kube-vip-version:
cd hack && go run update/kube_vip_version/update_kube_vip_version.go

.PHONY: update-portainer-version
update-portainer-version:
cd hack && go run update/portainer_version/update_portainer_version.go

# used by update- Targets to get before/after versions of tools it updates
# example usage echo "OLD_VERSION=$(DEP=node make get-dependency-version)" >> "$GITHUB_OUTPUT"
.PHONY: get-dependency-verison
Expand Down
32 changes: 16 additions & 16 deletions deploy/addons/portainer/portainer.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ metadata:
labels:
app.kubernetes.io/name: portainer
app.kubernetes.io/instance: portainer
app.kubernetes.io/version: "ce-latest-ee-2.15.1"
app.kubernetes.io/version: "ce-latest-ee-2.27.7"
---
# Source: portainer/templates/pvc.yaml
kind: "PersistentVolumeClaim"
apiVersion: "v1"
metadata:
name: portainer
namespace: portainer
namespace: portainer
annotations:
volume.alpha.kubernetes.io/storage-class: "generic"
labels:
io.portainer.kubernetes.application.stack: portainer
app.kubernetes.io/name: portainer
app.kubernetes.io/instance: portainer
app.kubernetes.io/version: "ce-latest-ee-2.15.1"
app.kubernetes.io/version: "ce-latest-ee-2.27.7"
spec:
accessModes:
- "ReadWriteOnce"
Expand All @@ -44,15 +44,15 @@ metadata:
labels:
app.kubernetes.io/name: portainer
app.kubernetes.io/instance: portainer
app.kubernetes.io/version: "ce-latest-ee-2.15.1"
app.kubernetes.io/version: "ce-latest-ee-2.27.7"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: cluster-admin
subjects:
- kind: ServiceAccount
namespace: portainer
name: portainer-sa-clusteradmin
- kind: ServiceAccount
namespace: portainer
name: portainer-sa-clusteradmin
---
# Source: portainer/templates/service.yaml
apiVersion: v1
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.15.1"
app.kubernetes.io/version: "ce-latest-ee-2.27.7"
kubernetes.io/minikube-addons-endpoint: portainer
spec:
type: NodePort
Expand All @@ -73,12 +73,12 @@ spec:
targetPort: 9000
protocol: TCP
name: http
nodePort: 30777
nodePort: 30777
- port: 9443
targetPort: 9443
protocol: TCP
name: https
nodePort: 30779
nodePort: 30779
- port: 30776
targetPort: 30776
protocol: TCP
Expand All @@ -98,7 +98,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.15.1"
app.kubernetes.io/version: "ce-latest-ee-2.27.7"
spec:
replicas: 1
strategy:
Expand All @@ -125,20 +125,20 @@ spec:
image: {{.CustomRegistries.Portainer | default .ImageRepository | default .Registries.Portainer}}{{.Images.Portainer}}
imagePullPolicy: Always
args:
- '--tunnel-port=30776'
- '--tunnel-port=30776'
volumeMounts:
- name: data
mountPath: /data
mountPath: /data
ports:
- name: http
containerPort: 9000
protocol: TCP
- name: https
containerPort: 9443
protocol: TCP
protocol: TCP
- name: tcp-edge
containerPort: 8000
protocol: TCP
protocol: TCP
livenessProbe:
httpGet:
path: /
Expand All @@ -148,6 +148,6 @@ spec:
httpGet:
path: /
port: 9443
scheme: HTTPS
scheme: HTTPS
resources:
{}
1 change: 1 addition & 0 deletions hack/update/get_version/get_version.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ var dependencies = map[string]dependency{
"nerdctld": {"deploy/kicbase/Dockerfile", `NERDCTLD_VERSION="(.*)"`},
"node": {"netlify.toml", `NODE_VERSION = "(.*)"`},
"nvidia-device-plugin": {addonsFile, `nvidia/k8s-device-plugin:(.*)@`},
"portainer": {addonsFile, `portainer/portainer-ce:(.*)@`},
"registry": {addonsFile, `registry:(.*)@`},
"runc": {"deploy/iso/minikube-iso/package/runc-master/runc-master.mk", `RUNC_MASTER_VERSION = (.*)`},
"ubuntu": {dockerfile, `ubuntu:jammy-(.*)"`},
Expand Down
57 changes: 57 additions & 0 deletions hack/update/portainer_version/update_portainer_version.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
/*
Copyright 2023 The Kubernetes Authors All rights reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package main

import (
"context"
"fmt"
"time"

"k8s.io/klog/v2"
"k8s.io/minikube/hack/update"
)

var schema = map[string]update.Item{
"pkg/minikube/assets/addons.go": {
Replace: map[string]string{
`portainer/portainer-ce:.*`: `portainer/portainer-ce:{{.Version}}@{{.SHA}}",`,
},
},
}

type Data struct {
Version string
SHA string
}

func main() {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
defer cancel()

stable, _, _, err := update.GHReleases(ctx, "portainer", "portainer")
if err != nil {
klog.Fatalf("Unable to get stable version: %v", err)
}
sha, err := update.GetImageSHA(fmt.Sprintf("portainer/portainer-ce:%s", stable.Tag))
if err != nil {
klog.Fatalf("failed to get image SHA: %v", err)
}

data := Data{Version: stable.Tag, SHA: sha}

update.Apply(schema, data)
}
2 changes: 1 addition & 1 deletion pkg/minikube/assets/addons.go
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,7 @@ var Addons = map[string]*Addon{
"portainer.yaml",
"0640"),
}, false, "portainer", "3rd party (Portainer.io)", "", "", map[string]string{
"Portainer": "portainer/portainer-ce:2.15.1@sha256:5466af30b8eaf3f75edd3c74703d1c9973f0963acd6ef164913ea6f195d640c2",
"Portainer": "portainer/portainer-ce:2.27.7@sha256:1b4759b6fd66cec0a6c02c780529d67e8dd0788a4fbd5b541f172daffdf991b9",
}, map[string]string{
"Portainer": "docker.io",
}),
Expand Down