Skip to content

Commit

Permalink
Merge pull request #14 from kate-goldenring/latest-containers
Browse files Browse the repository at this point in the history
Replace final references of Deis Labs
  • Loading branch information
kate-goldenring authored Oct 29, 2021
2 parents 5936fa1 + 769a616 commit a5f997e
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 23 deletions.
10 changes: 5 additions & 5 deletions docs/demos/opc-thermometer-demo.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ Now, we must create some OPC UA Servers to discover. Instead of starting from sc
--set opcua.discovery.enabled=true \
--set opcua.configuration.enabled=true \
--set opcua.configuration.name=akri-opcua-monitoring \
--set opcua.configuration.brokerPod.image.repository="ghcr.io/deislabs/akri/opcua-monitoring-broker" \
--set opcua.configuration.brokerPod.image.repository="ghcr.io/project-akri/akri/opcua-monitoring-broker" \
--set opcua.configuration.brokerProperties.IDENTIFIER='Thermometer_Temperature' \
--set opcua.configuration.brokerProperties.NAMESPACE_INDEX='2' \
--set opcua.configuration.discoveryDetails.discoveryUrls[0]="opc.tcp://<SomeServer0 IP address>:<SomeServer0 port>/Quickstarts/ReferenceServer/" \
Expand Down Expand Up @@ -268,7 +268,7 @@ To see how Akri easily scales as nodes are added to the cluster, add another nod
--set opcua.discovery.enabled=true \
--set opcua.configuration.enabled=true \
--set opcua.configuration.name=akri-opcua-monitoring \
--set opcua.configuration.brokerPod.image.repository="ghcr.io/deislabs/akri/opcua-monitoring-broker" \
--set opcua.configuration.brokerPod.image.repository="ghcr.io/project-akri/akri/opcua-monitoring-broker" \
--set opcua.configuration.brokerProperties.IDENTIFIER='Thermometer_Temperature' \
--set opcua.configuration.brokerProperties.NAMESPACE_INDEX='2' \
--set opcua.configuration.discoveryDetails.discoveryUrls[0]="opc.tcp://<SomeServer0 IP address>:<SomeServer0 port>/Quickstarts/ReferenceServer/" \
Expand Down Expand Up @@ -321,7 +321,7 @@ helm install akri akri-helm-charts/akri \
--set opcua.discovery.enabled=true \
--set opcua.configuration.enabled=true \
--set opcua.configuration.name=akri-opcua-monitoring \
--set opcua.configuration.brokerPod.image.repository="ghcr.io/deislabs/akri/opcua-monitoring-broker" \
--set opcua.configuration.brokerPod.image.repository="ghcr.io/project-akri/akri/opcua-monitoring-broker" \
--set opcua.configuration.brokerProperties.IDENTIFIER='Thermometer_Temperature' \
--set opcua.configuration.brokerProperties.NAMESPACE_INDEX='2' \
--set opcua.configuration.discoveryDetails.discoveryUrls[0]="opc.tcp://<Windows host IP address>:4840/" \
Expand Down Expand Up @@ -350,7 +350,7 @@ helm install akri akri-helm-charts/akri \
--set opcua.discovery.enabled=true \
--set opcua.configuration.enabled=true \
--set opcua.configuration.name=akri-opcua-monitoring \
--set opcua.configuration.brokerPod.image.repository="ghcr.io/deislabs/akri/opcua-monitoring-broker" \
--set opcua.configuration.brokerPod.image.repository="ghcr.io/project-akri/akri/opcua-monitoring-broker" \
--set opcua.configuration.brokerProperties.IDENTIFIER='Thermometer_Temperature' \
--set opcua.configuration.brokerProperties.NAMESPACE_INDEX='2' \
--set opcua.configuration.discoveryDetails.discoveryUrls[0]="opc.tcp://<Windows host IP address>:4840/" \
Expand All @@ -369,7 +369,7 @@ helm install akri akri-helm-charts/akri \
--set opcua.discovery.enabled=true \
--set opcua.configuration.enabled=true \
--set opcua.configuration.name=akri-opcua-monitoring \
--set opcua.configuration.brokerPod.image.repository="ghcr.io/deislabs/akri/opcua-monitoring-broker" \
--set opcua.configuration.brokerPod.image.repository="ghcr.io/project-akri/akri/opcua-monitoring-broker" \
--set opcua.configuration.brokerProperties.IDENTIFIER='Thermometer_Temperature' \
--set opcua.configuration.brokerProperties.NAMESPACE_INDEX='2' \
--set opcua.configuration.discoveryDetails.discoveryUrls[0]="opc.tcp://<Windows host IP address>:4840/" \
Expand Down
6 changes: 3 additions & 3 deletions docs/demos/usb-camera-demo-rpi4.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ In order for the Agent to know how to discover video devices, the udev Discovery
--set udev.configuration.enabled=true \
--set udev.configuration.name=akri-udev-video \
--set udev.configuration.discoveryDetails.udevRules[0]='KERNEL=="video[0-9]*"' \
--set udev.configuration.brokerPod.image.repository="ghcr.io/deislabs/akri/udev-video-broker"
--set udev.configuration.brokerPod.image.repository="ghcr.io/project-akri/akri/udev-video-broker"
```

## Inspecting Akri
Expand Down Expand Up @@ -205,7 +205,7 @@ Look at the Configuration and Instances in more detail.
--set udev.configuration.enabled=true \
--set udev.configuration.name=akri-udev-video \
--set udev.configuration.discoveryDetails.udevRules[0]='KERNEL=="video[0-9]*"\, ENV{ID_VENDOR}=="Microsoft"' \
--set udev.configuration.brokerPod.image.repository="ghcr.io/deislabs/akri/udev-video-broker"
--set udev.configuration.brokerPod.image.repository="ghcr.io/project-akri/akri/udev-video-broker"
```

As another example, to make sure that the camera has a capture capability rather than just being a video output device, modify the udev rule as follows:
Expand All @@ -217,6 +217,6 @@ Look at the Configuration and Instances in more detail.
--set udev.configuration.enabled=true \
--set udev.configuration.name=akri-udev-video \
--set udev.configuration.discoveryDetails.udevRules[0]='KERNEL=="video[0-9]*"\, ENV{ID_V4L_CAPABILITIES}=="*:capture:*"' \
--set udev.configuration.brokerPod.image.repository="ghcr.io/deislabs/akri/udev-video-broker"
--set udev.configuration.brokerPod.image.repository="ghcr.io/project-akri/akri/udev-video-broker"
```
5. Discover other udev devices by creating a new udev configuration and broker. Learn more about the udev Discovery Handler Configuration [here](../discovery-handlers/udev.md).
6 changes: 3 additions & 3 deletions docs/demos/usb-camera-demo.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ In order for the Agent to know how to discover video devices, the udev Discovery
--set udev.configuration.enabled=true \
--set udev.configuration.name=akri-udev-video \
--set udev.configuration.discoveryDetails.udevRules[0]='KERNEL=="video[0-9]*"' \
--set udev.configuration.brokerPod.image.repository="ghcr.io/deislabs/akri/udev-video-broker"
--set udev.configuration.brokerPod.image.repository="ghcr.io/project-akri/akri/udev-video-broker"
```

## Inspecting Akri
Expand Down Expand Up @@ -267,7 +267,7 @@ After installing Akri, since the /dev/video1 and /dev/video2 devices are running
--set udev.configuration.enabled=true \
--set udev.configuration.name=akri-udev-video \
--set udev.configuration.discoveryDetails.udevRules[0]='KERNEL=="video[0-9]*"\, ENV{ID_VENDOR}=="Microsoft"' \
--set udev.configuration.brokerPod.image.repository="ghcr.io/deislabs/akri/udev-video-broker"
--set udev.configuration.brokerPod.image.repository="ghcr.io/project-akri/akri/udev-video-broker"
```

As another example, to make sure that the camera has a capture capability rather than just being a video output device, modify the udev rule as follows:
Expand All @@ -279,7 +279,7 @@ After installing Akri, since the /dev/video1 and /dev/video2 devices are running
--set udev.configuration.enabled=true \
--set udev.configuration.name=akri-udev-video \
--set udev.configuration.discoveryDetails.udevRules[0]='KERNEL=="video[0-9]*"\, ENV{ID_V4L_CAPABILITIES}=="*:capture:*"' \
--set udev.configuration.brokerPod.image.repository="ghcr.io/deislabs/akri/udev-video-broker"
--set udev.configuration.brokerPod.image.repository="ghcr.io/project-akri/akri/udev-video-broker"
```
5. Discover other udev devices by creating a new udev configuration and broker. Learn more about the udev Discovery Handler Configuration [here](../discovery-handlers/udev.md).

Expand Down
8 changes: 4 additions & 4 deletions docs/development/broker-development.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ The default broker Pod memory and CPU resource request and limits in Akri's Helm
| Discovery Handler | Akri Sample Broker Pod image | Description |
| :--- | :--- | :--- |
| debugEcho | `nginx:stable-alpine` | standard nginx image for testing |
| ONVIF | `ghcr.io/deislabs/akri/onvif-video-broker:latest` | .NET camera frame server |
| OPC UA | `ghcr.io/deislabs/akri/opcua-monitoring-broker:latest` | .Net App subscribes to specific NodeID and serves latest value |
| udev | `ghcr.io/deislabs/akri/udev-video-broker:latest` | Rust camera frame server |
| ONVIF | `ghcr.io/project-akri/akri/onvif-video-broker:latest` | .NET camera frame server |
| OPC UA | `ghcr.io/project-akri/akri/opcua-monitoring-broker:latest` | .Net App subscribes to specific NodeID and serves latest value |
| udev | `ghcr.io/project-akri/akri/udev-video-broker:latest` | Rust camera frame server |

The limit and request bounds were obtained using Kubernetes' [Vertical Pod Autoscaler (VPA)](https://github.com/kubernetes/autoscaler/tree/master/vertical-pod-autoscaler). You should choose bounds appropriate to your broker Pod. [This blog](https://pretired.dazwilkin.com/posts/210305/#vertical-pod-autoscaler-vpa) is a good starting point for learning how to use the VPA to choose bounds.

Expand All @@ -76,7 +76,7 @@ You can request that additional environment variables are set in Pods that reque
--set udev.configuration.enabled=true \
--set udev.configuration.name=akri-udev-video \
--set udev.configuration.discoveryDetails.udevRules[0]='KERNEL=="video[0-9]*"' \
--set udev.configuration.brokerPod.image.repository="ghcr.io/deislabs/akri/udev-video-broker" \
--set udev.configuration.brokerPod.image.repository="ghcr.io/project-akri/akri/udev-video-broker" \
--set udev.configuration.brokerProperties.FORMAT='JPEG' \
--set udev.configuration.brokerProperties.RESOLUTION_WIDTH='1000' \
--set udev.configuration.brokerProperties.RESOLUTION_HEIGHT='800'
Expand Down
10 changes: 5 additions & 5 deletions docs/discovery-handlers/onvif.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Discovery Handlers are passed discovery details that are set in a Configuration

### Broker Pod Settings

If you would like workloads ("broker" Pods) to be deployed automatically to discovered cameras, a broker image should be specified in the Configuration. Alternatively, if it meets your scenario, you could use the Akri frame server broker ("ghcr.io/deislabs/akri/onvif-video-broker"). If you would rather manually deploy pods to utilize the cameras advertized by Akri, don't specify a broker pod and see our documentation on [requesting resources advertized by Akri](../user-guide/requesting-akri-resources.md).
If you would like workloads ("broker" Pods) to be deployed automatically to discovered cameras, a broker image should be specified in the Configuration. Alternatively, if it meets your scenario, you could use the Akri frame server broker ("ghcr.io/project-akri/akri/onvif-video-broker"). If you would rather manually deploy pods to utilize the cameras advertized by Akri, don't specify a broker pod and see our documentation on [requesting resources advertized by Akri](../user-guide/requesting-akri-resources.md).

| Helm Key | Value | Default | Description |
| :--- | :--- | :--- | :--- |
Expand Down Expand Up @@ -74,7 +74,7 @@ helm install akri akri-helm-charts/akri \
$AKRI_HELM_CRICTL_CONFIGURATION \
--set onvif.discovery.enabled=true \
--set onvif.configuration.enabled=true \
--set onvif.configuration.brokerPod.image.repository="ghcr.io/deislabs/akri/onvif-video-broker" \
--set onvif.configuration.brokerPod.image.repository="ghcr.io/project-akri/akri/onvif-video-broker" \
--set onvif.configuration.brokerPod.image.tag="latest"
```

Expand All @@ -97,7 +97,7 @@ helm install akri akri-helm-charts/akri \
$AKRI_HELM_CRICTL_CONFIGURATION \
--set onvif.discovery.enabled=true \
--set onvif.configuration.enabled=true \
--set onvif.configuration.brokerPod.image.repository="ghcr.io/deislabs/akri/onvif-video-broker" \
--set onvif.configuration.brokerPod.image.repository="ghcr.io/project-akri/akri/onvif-video-broker" \
--set onvif.configuration.discoveryDetails.ipAddresses.action=Exclude \
--set onvif.configuration.discoveryDetails.ipAddresses.items[0]=10.0.0.1
```
Expand All @@ -110,7 +110,7 @@ helm install akri akri-helm-charts/akri \
$AKRI_HELM_CRICTL_CONFIGURATION \
--set onvif.discovery.enabled=true \
--set onvif.configuration.enabled=true \
--set onvif.configuration.brokerPod.image.repository="ghcr.io/deislabs/akri/onvif-video-broker" \
--set onvif.configuration.brokerPod.image.repository="ghcr.io/project-akri/akri/onvif-video-broker" \
--set onvif.configuration.discoveryDetails.scopes.action=Include \
--set onvif.configuration.discoveryDetails.scopes.items[0]="onvif://www.onvif.configuration.org/name/GreatONVIFCamera" \
--set onvif.configuration.discoveryDetails.scopes.items[1]="onvif://www.onvif.configuration.org/name/AwesomeONVIFCamera"
Expand All @@ -126,7 +126,7 @@ helm install akri akri-helm-charts/akri \
$AKRI_HELM_CRICTL_CONFIGURATION \
--set onvif.discovery.enabled=true \
--set onvif.configuration.enabled=true \
--set onvif.configuration.brokerPod.image.repository="ghcr.io/deislabs/akri/onvif-video-broker" \
--set onvif.configuration.brokerPod.image.repository="ghcr.io/project-akri/akri/onvif-video-broker" \
--set onvif.configuration.discoveryDetails.discoveryTimeoutSeconds=2
```

Expand Down
2 changes: 1 addition & 1 deletion docs/discovery-handlers/opc-ua.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ The generic OPC UA Configuration takes in a list of DiscoveryURLs, whether for L

### Broker Pod Settings

If you would like workloads ("broker" Pods) to be deployed automatically to discovered devices, a broker image should be specified in the Configuration. Alternatively, if it meets your scenario, you could use the Akri frame server broker ("ghcr.io/deislabs/akri/opcua-video-broker"). If you would rather manually deploy pods to utilize the devices advertized by Akri, don't specify a broker pod and see our documentation on [requesting resources advertized by Akri](../user-guide/requesting-akri-resources.md).
If you would like workloads ("broker" Pods) to be deployed automatically to discovered devices, a broker image should be specified in the Configuration. Alternatively, if it meets your scenario, you could use the Akri frame server broker ("ghcr.io/project-akri/akri/opcua-video-broker"). If you would rather manually deploy pods to utilize the devices advertized by Akri, don't specify a broker pod and see our documentation on [requesting resources advertized by Akri](../user-guide/requesting-akri-resources.md).

| Helm Key | Value | Default | Description |
| :--- | :--- | :--- | :--- |
Expand Down
2 changes: 1 addition & 1 deletion docs/discovery-handlers/udev.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ While udev rules are normally used to both find devices and perform actions on d

### Broker Pod Settings

If you would like workloads ("broker" Pods) to be deployed automatically to discovered cameras, a broker image should be specified in the Configuration. Alternatively, if it meets your scenario, you could use the Akri frame server broker ("ghcr.io/deislabs/akri/udev-video-broker"). If you would rather manually deploy pods to utilize the cameras advertized by Akri, don't specify a broker pod and see our documentation on [requesting resources advertized by Akri](../user-guide/requesting-akri-resources.md).
If you would like workloads ("broker" Pods) to be deployed automatically to discovered cameras, a broker image should be specified in the Configuration. Alternatively, if it meets your scenario, you could use the Akri frame server broker ("ghcr.io/project-akri/akri/udev-video-broker"). If you would rather manually deploy pods to utilize the cameras advertized by Akri, don't specify a broker pod and see our documentation on [requesting resources advertized by Akri](../user-guide/requesting-akri-resources.md).

| Helm Key | Value | Default | Description |
| :--- | :--- | :--- | :--- |
Expand Down
2 changes: 1 addition & 1 deletion docs/user-guide/monitoring-with-prometheus.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ As an example, an `akri_frame_count` metric has been created in the sample [udev
--set udev.enabled=true \
--set udev.name=akri-udev-video \
--set udev.udevRules[0]='KERNEL=="video[0-9]*"' \
--set udev.brokerPod.image.repository="ghcr.io/deislabs/akri/udev-video-broker"
--set udev.brokerPod.image.repository="ghcr.io/project-akri/akri/udev-video-broker"
```

> **Note**: This instruction assumes you are using vanilla Kubernetes. Be sure to reference the user guide to determine whether the distribution you are using requires crictl path configuration.
Expand Down

0 comments on commit a5f997e

Please sign in to comment.