Skip to content

Commit

Permalink
Merge pull request #268 from mesosphere/stable-1.8.0
Browse files Browse the repository at this point in the history
release: stable-1.8.0
  • Loading branch information
joejulian authored May 28, 2020
2 parents 0473fe2 + b86541b commit a7ff07d
Show file tree
Hide file tree
Showing 14 changed files with 435 additions and 58 deletions.
11 changes: 11 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
<!-- Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://github.com/mesosphere/kubernetes-base-addons/blob/master/CONTRIBUTING.md
2. When you're changing an existing addon, please do so with at least 2 commits:
1. create a copy of the addon spec file without doing any changes
2. change the copy
That way it’s much easier to review what actually has been changed.
-->

**What type of PR is this?**
<!-- Bug, Chore, Documentation, Feature -->

Expand Down
16 changes: 13 additions & 3 deletions Dispatchfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,25 @@ dindTask("dispatch-integration-test",
image = "mesosphere/dispatch-dind:v0.5.2",
workingDir="/workspace/src-git",
args=["git", "fetch", "origin", "master"]),

v1.Container(
name = "dispatch-integration-test",
image = "mesosphere/kubeaddons-ci:dispatch",
command = ["make","test"],
image = "mesosphere/kubeaddons-ci:dispatch@sha256:80a6f3c8775133b4ad2fab3d44ab4fbb4b541dbc03fcdb296b13f67611427d8c",
command = ["make","dispatch-test"],
workingDir = "/workspace/src-git",
env = [k8s.corev1.EnvVar(name = "DISPATCH_CI", value = "true"),
k8s.corev1.EnvVar(name = "AWS_REGION", value= "us-west-2"),
k8s.corev1.EnvVar(name = "AWS_ACCESS_KEY_ID",
valueFrom = secretVar("d2iq-dispatch-aws-creds",
"AWS_ACCESS_KEY_ID")),
k8s.corev1.EnvVar(name = "AWS_SECRET_ACCESS_KEY",
valueFrom = secretVar("d2iq-dispatch-aws-creds",
"AWS_SECRET_ACCESS_KEY")),
k8s.corev1.EnvVar(name = "SSH_KEY_BASE64",
valueFrom = secretVar("d2iq-dispatch-git-ssh-base64",
"ssh-privatekey-base64"))])])
"ssh-privatekey-base64"))
])
])

action(tasks = ["dispatch-integration-test"], on = pullRequest())
action(tasks = ["dispatch-integration-test"], on = pullRequest(chatops = ["test"]))
13 changes: 7 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ export GIT_TERMINAL_PROMPT := 1
export ADDON_TESTS_SETUP_WAIT_DURATION := 30m
export GOPRIVATE := github.com/mesosphere/kubeaddons


.DEFAULT_GOAL := test

.PHONY: set-git-ssh
Expand All @@ -15,9 +14,11 @@ ifdef DISPATCH_CI
./scripts/ci/setup_ssh.sh
endif

# Target to run restricted set of tests on Dispatch CI.
.PHONY: dispatch-test
dispatch-test: set-git-ssh
./test/dispatch-ci.sh

.PHONY: test
test: set-git-ssh
cd test && git fetch; \
for g in $(shell cd test && go run scripts/test-wrapper.go); do \
go test -timeout 30m -race -v -run $$g; \
done
test:
./test/run-tests.sh
4 changes: 4 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## stable-1.15-1.8.0, stable-1.16-1.8.0

* \[kibana\]: Fixes an issue causing an outdated version of Kibana to be deployed to GCP. ([#249](https://github.com/mesosphere/kubernetes-base-addons/pull/249), [@branden](https://github.com/branden))

# Release Notes

## stable-1.15-1.7.0, stable-1.16-1.7.0
Expand Down
65 changes: 65 additions & 0 deletions addons/awsebscsiprovisioner/0.5.x/awsebscsiprovisioner-3.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
---
apiVersion: kubeaddons.mesosphere.io/v1beta1
kind: ClusterAddon
metadata:
name: awsebscsiprovisioner
labels:
kubeaddons.mesosphere.io/name: awsebscsiprovisioner
kubeaddons.mesosphere.io/provides: storageclass
annotations:
catalog.kubeaddons.mesosphere.io/addon-revision: "0.5.0-3"
appversion.kubeaddons.mesosphere.io/awsebscsiprovisioner: "0.5.0"
values.chart.helm.kubeaddons.mesosphere.io/awsebscsiprovisioner: "https://raw.githubusercontent.com/mesosphere/charts/268df59/stable/awsebscsiprovisioner/values.yaml"
spec:
namespace: kube-system
requires:
- matchLabels:
kubeaddons.mesosphere.io/name: defaultstorageclass-protection
kubernetes:
minSupportedVersion: v1.15.6
cloudProvider:
- name: aws
enabled: true
chartReference:
version: 0.3.7
chart: awsebscsiprovisioner
repo: https://mesosphere.github.io/charts/stable
values: |
---
resizer:
enabled: true
snapshotter:
enabled: true
provisioner:
enableVolumeScheduling: true
storageclass:
isDefault: true
reclaimPolicy: Delete
volumeBindingMode: WaitForFirstConsumer
type: gp2
fstype: ext4
iopsPerGB: null
encrypted: false
kmsKeyId: null
allowedTopologies: []
# - matchLabelExpressions:
# - key: topology.ebs.csi.aws.com/zone
# values:
# - us-west-2a
# - us-west-2b
# - us-west-2c
allowVolumeExpansion: true
# replicas of the CSI-Controller
replicas: 1
statefulSetCSIController:
# if you want to use kube2iam or kiam roles define it here as podAnnotation for the CSI-Controller (statefulSet)
podAnnotations: {}
statefulSetCSISnapshotController:
# if you want to use kube2iam or kiam roles define it here as podAnnotation for the CSI-Snapshot-Controller (statefulSet)
podAnnotations: {}
# Extra volume tags to attach to each dynamically provisioned volume.
# ---
# extraVolumeTags:
# key1: value1
# key2: value2
extraVolumeTags: {}
86 changes: 86 additions & 0 deletions addons/dex-k8s-authenticator/1.1.x/dex-k8s-authenticator-7.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
---
apiVersion: kubeaddons.mesosphere.io/v1beta1
kind: Addon
metadata:
name: dex-k8s-authenticator
namespace: kubeaddons
labels:
kubeaddons.mesosphere.io/name: dex-k8s-authenticator
annotations:
catalog.kubeaddons.mesosphere.io/addon-revision: "1.1.2-1"
appversion.kubeaddons.mesosphere.io/dex-k8s-authenticator: "v1.1.2"
values.chart.helm.kubeaddons.mesosphere.io/dex-k8s-authenticator: "https://raw.githubusercontent.com/mesosphere/charts/f44c645c6bc843b254bb0f4f97d516f2cfee4707/staging/dex-k8s-authenticator/values.yaml"
spec:
kubernetes:
minSupportedVersion: v1.15.6
cloudProvider:
- name: aws
enabled: true
- name: azure
enabled: true
- name: gcp
enabled: true
- name: docker
enabled: true
- name: none
enabled: true
requires:
- matchLabels:
kubeaddons.mesosphere.io/name: dex
- matchLabels:
kubeaddons.mesosphere.io/provides: ingresscontroller
chartReference:
chart: dex-k8s-authenticator
repo: https://mesosphere.github.io/charts/staging
version: 1.1.18
values: |
---
image:
repository: mesosphere/dex-k8s-authenticator
tag: v1.1.2-d2iq
ingress:
enabled: true
annotations:
kubernetes.io/ingress.class: traefik
path: /token
hosts:
- ""
dexK8sAuthenticator:
#logoUrl: http://<path-to-your-logo.png>
#tlsCert: /path/to/dex-client.crt
#tlsKey: /path/to/dex-client.key
pluginVersion: "v0.1.1"
clusters:
- name: kubernetes-cluster
short_description: "Kubernetes cluster"
description: "Kubernetes cluster authenticator"
# client_secret: value is generated automatically via initContainers
client_id: kube-apiserver
issuer: https://dex-kubeaddons.kubeaddons.svc.cluster.local:8080/dex
# This URI is just a placeholder and it will be replaced during initContainers
# with a URL pointing to the traefik ingress public load balancer.
redirect_uri: https://dex-k8s-authenticator-kubeaddons.kubeaddons.svc.cluster.local:5555/token/callback/kubernetes-cluster
resources:
requests:
cpu: 100m
memory: 128Mi
deploymentAnnotations:
# The certificate can change because it was rotated or different cluster
# DNS name has been set.
secret.reloader.stakater.com/reload: "traefik-kubeaddons-certificate"
configmap.reloader.stakater.com/reload: "dex-k8s-authenticator-kubeaddons"
initContainers:
- name: initialize-dka-config
image: mesosphere/kubeaddons-addon-initializer:v0.2.8
args: ["dexK8sAuthenticator"]
env:
- name: "DKA_CONFIGMAP_NAME"
value: "dex-k8s-authenticator-kubeaddons"
- name: "DKA_NAMESPACE"
value: "kubeaddons"
- name: "DKA_INGRESS_NAMESPACE"
value: "kubeaddons"
- name: "DKA_INGRESS_SERVICE_NAME"
value: "traefik-kubeaddons"
- name: "DKA_WEB_PREFIX_PATH"
value: "/token"
98 changes: 98 additions & 0 deletions addons/kibana/6.8.x/kibana-3.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
---
apiVersion: kubeaddons.mesosphere.io/v1beta1
kind: Addon
metadata:
name: kibana
namespace: kubeaddons
labels:
kubeaddons.mesosphere.io/name: kibana
annotations:
catalog.kubeaddons.mesosphere.io/addon-revision: "6.8.2-2"
appversion.kubeaddons.mesosphere.io/kibana: "6.8.2"
endpoint.kubeaddons.mesosphere.io/kibana: "/ops/portal/kibana"
docs.kubeaddons.mesosphere.io/kibana: "https://www.elastic.co/guide/en/kibana/6.8/index.html"
values.chart.helm.kubeaddons.mesosphere.io/kibana: "https://raw.githubusercontent.com/helm/charts/09004fa332094693e2e5fcffe474622ba15491ae/stable/kibana/values.yaml"
spec:
kubernetes:
minSupportedVersion: v1.15.6
cloudProvider:
- name: aws
enabled: true
- name: azure
enabled: true
- name: gcp
enabled: true
- name: docker
enabled: false
- name: none
enabled: true
requires:
- matchLabels:
kubeaddons.mesosphere.io/name: elasticsearch
chartReference:
chart: stable/kibana
version: 3.2.5
values: |
---
image:
tag: "6.8.2"
files:
kibana.yml:
## Default Kibana configuration from kibana-docker.
elasticsearch.url: http://elasticsearch-kubeaddons-client:9200
## Ref: https://www.elastic.co/guide/en/kibana/current/settings.html
server.basePath: /ops/portal/kibana
serviceAccount:
create: true
service:
type: ClusterIP
externalPort: 5601
internalPort: 5601
labels:
servicemonitor.kubeaddons.mesosphere.io/path: "prometheus__metrics"
resources:
# need more cpu upon initialization, therefore burstable class
limits:
cpu: 1000m
requests:
cpu: 100m
plugins:
# to avoid needing to download any plugins at runtime, use a container and a shared volume
# do not enable the plugins here, instead rebuild the mesosphere/kibana-plugins image with the new plugins
enabled: false
values:
- kibana-prometheus-exporter,6.8.2,https://github.com/pjhampton/kibana-prometheus-exporter/releases/download/6.8.2/kibana-prometheus-exporter-6.8.2.zip
extraContainers: |
- name: initialize-kibana-index
image: mesosphere/kubeaddons-addon-initializer:v0.1.5
command: ["/bin/bash", "-c", "addon-initializer kibana && sleep infinity"]
env:
- name: "KIBANA_NAMESPACE"
value: "kubeaddons"
- name: "KIBANA_SERVICE_NAME"
value: "kibana-kubeaddons"
initContainers:
# from https://github.com/mesosphere/kubeaddons-sidecars
- name: kibana-plugins-install
image: mesosphere/kibana-plugins:v6.8.2
command: ["/bin/sh", "-c", "cp -a /usr/share/kibana/plugins/. /usr/share/kibana/shared-plugins/"]
volumeMounts:
- name: plugins
mountPath: /usr/share/kibana/shared-plugins/
extraVolumes:
- name: plugins
emptyDir: {}
extraVolumeMounts:
- mountPath: /usr/share/kibana/plugins/
name: plugins
ingress:
enabled: true
annotations:
kubernetes.io/ingress.class: traefik
traefik.frontend.rule.type: PathPrefixStrip
traefik.ingress.kubernetes.io/auth-response-headers: X-Forwarded-User,Authorization,Impersonate-User,Impersonate-Group
traefik.ingress.kubernetes.io/auth-type: forward
traefik.ingress.kubernetes.io/auth-url: http://traefik-forward-auth-kubeaddons.kubeaddons.svc.cluster.local:4181/
traefik.ingress.kubernetes.io/priority: "2"
hosts:
- "/ops/portal/kibana"
69 changes: 69 additions & 0 deletions addons/nvidia/0.2.x/nvidia-5.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
---
apiVersion: kubeaddons.mesosphere.io/v1beta1
kind: ClusterAddon
metadata:
name: nvidia
namespace: kubeaddons
labels:
kubeaddons.mesosphere.io/name: nvidia
kubeaddons.mesosphere.io/provides: nvidia
annotations:
catalog.kubeaddons.mesosphere.io/addon-revision: "0.2.0-5"
appversion.kubeaddons.mesosphere.io/nvidia: "0.2.0"
values.chart.helm.kubeaddons.mesosphere.io/nvidia: "https://raw.githubusercontent.com/mesosphere/charts/master/staging/nvidia/values.yaml"
helmv2.kubeaddons.mesosphere.io/upgrade-strategy: '[{"upgradeFrom": "<=0.4.0", "strategy": "delete"}]'
spec:
kubernetes:
minSupportedVersion: v1.15.6
cloudProvider:
- name: aws
enabled: false
- name: azure
enabled: false
- name: docker
enabled: false
- name: none
enabled: false
chartReference:
chart: nvidia
repo: https://mesosphere.github.io/charts/staging
version: 0.3.4
values: |
---
grafana:
enabled: true
nvidia-dcgm-exporter:
enabled: true
nodeSelector:
konvoy.mesosphere.com/gpu-provider: NVIDIA
initContainers:
- name: init-wait
image: busybox
command: ['sh', '-c', 'sleep 200']
nvidia-device-plugin:
enabled: true
resources:
limits:
cpu: 200m
memory: 128Mi
requests:
cpu: 100m
memory: 128Mi
nodeSelector:
konvoy.mesosphere.com/gpu-provider: NVIDIA
initContainers:
- name: init-wait
image: busybox
command: ['sh', '-c', 'sleep 180']
nvidia-driver:
enabled: true
image:
tag: "418.87.01-centos7"
resources:
requests:
cpu: 500m
memory: 512Mi
nodeSelector:
konvoy.mesosphere.com/gpu-provider: NVIDIA
vaultRepo:
enabled: true
Loading

0 comments on commit a7ff07d

Please sign in to comment.