Skip to content

Commit b6344a8

Browse files
committed
Nuclio is not compatible at the moment
1 parent 7b7d850 commit b6344a8

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,21 @@
44

55
* Kubernetes: Enforcing strict Pod Security Policy
66

7-
## v7.1.0 - 2021-03-01
7+
## v7.1.0 - 2021-03-02
88

99
## Added
1010

11+
* Common: Added eBPF tools package installation
1112
* Containerd: Bump version 1.4.3
13+
* **Nuclio** is not compatible at the moment
1214
* Orchestration: Enabled CRI runtime customization
1315
* MailHog: Enabled support of user credentials list
1416
* Weave-Scope: Added Containerd and Crio support
1517

1618
## Changed
1719

1820
* **Warning**: Enabled containerd as default container runtime
21+
* Argo: Enabled containerd and Cri-O support
1922
* MailHog: Bump version 1.0.1
2023
* Ory Kratos: Migrated Selfservice UI deployment to Helm chart
2124
* Rook-CockroachDB: Bump version 1.5.8
@@ -26,6 +29,8 @@
2629
* Ory Hydra: Fixed hydra binary download
2730
* Ory Kratos: Migration to v0.5 config spec
2831
* Harbor: Use v2.0 Api for the OIDC configuration
32+
* Rook-Ceph: Fixed deployment state
33+
* Weave-Scope: Fixed missing selectors
2934

3035
## v7.0.0 - 2021-02-28
3136

srv/salt/kubernetes/charts/nuclio/defaults.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ nuclio:
33
function_worker: 4
44
event_worker: 2
55
project_worker: 2
6-
container_builder: docker
76
ingress_host: nuclio
87
registry:
98
dockerhub:

srv/salt/kubernetes/charts/nuclio/templates/values.yaml.j2

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
{%- from "kubernetes/map.jinja" import charts with context -%}
77
{%- from "kubernetes/map.jinja" import common with context -%}
88
{%- set public_domain = pillar['public-domain'] -%}
9+
{% set cri_provider = salt['pillar.get']('kubernetes:common:cri:provider') %}
910

1011
# if true, all components assume no internet connectivity
1112
offline: false
@@ -27,7 +28,10 @@ dahsboard:
2728
enabled: True
2829
image:
2930
tag: {{ nuclio.version }}-amd64
30-
containerBuilderKind: "{{ nuclio.container_builder }}"
31+
32+
{%- if not cri_provider == 'docker' %}
33+
containerBuilderKind: "kanico"
34+
{%- endif %}
3135

3236
autoscaler:
3337
enabled: False

0 commit comments

Comments
 (0)