Skip to content

Commit

Permalink
fix(portainer): Port to new common BREAKING CHANGES (truecharts#8755)
Browse files Browse the repository at this point in the history
**Description**
<!--
Please include a summary of the change and which issue is fixed. Please
also include relevant motivation and context. List any dependencies that
are required for this change.
-->
Fixed the errors in the part 4 PR and seems to install correctly. Can't
merge into that PR branch without causing a mess so did it this way
instead.

⚒️ Fixes  # <!--(issue)-->

**⚙️ Type of change**

- [ ] ⚙️ Feature/App addition
- [X] 🪛 Bugfix
- [X] ⚠️ Breaking change (fix or feature that would cause existing
functionality to not work as expected)
- [ ] 🔃 Refactor of current code

**🧪 How Has This Been Tested?**
<!--
Please describe the tests that you ran to verify your changes. Provide
instructions so we can reproduce. Please also list any relevant details
for your test configuration
-->
Previously tested on CI in my own fork.

**📃 Notes:**
<!-- Please enter any other relevant information here -->

**✔️ Checklist:**

- [X] ⚖️ My code follows the style guidelines of this project
- [X] 👀 I have performed a self-review of my own code
- [ ] #️⃣ I have commented my code, particularly in hard-to-understand
areas
- [ ] 📄 I have made corresponding changes to the documentation
- [ ] ⚠️ My changes generate no new warnings
- [ ] 🧪 I have added tests to this description that prove my fix is
effective or that my feature works
- [X] ⬆️ I increased versions for any altered app according to semantic
versioning

**➕ App addition**

If this PR is an app addition please make sure you have done the
following.

- [ ] 🪞 I have opened a PR on
[truecharts/containers](https://github.com/truecharts/containers) adding
the container to TrueCharts mirror repo.
- [ ] 🖼️ I have added an icon in the Chart's root directory called
`icon.png`

---

_Please don't blindly check all the boxes. Read them and only check
those that apply.
Those checkboxes are there for the reviewer to see what is this all
about and
the status of this PR with a quick glance._

---------

Signed-off-by: MaverickD650 <92877124+MaverickD650@users.noreply.github.com>
Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
  • Loading branch information
MaverickD650 and stavros-k authored May 4, 2023
1 parent 020448e commit aaec378
Show file tree
Hide file tree
Showing 14 changed files with 39 additions and 50 deletions.
10 changes: 0 additions & 10 deletions charts/stable/portainer-ce/templates/common.yaml

This file was deleted.

File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ appVersion: "2.18.1"
dependencies:
- name: common
repository: https://library-charts.truecharts.org
version: 11.1.2
version: 12.6.1
description: Container management made easy
home: https://truecharts.org/charts/stable/portainer-ce
icon: https://truecharts.org/img/hotlink-ok/chart-icons/portainer-ce.png
Expand All @@ -14,14 +14,13 @@ maintainers:
- email: info@truecharts.org
name: TrueCharts
url: https://truecharts.org
name: portainer-ce
name: portainer
sources:
- https://github.com/truecharts/charts/tree/master/charts/stable/portainer-ce
- https://docs.portainer.io/start/install-ce/server
- https://docs.portainer.io/start/install/server
version: 3.0.15
version: 4.0.0
annotations:
truecharts.org/catagories: |
- management
truecharts.org/SCALE-support: "true"
truecharts.org/grade: U
File renamed without changes.
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ questions:
# Include{replicas1}
# Include{podSpec}
# Include{containerMain}

- variable: imageSelector
group: Container Image
label: Select Edition
Expand Down
1 change: 1 addition & 0 deletions charts/stable/portainer/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{- include "tc.v1.common.lib.chart.notes" $ -}}
File renamed without changes.
10 changes: 10 additions & 0 deletions charts/stable/portainer/templates/common.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{{/* Make sure all variables are set properly */}}
{{- include "tc.v1.common.loader.init" . }}

{{- $newArgs := (include "portainer.args" . | fromYaml) }}
{{- $_ := set .Values "newArgs" $newArgs -}}
{{- $args := concat ((get .Values.workload.main.podSpec.containers.main "args") | default list) .Values.newArgs.args }}
{{- $_ := set .Values.workload.main.podSpec.containers.main "args" $args -}}

{{/* Render the templates */}}
{{ include "tc.v1.common.loader.apply" . }}
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@ image:

imageBe:
repository: tccr.io/truecharts/portainer-be
tag: 2.17.1@sha256:d83c8fa439ce749d4bdc68710b9c8ca2ae6e2a54b963ec47ddba6d97d4a34f36
tag: 2.18.1@sha256:24860264b69f386a5445c64bbf71104616907151c0cc28eb42b65cc342cc8b31
pullPolicy: IfNotPresent

imageSelector: image

portainer:
# Logo URL
logo: ""
Expand All @@ -18,53 +16,29 @@ portainer:
# Sets Snapshot interval
snapshot_interval: 5m
hide_labels:
# - label1=value1
# - label2=value2

# - label1=value1
# - label2=value2
serviceAccount:
main:
enabled: true

primary: true
rbac:
main:
enabled: true
primary: true
rules:
- apiGroups:
- "*"
resources:
- "*"
verbs:
- "*"

probes:
liveness:
custom: true
spec:
httpGet:
path: /
port: 9443
scheme: HTTPS
readiness:
custom: true
spec:
httpGet:
path: /
port: 9443
scheme: HTTPS
startup:
custom: true
spec:
httpGet:
path: /
port: 9443
scheme: HTTPS

service:
main:
ports:
main:
port: 10400
protocol: HTTPS
protocol: https
targetPort: 9443
edge:
enabled: true
Expand All @@ -73,7 +47,6 @@ service:
enabled: true
port: 10401
targetPort: 10401

persistence:
data:
enabled: true
Expand All @@ -82,6 +55,23 @@ persistence:
enabled: true
mountPath: "/.cache"
type: emptyDir

portal:
enabled: true
open:
enabled: true

workload:
main:
podSpec:
containers:
main:
imageSelector: image
probes:
liveness:
port: 9443
scheme: https
readiness:
port: 9443
scheme: https
startup:
port: 9443
scheme: https

0 comments on commit aaec378

Please sign in to comment.