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

Bump chart version. Update apprepositories annotations #1037

Merged
merged 3 commits into from
May 20, 2019
Merged

Bump chart version. Update apprepositories annotations #1037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3033707
Bump chart version. Update apprepositories annotations
May 20, 2019
ad54487
Use latest Helm version
May 20, 2019
d7b2f3d
Specify a scoped namespace for AppRepositories
May 20, 2019
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ exports: &exports
# history of the production tag
echo "export IMG_MODIFIER=-ci" >> $BASH_ENV
# Helm version (should be +2.10)
echo "export HELM_VERSION=v2.11.0" >> $BASH_ENV
echo "export HELM_VERSION=v2.14.0" >> $BASH_ENV
build_images: &build_images
steps:
- setup_remote_docker
Expand Down
2 changes: 1 addition & 1 deletion chart/kubeapps/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
name: kubeapps
version: 1.6.2
version: 1.7.0
appVersion: DEVEL
description: Kubeapps is a dashboard for your Kubernetes cluster that makes it easy to deploy and manage applications in your cluster using Helm
icon: https://raw.githubusercontent.com/kubeapps/kubeapps/master/docs/img/logo.png
Expand Down
8 changes: 8 additions & 0 deletions chart/kubeapps/templates/apprepositories.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,19 @@ kind: AppRepository
metadata:
name: {{ .name }}
annotations:
{{- if semverCompare ">=2.14.0" $.Capabilities.TillerVersion.SemVer }}
# Using the hook pre-install because since Helm v2.14 the crd-install
# hook should be used only for CRDs and the issues related to install
# Custom Resources have been already fixed
# https://github.com/helm/helm/issues/5756#issuecomment-493653454
"helm.sh/hook": pre-install
{{- else }}
# Using the hook crd-install to avoid issue w/Helm v1.11
# https://github.com/kubeapps/kubeapps/pull/955#pullrequestreview-200764260
"helm.sh/hook": crd-install
# Make sure this runs after the AppRepository CRD install
"helm.sh/hook-weight": "10"
{{- end }}
labels:
app: {{ template "kubeapps.apprepository.fullname" $ }}
chart: {{ template "kubeapps.chart" $ }}
Expand Down
1 change: 1 addition & 0 deletions chart/kubeapps/templates/apprepository-crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ metadata:
heritage: {{ .Release.Service }}
spec:
group: kubeapps.com
scope: Namespaced
names:
kind: AppRepository
plural: apprepositories
Expand Down