Skip to content
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.

Sign up for GitHub

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

update oCIS to 2.0.0-rc.1 and depreciate Kubernetes 1.22 (EOL since 2022-10-28) #105

Merged
merged 2 commits into from
Nov 9, 2022
Merged

update oCIS to 2.0.0-rc.1 and depreciate Kubernetes 1.22 (EOL since 2022-10-28) #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
195bbc2
update oCIS to 2.0.0-rc.1 and depreceate Kubernetes 1.22 (EOL since 2…
wkloucek Nov 7, 2022
69cb379
configure Web UI url for notifications service
wkloucek Nov 7, 2022
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
1 change: 0 additions & 1 deletion .drone.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ config = {
],
# if this changes, also the kubeVersion in the Chart.yaml needs to be changed
"kubernetesVersions": [
"1.22.0",
"1.23.0",
"1.24.0",
"1.25.0",
Expand Down
3 changes: 0 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ lint: $(KUBE_LINTER)

.PHONY: api
api: $(KUBECONFORM)
helm template --kube-version 1.22.0 charts/ocis -f charts/ocis/ci/values.yaml > charts/ocis/ci/templated.yaml
$(KUBECONFORM) -kubernetes-version 1.22.0 -summary -strict charts/ocis/ci/templated.yaml

helm template --kube-version 1.23.0 charts/ocis -f charts/ocis/ci/values.yaml > charts/ocis/ci/templated.yaml
$(KUBECONFORM) -kubernetes-version 1.23.0 -summary -strict charts/ocis/ci/templated.yaml

Expand Down
4 changes: 2 additions & 2 deletions charts/ocis/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ maintainers:
url: https://owncloud.com
type: application
version: 0.0.0
appVersion: 2.0.0-beta.8
appVersion: 2.0.0-rc.1
# supported Kubernetes versions
# should only contain non EOL versions from https://kubernetes.io/releases/patch-releases/#non-active-branch-history
# if this changes, also kubernetesVersions in .drone.star needs to be changed
kubeVersion: "~1.22.0 || ~1.23.0 || ~1.24.0 || ~1.25.0"
kubeVersion: "~1.23.0 || ~1.24.0 || ~1.25.0"
sources:
- https://github.com/owncloud/ocis-charts
- https://github.com/owncloud/ocis
Expand Down
2 changes: 1 addition & 1 deletion charts/ocis/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
[comment]: # (DONT EDIT THIS FILE, it is autogenerated. Instead you need to edit README.md.gotmpl)

# ownCloud Infinite Scale (oCIS) Helm chart
![Version: 0.0.0](https://img.shields.io/badge/Version-0.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0-beta.8](https://img.shields.io/badge/AppVersion-2.0.0--beta.8-informational?style=flat-square)
![Version: 0.0.0](https://img.shields.io/badge/Version-0.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0-rc.1](https://img.shields.io/badge/AppVersion-2.0.0--rc.1-informational?style=flat-square)

Installs [ownCloud Infinite Scale](https://doc.owncloud.com/ocis/next/).

Expand Down
2 changes: 0 additions & 2 deletions charts/ocis/docs/kube-versions.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,4 @@ a| [subs=-attributes]
+~1.24.0+
a| [subs=-attributes]
+~1.23.0+
a| [subs=-attributes]
+~1.22.0+
|===
7 changes: 7 additions & 0 deletions charts/ocis/templates/notifications/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,13 @@ spec:
name: {{ .Values.secretRefs.notificationsSmtpSecretRef }}
key: smtp-password

#TODO: remove OCIS_URL in favor of NOTIFICATIONS_WEB_UI_URL
# after https://github.com/owncloud/ocis/pull/4998 was released
- name: OCIS_URL
value: https://{{ .Values.externalDomain }}
- name: NOTIFICATIONS_WEB_UI_URL
value: https://{{ .Values.externalDomain }}

- name: REVA_GATEWAY
value: gateway:9142
- name: NOTIFICATIONS_EVENTS_ENDPOINT
Expand Down