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.

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

[catalog] chore: update crds and roles #156

Merged
merged 5 commits into from
Oct 2, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
2 changes: 1 addition & 1 deletion staging/kubeaddons-catalog/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
appVersion: "v0.0.1-alpha1"
description: "A Catalog service for Kubeaddons"
name: kubeaddons-catalog
version: 0.0.3
version: 0.0.4
home: https://github.com/mesosphere/kubeaddons
sources:
- https://github.com/mesosphere/kubeaddons/tools/catalog
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
{{- if not (.Capabilities.APIVersions.Has "kubeaddons.mesosphere.io/v1alpha1") }}
alejandroEsc marked this conversation as resolved.
Show resolved Hide resolved
---
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
creationTimestamp: null
name: addonrepositories.kubeaddons.mesosphere.io
labels:
{{ include "kubeaddons-catalog.labels" . | indent 4 }}
annotations:
"helm.sh/hook": crd-install
spec:
additionalPrinterColumns:
- JSONPath: .status.ready
Expand Down Expand Up @@ -80,3 +85,4 @@ status:
plural: ""
conditions: []
storedVersions: []
{{- end }}
4 changes: 4 additions & 0 deletions staging/kubeaddons-catalog/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ spec:
app.kubernetes.io/name: {{ include "kubeaddons-catalog.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
spec:
serviceAccountName: {{ template "kubeaddons-catalog.fullname" . }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
Expand All @@ -28,6 +29,9 @@ spec:
- name: http
containerPort: 3000
protocol: TCP
- name: metrics
containerPort: 9094
protocol: TCP
livenessProbe:
httpGet:
path: /v1alpha1/health
Expand Down
11 changes: 11 additions & 0 deletions staging/kubeaddons-catalog/templates/hook-roles.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ template "kubeaddons-catalog.fullname" . }}
namespace: {{ .Release.Namespace }}
labels:
{{ include "kubeaddons-catalog.labels" . | indent 4 }}
annotations:
helm.sh/hook: pre-install
helm.sh/hook-delete-policy: "before-hook-creation"
28 changes: 28 additions & 0 deletions staging/kubeaddons-catalog/templates/role.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: {{ template "kubeaddons-catalog.fullname" . }}
namespace: {{ .Release.Namespace }}
labels:
{{ include "kubeaddons-catalog.labels" . | indent 4 }}
rules:
- apiGroups: ["kubeaddons.mesosphere.io"]
resources: ["addonrepositories"]
verbs: ["get", "watch", "list"]
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: {{ template "kubeaddons-catalog.fullname" . }}
namespace: {{ .Release.Namespace }}
labels:
{{ include "kubeaddons-catalog.labels" . | indent 4 }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: {{ template "kubeaddons-catalog.fullname" . }}
subjects:
- kind: ServiceAccount
name: {{ template "kubeaddons-catalog.fullname" . }}
namespace: {{ .Release.Namespace }}