Skip to content

Commit

Permalink
Merge branch 'master' into joe/awsebscsiprovisioner
Browse files Browse the repository at this point in the history
  • Loading branch information
sebbrandt87 committed Mar 14, 2020
2 parents a444b0a + b607064 commit 147b6e2
Show file tree
Hide file tree
Showing 21 changed files with 46 additions and 53 deletions.
21 changes: 21 additions & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,24 @@

# These owners will be the default owners for everything in the repo unless a later match takes precedence
* @mesosphere/sig-ksphere-catalog

/stable/argo-cd @mesosphere/devx
/stable/awsebscsiprovisioner @mesosphere/sig-ksphere-cluster
/stable/awsebsprovisioner @mesosphere/sig-ksphere-cluster
/stable/azuredisk-csi-driver @mesosphere/sig-ksphere-cluster
/stable/azurediskprovisioner @mesosphere/sig-ksphere-cluster
/stable/defaultstorageclass @mesosphere/sig-ksphere-cluster
/stable/dex @mesosphere/sig-ksphere-security
/stable/dex-controller @mesosphere/sig-ksphere-security
/stable/dispatch @mesosphere/devx
/stable/gcpdisk-csi-driver @mesosphere/sig-ksphere-cluster
/stable/gcpdiskprovisioner @mesosphere/sig-ksphere-cluster
/stable/kommander @mesosphere/sig-ksphere-ui @mesosphere/sig-ksphere-multi-cluster
/stable/kommander-karma @mesosphere/sig-ksphere-observability
/stable/kommander-thanos @mesosphere/sig-ksphere-observability
/stable/localvolumeprovisioner @mesosphere/sig-ksphere-cluster
/stable/mtls-proxy @mesosphere/sig-ksphere-observability
/stable/opsportal @mesosphere/sig-ksphere-ui @mesosphere/sig-ksphere-security
/stable/tekton @mesosphere/devx

/staging/prometheus-operator @mesosphere/sig-ksphere-observability
4 changes: 2 additions & 2 deletions stable/kommander/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apiVersion: v1
appVersion: 1.0.0
appVersion: 1.1.0
description: Kommander
home: https://github.com/mesosphere/charts
maintainers:
- name: hectorj2f
- name: alejandroEsc
- name: jimmidyson
name: kommander
version: 0.4.28
version: 0.5.1
Binary file not shown.
Binary file not shown.
Binary file removed stable/kommander/charts/kommander-ui-3.4.5.tgz
Binary file not shown.
Binary file added stable/kommander/charts/kommander-ui-3.6.1.tgz
Binary file not shown.
8 changes: 4 additions & 4 deletions stable/kommander/requirements.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ dependencies:
version: 0.1.6
- name: kommander-cluster-lifecycle
repository: https://mesosphere.github.io/kommander-cluster-lifecycle/charts
version: 0.4.11
version: 0.5.0
- name: kommander-ui
repository: https://mesosphere.github.io/kommander/charts
version: 3.4.5
version: 3.6.1
- name: kommander-thanos
repository: https://mesosphere.github.io/charts/stable
version: 0.1.13
Expand All @@ -17,5 +17,5 @@ dependencies:
- name: grafana
repository: https://kubernetes-charts.storage.googleapis.com
version: 4.5.1
digest: sha256:dfd942808d09176d7de024ca59c55e7e65c2b1794e4ec6d8d236f7c8a2bb8110
generated: "2020-03-06T21:41:20.128436+01:00"
digest: sha256:8ff2dd32c02aa74d3a619ab6ec1bb39d7d2eee16db500a75e2adaa5564a87b5a
generated: "2020-03-13T12:15:21.600914512Z"
4 changes: 2 additions & 2 deletions stable/kommander/requirements.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ dependencies:
repository: "https://mesosphere.github.io/charts/staging"
condition: kubeaddons-catalog.enabled
- name: kommander-cluster-lifecycle
version: "0.4.11"
version: "0.5.0"
repository: "https://mesosphere.github.io/kommander-cluster-lifecycle/charts"
condition: kommander-cluster-lifecycle.enabled, global.kommander-cluster-lifecycle.enabled
- name: kommander-ui
version: "3.4.5"
version: "3.6.1"
repository: "https://mesosphere.github.io/kommander/charts"
condition: kommander-ui.enabled
- name: kommander-thanos
Expand Down
4 changes: 2 additions & 2 deletions stable/opsportal/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: v1
appVersion: 1.0.0
appVersion: 1.1.0
home: https://github.com/mesosphere/charts
description: OpsPortal Chart
name: opsportal
version: 0.2.12
version: 0.3.0
maintainers:
- name: hectorj2f
- name: alejandroEsc
Expand Down
Binary file removed stable/opsportal/charts/kommander-ui-3.4.5.tgz
Binary file not shown.
Binary file added stable/opsportal/charts/kommander-ui-3.6.1.tgz
Binary file not shown.
6 changes: 3 additions & 3 deletions stable/opsportal/requirements.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: kommander-ui
repository: https://mesosphere.github.io/kommander/charts
version: 3.4.5
digest: sha256:268465c452e62958f0f7a54ba8efba2122548b73e2ed131e82f101eb88644708
generated: "2020-03-06T21:40:38.294751+01:00"
version: 3.6.1
digest: sha256:292c6152272a98d3194b0ecbb6588658146f548c71f5ca667186f932f452b92d
generated: "2020-03-10T15:24:36.869088+01:00"
2 changes: 1 addition & 1 deletion stable/opsportal/requirements.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dependencies:
- name: kommander-ui
version: "3.4.5"
version: "3.6.1"
repository: "https://mesosphere.github.io/kommander/charts"
condition: kommander-ui.enabled
2 changes: 1 addition & 1 deletion staging/velero/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ name: velero
sources:
- https://github.com/heptio/velero
tillerVersion: '>=2.10.0'
version: 3.0.0
version: 3.0.1
2 changes: 1 addition & 1 deletion staging/velero/charts/minio/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ maintainers:
name: minio
sources:
- https://github.com/minio/minio
version: 5.0.12
version: 5.0.14

This file was deleted.

1 change: 1 addition & 0 deletions staging/velero/charts/minio/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ spec:
{{ toYaml .Values.podLabels | indent 8 }}
{{- end }}
annotations:
rollme: {{ randAlphaNum 5 | quote }}
checksum/secrets: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
{{- if .Values.podAnnotations }}
Expand Down
1 change: 1 addition & 0 deletions staging/velero/charts/minio/templates/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ spec:
{{ toYaml .Values.podLabels | indent 8 }}
{{- end }}
annotations:
rollme: {{ randAlphaNum 5 | quote }}
checksum/secrets: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
{{- if .Values.podAnnotations }}
Expand Down
26 changes: 3 additions & 23 deletions staging/velero/charts/minio/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ clusterDomain: cluster.local
##
image:
repository: minio/minio
tag: RELEASE.2020-02-07T23-28-16Z
tag: RELEASE.2020-03-06T22-23-56Z
pullPolicy: IfNotPresent

## Set default image, imageTag, and imagePullPolicy for the `mc` (the minio
## client used to create a default bucket).
##
mcImage:
repository: minio/mc
tag: RELEASE.2020-02-14T19-35-50Z
tag: RELEASE.2020-03-06T23-29-45Z
pullPolicy: IfNotPresent

## minio server mode, i.e. standalone or distributed.
Expand Down Expand Up @@ -278,27 +278,7 @@ b2gateway:
## Use this field to add environment variables relevant to Minio server. These fields will be passed on to Minio container(s)
## when Chart is deployed
environment:
## To disable Minio Browser, set this value to off
MINIO_BROWSER: "on"
## To enable virtual-host-style requests, set this value to Minio host domain name.
# MINIO_DOMAIN: ""
## Minio Cache settings, refer: https://docs.minio.io/docs/minio-disk-cache-guide.html
# MINIO_CACHE_DRIVES: ""
# MINIO_CACHE_EXCLUDE: ""
# MINIO_CACHE_EXPIRY: ""
# MINIO_CACHE_MAXUSE: ""
## Minio WORM setting, refer: https://docs.minio.io/docs/minio-server-configuration-guide.html
# MINIO_WORM: ""
## Minio KMS settings, refer: https://docs.minio.io/docs/minio-kms-quickstart-guide.html
# MINIO_SSE_VAULT_ENDPOINT: ""
# MINIO_SSE_VAULT_APPROLE_ID: ""
# MINIO_SSE_VAULT_APPROLE_SECRET: ""
# MINIO_SSE_VAULT_KEY_NAME: ""
## Minio Federation settings, refer: https://docs.minio.io/docs/minio-federation-quickstart-guide.html
# MINIO_ETCD_ENDPOINTS: ""
# MINIO_PUBLIC_IPS: ""
# MINIO_DOMAIN: ""
## Add other environment variables relevant to Minio server here. These values will be added to the container(s) as this Chart is deployed
## Please refer for comprehensive list https://docs.minio.io/docs/minio-server-configuration-guide.html

networkPolicy:
enabled: false
Expand Down
6 changes: 3 additions & 3 deletions staging/velero/requirements.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: minio
repository: ""
version: 5.0.12
digest: sha256:45c042c822702c21da0db4b210f03a758eb4946c64020f111f1635284516dfbc
generated: "2020-03-06T17:38:38.495806-08:00"
version: 5.0.14
digest: sha256:7f285ca57cb5522f54ac2406de23e06c6c2633c07a91b3e199eb75d05842b4cf
generated: "2020-03-10T20:39:35.787163-07:00"
2 changes: 1 addition & 1 deletion staging/velero/requirements.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dependencies:
- name: minio
version: 5.0.12
version: 5.0.14
condition: minioBackend

0 comments on commit 147b6e2

Please sign in to comment.