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

fix: Fix dataflow disable bug and update notebooks for clusterwide #4938

Merged
merged 1 commit into from
Jun 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -1363,7 +1363,7 @@ spec:
8 }}
terminationGracePeriodSeconds: 5
replicas: 1
- name: dataflow-engine
- name: seldon-dataflow-engine
podSpec:
containers:
- env:
Expand Down
2 changes: 1 addition & 1 deletion k8s/kustomize/helm-components-sc/patch_dataflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: default
spec:
components:
- name: dataflow-engine
- name: seldon-dataflow-engine
replicas: 1
podSpec:
imagePullSecrets: []
Expand Down
2 changes: 1 addition & 1 deletion k8s/yaml/components.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -985,7 +985,7 @@ spec:
runAsUser: 1000
terminationGracePeriodSeconds: 5
replicas: 1
- name: dataflow-engine
- name: seldon-dataflow-engine
podSpec:
containers:
- env:
Expand Down
2 changes: 1 addition & 1 deletion operator/config/seldonconfigs/default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: default
spec:
components:
- name: dataflow-engine
- name: seldon-dataflow-engine
replicas: 1
podSpec:
containers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ func NewSeldonRuntimeReconciler(
var componentReconcilers []common.Reconciler
for _, c := range seldonConfig.Spec.Components {
override := overrides[c.Name]
commonConfig.Logger.Info("Creating reconciler", "name", c.Name, "has override", override != nil)
if override == nil || !override.Disable {
commonConfig.Logger.Info("Creating component", "name", c.Name)
if len(c.VolumeClaimTemplates) > 0 {
componentReconcilers = append(componentReconcilers,
NewComponentStatefulSetReconciler(
Expand Down
105 changes: 89 additions & 16 deletions samples/k8s-clusterwide-kafka-mtls-demo.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ helm upgrade --install seldon-core-v2-crds ../k8s/helm-charts/seldon-core-v2-cr
```

```
Release "seldon-core-v2-crds" does not exist. Installing it now.
Release "seldon-core-v2-crds" has been upgraded. Happy Helming!
NAME: seldon-core-v2-crds
LAST DEPLOYED: Sun May 14 16:08:17 2023
LAST DEPLOYED: Thu Jun 22 15:22:04 2023
NAMESPACE: seldon-mesh
STATUS: deployed
REVISION: 1
REVISION: 5
TEST SUITE: None

```
Expand Down Expand Up @@ -74,7 +74,7 @@ helm install seldon-v2 ../k8s/helm-charts/seldon-core-v2-setup/ -n seldon-mesh -

```yaml
NAME: seldon-v2
LAST DEPLOYED: Sun May 14 16:13:24 2023
LAST DEPLOYED: Thu Jun 22 15:22:11 2023
NAMESPACE: seldon-mesh
STATUS: deployed
REVISION: 1
Expand All @@ -87,16 +87,12 @@ TEST SUITE: None
Strimzi doesn't allow a single Kafka cluster to be used in TLS easily from multiple namespaces without copying the user Secrets created by the KafkaUser to those namespaces.

```bash
kubectl create -f ../k8s/samples/strimzi-example-tls-user.yaml -n ns1
```

kubectl get secret seldon -n seldon-mesh -o json | jq 'del(.metadata.ownerReferences) | del(.metadata.namespace)' | kubectl create -f - -n ns1
```
kafkauser.kafka.strimzi.io/seldon created

```
secret/seldon created

```bash
kubectl get secret seldon -n seldon-mesh -o json | jq 'del(.metadata.ownerReferences) | del(.metadata.namespace)' | kubectl create -f - -n ns1
```

```bash
Expand Down Expand Up @@ -129,12 +125,12 @@ secret/seldon-cluster-ca-cert created
## Create SeldonRuntimes

```bash
helm install seldon-v2-runtime ../k8s/helm-charts/seldon-core-v2-runtime -n ns1
helm install seldon-v2-runtime ../k8s/helm-charts/seldon-core-v2-runtime -n ns1 --wait
```

```yaml
NAME: seldon-v2-runtime
LAST DEPLOYED: Sun May 14 16:13:43 2023
LAST DEPLOYED: Thu Jun 22 15:22:19 2023
NAMESPACE: ns1
STATUS: deployed
REVISION: 1
Expand All @@ -143,19 +139,67 @@ TEST SUITE: None
```

```bash
helm install seldon-v2-runtime ../k8s/helm-charts/seldon-core-v2-runtime -n ns2
helm install seldon-v2-runtime ../k8s/helm-charts/seldon-core-v2-runtime -n ns2 --wait
```

```yaml
NAME: seldon-v2-runtime
LAST DEPLOYED: Sun May 14 16:16:05 2023
LAST DEPLOYED: Thu Jun 22 15:22:20 2023
NAMESPACE: ns2
STATUS: deployed
REVISION: 1
TEST SUITE: None

```

```bash
helm install seldon-v2-servers ../k8s/helm-charts/seldon-core-v2-servers -n ns1 --wait
```

```yaml
NAME: seldon-v2-servers
LAST DEPLOYED: Thu Jun 22 15:22:23 2023
NAMESPACE: ns1
STATUS: deployed
REVISION: 1
TEST SUITE: None

```

```bash
helm install seldon-v2-servers ../k8s/helm-charts/seldon-core-v2-servers -n ns2 --wait
```

```yaml
NAME: seldon-v2-servers
LAST DEPLOYED: Thu Jun 22 15:22:24 2023
NAMESPACE: ns2
STATUS: deployed
REVISION: 1
TEST SUITE: None

```

```bash
kubectl wait --for condition=ready --timeout=300s server --all -n ns1
```

```
server.mlops.seldon.io/mlserver condition met
server.mlops.seldon.io/triton condition met

```

```bash
kubectl wait --for condition=ready --timeout=300s server --all -n ns2
```

```
server.mlops.seldon.io/mlserver condition met
server.mlops.seldon.io/triton condition met

```

### Get Inference Endpoints

```python
Expand Down Expand Up @@ -426,7 +470,16 @@ model.mlops.seldon.io "tfsimple2" deleted
```

```bash
helm delete seldon-v2-runtime -n ns1
helm delete seldon-v2-servers -n ns1 --wait
```

```
release "seldon-v2-servers" uninstalled

```

```bash
helm delete seldon-v2-runtime -n ns1 --wait
```

```
Expand All @@ -435,7 +488,16 @@ release "seldon-v2-runtime" uninstalled
```

```bash
helm delete seldon-v2-runtime -n ns2
helm delete seldon-v2-servers -n ns2 --wait
```

```
release "seldon-v2-servers" uninstalled

```

```bash
helm delete seldon-v2-runtime -n ns2 --wait
```

```
Expand All @@ -452,6 +514,17 @@ release "seldon-v2" uninstalled

```

```bash
kubectl delete namespace ns1
kubectl delete namespace ns2
```

```
namespace "ns1" deleted
namespace "ns2" deleted

```

```python

```
Loading