diff --git a/Cargo.lock b/Cargo.lock index aeb7aeb6d..7089cc8c6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -222,7 +222,7 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "agent" -version = "0.13.1" +version = "0.13.2" dependencies = [ "akri-debug-echo", "akri-discovery-utils", @@ -252,6 +252,7 @@ dependencies = [ "serde_derive", "serde_json", "serde_yaml 0.8.26", + "simple-mermaid", "tempfile", "thiserror", "tokio", @@ -285,7 +286,7 @@ dependencies = [ [[package]] name = "akri-debug-echo" -version = "0.13.1" +version = "0.13.2" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -303,7 +304,7 @@ dependencies = [ [[package]] name = "akri-discovery-utils" -version = "0.13.1" +version = "0.13.2" dependencies = [ "akri-shared", "anyhow", @@ -325,7 +326,7 @@ dependencies = [ [[package]] name = "akri-onvif" -version = "0.13.1" +version = "0.13.2" dependencies = [ "akri-discovery-utils", "anyhow", @@ -354,7 +355,7 @@ dependencies = [ [[package]] name = "akri-opcua" -version = "0.13.1" +version = "0.13.2" dependencies = [ "akri-discovery-utils", "anyhow", @@ -373,7 +374,7 @@ dependencies = [ [[package]] name = "akri-shared" -version = "0.13.1" +version = "0.13.2" dependencies = [ "anyhow", "async-trait", @@ -398,7 +399,7 @@ dependencies = [ [[package]] name = "akri-udev" -version = "0.13.1" +version = "0.13.2" dependencies = [ "akri-discovery-utils", "anyhow", @@ -957,7 +958,7 @@ dependencies = [ [[package]] name = "controller" -version = "0.13.1" +version = "0.13.2" dependencies = [ "akri-shared", "anyhow", @@ -1131,7 +1132,7 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "debug-echo-discovery-handler" -version = "0.13.1" +version = "0.13.2" dependencies = [ "akri-debug-echo", "akri-discovery-utils", @@ -2416,7 +2417,7 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "onvif-discovery-handler" -version = "0.13.1" +version = "0.13.2" dependencies = [ "akri-discovery-utils", "akri-onvif", @@ -2465,7 +2466,7 @@ dependencies = [ [[package]] name = "opcua-discovery-handler" -version = "0.13.1" +version = "0.13.2" dependencies = [ "akri-discovery-utils", "akri-opcua", @@ -3408,6 +3409,12 @@ dependencies = [ "libc", ] +[[package]] +name = "simple-mermaid" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "620a1d43d70e142b1d46a929af51d44f383db9c7a2ec122de2cd992ccfcf3c18" + [[package]] name = "slab" version = "0.4.9" @@ -3936,7 +3943,7 @@ dependencies = [ [[package]] name = "udev-discovery-handler" -version = "0.13.1" +version = "0.13.2" dependencies = [ "akri-discovery-utils", "akri-udev", @@ -3947,7 +3954,7 @@ dependencies = [ [[package]] name = "udev-video-broker" -version = "0.13.1" +version = "0.13.2" dependencies = [ "akri-shared", "env_logger", @@ -4210,7 +4217,7 @@ dependencies = [ [[package]] name = "webhook-configuration" -version = "0.13.1" +version = "0.13.2" dependencies = [ "actix-rt", "actix-web", diff --git a/agent/Cargo.toml b/agent/Cargo.toml index ad389ad13..0f17226ad 100644 --- a/agent/Cargo.toml +++ b/agent/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "agent" -version = "0.13.1" +version = "0.13.2" license = "Apache-2.0" authors = ["Kate Goldenring ", ""] edition = "2021" @@ -35,6 +35,7 @@ serde = "1.0.104" serde_derive = "1.0.104" serde_json = "1.0.45" serde_yaml = { version = "0.8.11", optional = true } +simple-mermaid = "0.1" # used for docs thiserror = "1.0.50" tokio = { version = "1.0", features = ["rt-multi-thread", "time", "fs", "macros", "net"] } tokio-stream = { version = "0.1", features = ["net", "sync"] } @@ -65,4 +66,4 @@ default = [] onvif-feat = [ "akri-onvif"] opcua-feat = ["akri-opcua"] udev-feat = ["akri-udev"] -agent-full = ["serde_yaml", "akri-debug-echo"] +agent-full = ["serde_yaml", "akri-debug-echo"] \ No newline at end of file diff --git a/agent/src/discovery_handler_manager/diagrams/dh_device.mmd b/agent/src/discovery_handler_manager/diagrams/dh_device.mmd new file mode 100644 index 000000000..a4d0c9e7f --- /dev/null +++ b/agent/src/discovery_handler_manager/diagrams/dh_device.mmd @@ -0,0 +1,14 @@ +sequenceDiagram + Discovery Handler ->> DiscoveryHandlerRequest: send discovered devices + DiscoveryHandlerRequest ->> DiscoveryHandlerRequest: Updates aggregated list of discovered devices + DiscoveryHandlerRequest -) Device Manager: Notifies and updates list of discovered devices + DiscoveryHandlerRequest -) Configuration Controller: Requests reconciliation of Configuration linked to Request + note over Configuration Controller: The following is Configuration Controller behavior + activate Configuration Controller + Configuration Controller ->> Configuration Controller: Reconcile Configuration + Configuration Controller ->> DiscoveryHandlerRegistry: get_request() + DiscoveryHandlerRegistry ->> Configuration Controller: + Configuration Controller ->> DiscoveryHandlerRequest: get_instances() + DiscoveryHandlerRequest ->> Configuration Controller: Returns list of discovered devices as bare Instances + Configuration Controller ->> Kubernetes API: Apply Instances + deactivate Configuration Controller \ No newline at end of file diff --git a/agent/src/discovery_handler_manager/diagrams/dh_query.mmd b/agent/src/discovery_handler_manager/diagrams/dh_query.mmd new file mode 100644 index 000000000..1ef3548a4 --- /dev/null +++ b/agent/src/discovery_handler_manager/diagrams/dh_query.mmd @@ -0,0 +1,18 @@ +sequenceDiagram + Configuration Controller -) DiscoveryHandlerRegistry: new_request() + alt a Handler exists for the Request + DiscoveryHandlerRegistry ->> DiscoveryHandlerRequest: Creates with filtered list of endpoints + DiscoveryHandlerRegistry ->> DiscoveryHandlerRegistry: Add request to tracked request list + loop over DiscoveryHandlerEndpoints with this name + DiscoveryHandlerRequest ->>+ Kubernetes API: Solve discovery properties + Kubernetes API ->>- DiscoveryHandlerRequest: + DiscoveryHandlerRequest ->>+ Discovery Handler: query discovery handler + loop + Discovery Handler ->> DiscoveryHandlerRequest: send discovered devices + note over DiscoveryHandlerRequest,DiscoveryHandlerRegistry: See other diagram for what happens here + end + deactivate Discovery Handler + end + else + DiscoveryHandlerRegistry -x Configuration Controller: DiscoveryError::NoHandler + end \ No newline at end of file diff --git a/agent/src/discovery_handler_manager/diagrams/dh_registration.mmd b/agent/src/discovery_handler_manager/diagrams/dh_registration.mmd new file mode 100644 index 000000000..cf6f3a0ae --- /dev/null +++ b/agent/src/discovery_handler_manager/diagrams/dh_registration.mmd @@ -0,0 +1,20 @@ +sequenceDiagram + Discovery Handler ->> Registration endpoint: Registers + Registration endpoint->> DiscoveryHandlerRegistry: register_endpoint() + DiscoveryHandlerRegistry ->> DiscoveryHandlerRegistry: Add endpoint to registered handlers list + DiscoveryHandlerRegistry ->> DiscoveryHandlerRequest: notify all DiscoveryHandlerRequest + alt Discovery Handler name is the same as in Request + DiscoveryHandlerRequest ->>+ Kubernetes API: Solve discovery properties + Kubernetes API ->>- DiscoveryHandlerRequest: + DiscoveryHandlerRequest ->>+ Discovery Handler: query discovery handler + loop + Discovery Handler ->> DiscoveryHandlerRequest: send discovered devices + note over DiscoveryHandlerRequest,DiscoveryHandlerRegistry: See other diagram for what happens here + end + deactivate Discovery Handler + end + break on Discovery Handler connection error + Registration endpoint -x DiscoveryHandlerRegistry: close endpoint + DiscoveryHandlerRegistry ->> DiscoveryHandlerRegistry: Remove endpoint from registered handlers list + note over DiscoveryHandlerRequest,Discovery Handler: The DiscoveryHandlerRequest request will handle termination by itself + end \ No newline at end of file diff --git a/agent/src/discovery_handler_manager/discovery_handler_registry.rs b/agent/src/discovery_handler_manager/discovery_handler_registry.rs index c8c558cda..27c34466e 100644 --- a/agent/src/discovery_handler_manager/discovery_handler_registry.rs +++ b/agent/src/discovery_handler_manager/discovery_handler_registry.rs @@ -1,3 +1,22 @@ +//! This module is the heart of the discovery process handled by the agent, it is based around the [DiscoveryHandlerRegistry] +//! and uses several other structure to represent and help handle discovery related operations. +//! +//! The [DiscoveryHandlerRegistry] keeps track of registered discovery handlers. Note, multiple endpoints/instances of a given +//! handler can be registered at the same time. +//! +//! The [DiscoveryHandlerRegistry] also keeps track of ongoing discovery requests against those discovery handlers. There is one discovery request (a [DiscoveryHandlerRequest] object) per Configuration. +//! +//! Here are some simple diagrams showing how the components interact with each other in different situations: +//! +//! A new DiscoverHandler gets registered (after it connects to and registers with the agent registration Unix socket): +#![doc=simple_mermaid::mermaid!("diagrams/dh_registration.mmd")] +//! +//! A new query is made by the Configuration Controller: +#![doc=simple_mermaid::mermaid!("diagrams/dh_query.mmd")] +//! +//! A Discovery Handler's instance/endpoint sends a new list of discovered devices for a Request: +#![doc=simple_mermaid::mermaid!("diagrams/dh_device.mmd")] + use std::collections::HashMap; use std::sync::Arc; diff --git a/build/containers/Dockerfile.rust b/build/containers/Dockerfile.rust index 440d98943..40d742278 100644 --- a/build/containers/Dockerfile.rust +++ b/build/containers/Dockerfile.rust @@ -24,10 +24,7 @@ ARG AKRI_COMPONENT RUN PROFILE=$(echo "${EXTRA_CARGO_ARGS}" | grep -q -- --release && echo "release" || echo "debug"); \ xx-verify ./target/$(xx-cargo --print-target-triple)/${PROFILE}/${AKRI_COMPONENT}\ && cp ./target/$(xx-cargo --print-target-triple)/${PROFILE}/${AKRI_COMPONENT} /build/bin/akri -# Prepare crictl for agent -RUN VERSION=v1.25.0; if [ "x${AKRI_COMPONENT}" = "xagent" ]; then wget \ - "https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION/crictl-$VERSION-linux-$(xx-info arch).tar.gz" -O crictl.tar.gz\ - && tar zxvf crictl.tar.gz -C /build/bin; fi + FROM scratch diff --git a/controller/Cargo.toml b/controller/Cargo.toml index 797bb7608..49dd56ed6 100644 --- a/controller/Cargo.toml +++ b/controller/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "controller" -version = "0.13.1" +version = "0.13.2" license = "Apache-2.0" authors = ["", ""] edition = "2021" diff --git a/deployment/helm/Chart.yaml b/deployment/helm/Chart.yaml index d13312bd5..ccba21ab6 100644 --- a/deployment/helm/Chart.yaml +++ b/deployment/helm/Chart.yaml @@ -16,9 +16,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.13.1 +version: 0.13.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 0.13.1 +appVersion: 0.13.2 diff --git a/deployment/helm/templates/agent.yaml b/deployment/helm/templates/agent.yaml index 113abf1a3..070cc31a1 100644 --- a/deployment/helm/templates/agent.yaml +++ b/deployment/helm/templates/agent.yaml @@ -67,12 +67,6 @@ spec: - name: DEBUG_ECHO_INSTANCES_SHARED value: {{ .Values.debugEcho.configuration.shared | quote }} {{- end }} - - name: HOST_CRICTL_PATH - value: /usr/local/bin/crictl - - name: HOST_RUNTIME_ENDPOINT - value: unix:///host/run/containerd/containerd.sock - - name: HOST_IMAGE_ENDPOINT - value: unix:///host/run/containerd/containerd.sock - name: AGENT_NODE_NAME valueFrom: fieldRef: @@ -86,8 +80,6 @@ spec: mountPath: /var/lib/kubelet/device-plugins - name: pod-resources mountPath: /var/lib/kubelet/pod-resources - - name: var-run-dockershim - mountPath: /host/run/containerd/containerd.sock {{- if .Values.agent.host.udev }} - name: devices mountPath: /run/udev @@ -111,23 +103,6 @@ spec: - name: pod-resources hostPath: path: "{{ .Values.agent.host.kubeletPodResources }}" - - name: var-run-dockershim - hostPath: - {{- if ne "" .Values.agent.host.containerRuntimeSocket }} - path: {{.Values.agent.host.containerRuntimeSocket }} - {{- else if eq .Values.kubernetesDistro "microk8s" }} - path: "/var/snap/microk8s/common/run/containerd.sock" - {{- else if eq .Values.kubernetesDistro "k3s" }} - path: "/run/k3s/containerd/containerd.sock" - {{- else if eq .Values.kubernetesDistro "k8s" }} - path: "/run/containerd/containerd.sock" - {{- else }} - # Please set container runtime socket by either selecting the appropriate K8s distro `kubernetesDistro=` - # or setting `agent.host.containerRuntimeSocket=/container/runtime.sock`. - # See https://docs.akri.sh/user-guide/cluster-setup for more information. - # Using K8s default "/run/containerd/containerd.sock" for now. - path: "/run/containerd/containerd.sock" - {{- end }} {{- if .Values.agent.host.udev }} - name: devices hostPath: diff --git a/deployment/helm/values.yaml b/deployment/helm/values.yaml index d4dc45576..f7ebb54b3 100644 --- a/deployment/helm/values.yaml +++ b/deployment/helm/values.yaml @@ -16,10 +16,6 @@ useDevelopmentContainers: true # This can be set from the helm command line using `--set imagePullSecrets[0].name="mysecret"` imagePullSecrets: [] -# kubernetesDistro describes the Kubernetes distro Akri is running on. It is used to conditionally set -# distribution specific values such as container runtime socket. Options: microk8s | k3s | k8s -kubernetesDistro: "" - # generalize references to `apiGroups` and `apiVersion` values for Akri CRDs crds: group: akri.sh @@ -109,11 +105,6 @@ agent: kubeletDevicePlugins: /var/lib/kubelet/device-plugins # kubeletPodResources is the location of the kubelet pod-resources socket kubeletPodResources: /var/lib/kubelet/pod-resources - # containerRuntimeSocket is the default node path of the container runtime socket. - # For MicroK8s, set to "/var/snap/microk8s/common/run/containerd.sock" - # For K3s, set to "/run/k3s/containerd/containerd.sock" - # For standard K8s, set to "/run/containerd/containerd.sock" - containerRuntimeSocket: "" # udev is the node path of udev, usually at `/run/udev` udev: # allowDebugEcho dictates whether the Akri Agent will allow DebugEcho Configurations diff --git a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml index 0960793e2..ed8a982d9 100644 --- a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "debug-echo-discovery-handler" -version = "0.13.1" +version = "0.13.2" license = "Apache-2.0" authors = ["Kate Goldenring "] edition = "2021" diff --git a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml index 2f1ffa7b4..276640dde 100644 --- a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "onvif-discovery-handler" -version = "0.13.1" +version = "0.13.2" license = "Apache-2.0" authors = ["Kate Goldenring "] edition = "2021" diff --git a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml index d4fcb8a6e..f0565eaea 100644 --- a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "opcua-discovery-handler" -version = "0.13.1" +version = "0.13.2" license = "Apache-2.0" authors = ["Kate Goldenring "] edition = "2021" diff --git a/discovery-handler-modules/udev-discovery-handler/Cargo.toml b/discovery-handler-modules/udev-discovery-handler/Cargo.toml index 598ec0f0f..24d6a152d 100644 --- a/discovery-handler-modules/udev-discovery-handler/Cargo.toml +++ b/discovery-handler-modules/udev-discovery-handler/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "udev-discovery-handler" -version = "0.13.1" +version = "0.13.2" license = "Apache-2.0" authors = ["Kate Goldenring "] edition = "2021" diff --git a/discovery-handlers/debug-echo/Cargo.toml b/discovery-handlers/debug-echo/Cargo.toml index 3baf0e875..92f9539f3 100644 --- a/discovery-handlers/debug-echo/Cargo.toml +++ b/discovery-handlers/debug-echo/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-debug-echo" -version = "0.13.1" +version = "0.13.2" license = "Apache-2.0" authors = ["Kate Goldenring "] edition = "2021" diff --git a/discovery-handlers/onvif/Cargo.toml b/discovery-handlers/onvif/Cargo.toml index 0be685c3b..89a90015f 100644 --- a/discovery-handlers/onvif/Cargo.toml +++ b/discovery-handlers/onvif/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-onvif" -version = "0.13.1" +version = "0.13.2" license = "Apache-2.0" authors = ["Kate Goldenring "] edition = "2021" diff --git a/discovery-handlers/opcua/Cargo.toml b/discovery-handlers/opcua/Cargo.toml index 7e58a1ce7..98a7a79b7 100644 --- a/discovery-handlers/opcua/Cargo.toml +++ b/discovery-handlers/opcua/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-opcua" -version = "0.13.1" +version = "0.13.2" license = "Apache-2.0" authors = ["Kate Goldenring "] edition = "2021" diff --git a/discovery-handlers/udev/Cargo.toml b/discovery-handlers/udev/Cargo.toml index ff8d9399b..26faf7288 100644 --- a/discovery-handlers/udev/Cargo.toml +++ b/discovery-handlers/udev/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-udev" -version = "0.13.1" +version = "0.13.2" license = "Apache-2.0" authors = ["Kate Goldenring "] edition = "2021" diff --git a/discovery-utils/Cargo.toml b/discovery-utils/Cargo.toml index 62f805ccd..56d8d9ece 100644 --- a/discovery-utils/Cargo.toml +++ b/discovery-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-discovery-utils" -version = "0.13.1" +version = "0.13.2" license = "Apache-2.0" authors = ["Kate Goldenring "] edition = "2021" diff --git a/samples/brokers/udev-video-broker/Cargo.toml b/samples/brokers/udev-video-broker/Cargo.toml index 412827b5f..71b9da717 100644 --- a/samples/brokers/udev-video-broker/Cargo.toml +++ b/samples/brokers/udev-video-broker/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "udev-video-broker" -version = "0.13.1" +version = "0.13.2" license = "Apache-2.0" authors = ["Kate Goldenring ", ""] edition = "2021" diff --git a/scripts/end_to_end_microk8s_demo.sh b/scripts/end_to_end_microk8s_demo.sh index f2df8f73d..dbd7c4aa6 100644 --- a/scripts/end_to_end_microk8s_demo.sh +++ b/scripts/end_to_end_microk8s_demo.sh @@ -10,8 +10,6 @@ echo "--allow-privileged=true" | sudo tee -a /var/snap/microk8s/current/args/kub sudo microk8s stop && microk8s start -KUBERNETES_DISTRO="--set kubernetesDistro=microk8s" - sudo apt update sudo apt -y install linux-modules-extra-$(uname -r) sudo apt -y install dkms @@ -30,7 +28,6 @@ sudo gst-launch-1.0 -v videotestsrc pattern=smpte horizontal-speed=1 ! "video/x- sudo microk8s.helm3 repo add akri-helm-charts https://project-akri.github.io/akri/ sudo microk8s.helm3 install akri akri-helm-charts/akri-dev \ - $KUBERNETES_DISTRO \ --set useLatestContainers=true \ --set udev.enabled=true \ --set udev.name=akri-udev-video \ diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 0b5501161..67deee2ed 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-shared" -version = "0.13.1" +version = "0.13.2" license = "Apache-2.0" authors = [""] edition = "2021" diff --git a/test/e2e/conftest.py b/test/e2e/conftest.py index 4a4af0f45..5cf56c547 100644 --- a/test/e2e/conftest.py +++ b/test/e2e/conftest.py @@ -19,35 +19,9 @@ def pytest_addoption(parser): parser.addoption("--release", action="store_true", help="use released helm chart") -@dataclass -class Distribution: - name: str - kubeconfig: Path - kubectl: str - - -@pytest.fixture(scope="session") -def distribution_config(pytestconfig): - distribution = pytestconfig.getoption("--distribution", None) - if distribution == "k3s": - yield Distribution("k3s", Path.home() / ".kube/config", "kubectl") - elif distribution == "k8s": - yield Distribution("k8s", Path.home() / ".kube/config", "kubectl") - elif distribution == "microk8s": - yield Distribution("microk8s", Path.home() / ".kube/config", "kubectl") - elif distribution is None: - pytest.exit( - "Please provide a kubernetes distribution via '--distribution' flag" - ) - else: - pytest.exit( - "Wrong distribution provided, valid values are 'k3s', 'k8s' or 'microk8s'" - ) - - @pytest.fixture(scope="session", autouse=True) -def kube_client(distribution_config): - kubernetes.config.load_kube_config(str(distribution_config.kubeconfig)) +def kube_client(): + kubernetes.config.load_kube_config(str(Path.home() / ".kube/config")) return kubernetes.client.ApiClient() @@ -61,7 +35,7 @@ def akri_version(pytestconfig): @pytest.fixture(scope="module", autouse=True) -def install_akri(request, distribution_config, pytestconfig, akri_version): +def install_akri(request, pytestconfig, akri_version): discovery_handlers = getattr(request.module, "discovery_handlers", []) release = pytestconfig.getoption("--release", False) @@ -116,8 +90,6 @@ def install_akri(request, distribution_config, pytestconfig, akri_version): ) helm_install_command.extend( [ - "--set", - f"kubernetesDistro={distribution_config.name}", "--debug", "--atomic", ] diff --git a/version.sh b/version.sh index 38ef6dba1..9c97f5e8c 100755 --- a/version.sh +++ b/version.sh @@ -145,7 +145,7 @@ if [ "$CHECK" == "1" ]; then if [ "$?" -eq "1" ]; then exit 1; fi CRD_FILES="$BASEDIR/deployment/helm/crds/akri-configuration-crd.yaml $BASEDIR/deployment/helm/crds/akri-instance-crd.yaml" - CRD_VERSION_PATTERN="^ - name: " + CRD_VERSION_PATTERN="^ [- ] name: " for CRD_FILE in $CRD_FILES do check_file_version "$CRD_FILE" "$CRD_VERSION_PATTERN" "$CRD_VERSION" diff --git a/version.txt b/version.txt index c317a9189..9beb74d49 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.13.1 +0.13.2 diff --git a/webhooks/validating/configuration/Cargo.toml b/webhooks/validating/configuration/Cargo.toml index 054257ab9..b4577ab21 100644 --- a/webhooks/validating/configuration/Cargo.toml +++ b/webhooks/validating/configuration/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "webhook-configuration" -version = "0.13.1" +version = "0.13.2" license = "Apache-2.0" authors = ["DazWilkin "] edition = "2021"