diff --git a/Cargo.lock b/Cargo.lock index f0896a718..b034d0018 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -311,7 +311,7 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "agent" -version = "0.4.6" +version = "0.5.0" dependencies = [ "akri-debug-echo", "akri-discovery-utils", @@ -376,7 +376,7 @@ dependencies = [ [[package]] name = "akri-debug-echo" -version = "0.4.6" +version = "0.5.0" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -395,7 +395,7 @@ dependencies = [ [[package]] name = "akri-discovery-utils" -version = "0.4.6" +version = "0.5.0" dependencies = [ "akri-shared", "anyhow", @@ -415,7 +415,7 @@ dependencies = [ [[package]] name = "akri-onvif" -version = "0.4.6" +version = "0.5.0" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -443,7 +443,7 @@ dependencies = [ [[package]] name = "akri-opcua" -version = "0.4.6" +version = "0.5.0" dependencies = [ "akri-discovery-utils", "akri-shared", @@ -466,7 +466,7 @@ dependencies = [ [[package]] name = "akri-shared" -version = "0.4.6" +version = "0.5.0" dependencies = [ "anyhow", "async-trait", @@ -495,7 +495,7 @@ dependencies = [ [[package]] name = "akri-udev" -version = "0.4.6" +version = "0.5.0" dependencies = [ "akri-discovery-utils", "anyhow", @@ -1036,7 +1036,7 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "controller" -version = "0.4.6" +version = "0.5.0" dependencies = [ "akri-shared", "anyhow", @@ -1203,7 +1203,7 @@ dependencies = [ [[package]] name = "debug-echo-discovery-handler" -version = "0.4.6" +version = "0.5.0" dependencies = [ "akri-debug-echo", "akri-discovery-utils", @@ -2382,7 +2382,7 @@ checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" [[package]] name = "onvif-discovery-handler" -version = "0.4.6" +version = "0.5.0" dependencies = [ "akri-discovery-utils", "akri-onvif", @@ -2448,7 +2448,7 @@ dependencies = [ [[package]] name = "opcua-discovery-handler" -version = "0.4.6" +version = "0.5.0" dependencies = [ "akri-discovery-utils", "akri-opcua", @@ -4516,7 +4516,7 @@ dependencies = [ [[package]] name = "udev-discovery-handler" -version = "0.4.6" +version = "0.5.0" dependencies = [ "akri-discovery-utils", "akri-udev", @@ -4527,7 +4527,7 @@ dependencies = [ [[package]] name = "udev-video-broker" -version = "0.4.6" +version = "0.5.0" dependencies = [ "akri-shared", "env_logger", @@ -4821,7 +4821,7 @@ dependencies = [ [[package]] name = "webhook-configuration" -version = "0.4.6" +version = "0.5.0" dependencies = [ "actix", "actix-rt", diff --git a/agent/Cargo.toml b/agent/Cargo.toml index 24ffabeb6..534ab2282 100644 --- a/agent/Cargo.toml +++ b/agent/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "agent" -version = "0.4.6" +version = "0.5.0" authors = ["Kate Goldenring ", ""] edition = "2018" diff --git a/agent/src/util/device_plugin_service.rs b/agent/src/util/device_plugin_service.rs index 0db4fef45..df3b0aca4 100644 --- a/agent/src/util/device_plugin_service.rs +++ b/agent/src/util/device_plugin_service.rs @@ -505,7 +505,6 @@ async fn try_create_instance( nodes: vec![dps.node_name.clone()], device_usage, metadata: get_all_broker_properties(&dps.config.properties, &dps.device.properties), - rbac: "rbac".to_string(), }; // Try up to MAX_INSTANCE_UPDATE_TRIES to create or update instance, breaking on success diff --git a/agent/src/util/slot_reconciliation.rs b/agent/src/util/slot_reconciliation.rs index 04a32aaa0..27731503c 100644 --- a/agent/src/util/slot_reconciliation.rs +++ b/agent/src/util/slot_reconciliation.rs @@ -252,7 +252,6 @@ impl DevicePluginSlotReconciler { let modified_instance = Instance { configuration_name: instance.spec.configuration_name.clone(), metadata: instance.spec.metadata.clone(), - rbac: instance.spec.rbac.clone(), shared: instance.spec.shared, device_usage: modified_device_usage, nodes: instance.spec.nodes.clone(), diff --git a/controller/Cargo.toml b/controller/Cargo.toml index 3e37adba3..56d60424a 100644 --- a/controller/Cargo.toml +++ b/controller/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "controller" -version = "0.4.6" +version = "0.5.0" authors = [""] edition = "2018" diff --git a/controller/src/util/node_watcher.rs b/controller/src/util/node_watcher.rs index cdb58cb43..2373a44f1 100644 --- a/controller/src/util/node_watcher.rs +++ b/controller/src/util/node_watcher.rs @@ -299,7 +299,6 @@ impl NodeWatcher { let modified_instance = Instance { configuration_name: instance.spec.configuration_name.clone(), metadata: instance.spec.metadata.clone(), - rbac: instance.spec.rbac.clone(), shared: instance.spec.shared, device_usage: modified_device_usage, nodes: modified_nodes, diff --git a/deployment/helm/Chart.yaml b/deployment/helm/Chart.yaml index d5c5a8e9a..6fd72ee54 100644 --- a/deployment/helm/Chart.yaml +++ b/deployment/helm/Chart.yaml @@ -15,9 +15,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.4.6 +version: 0.5.0 # 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.4.6 +appVersion: 0.5.0 diff --git a/deployment/helm/crds/akri-instance-crd.yaml b/deployment/helm/crds/akri-instance-crd.yaml index fad553920..6ef947b5d 100644 --- a/deployment/helm/crds/akri-instance-crd.yaml +++ b/deployment/helm/crds/akri-instance-crd.yaml @@ -31,8 +31,6 @@ spec: additionalProperties: type: string type: object - rbac: - type: string additionalPrinterColumns: - name: Config type: string diff --git a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml index 625442b9f..6cac5fca3 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.4.6" +version = "0.5.0" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml index ef25360a1..01a71b4c6 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.4.6" +version = "0.5.0" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml index e80ff9e32..75a3978c5 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.4.6" +version = "0.5.0" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handler-modules/udev-discovery-handler/Cargo.toml b/discovery-handler-modules/udev-discovery-handler/Cargo.toml index 2a6c3beb9..204dc7a86 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.4.6" +version = "0.5.0" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handlers/debug-echo/Cargo.toml b/discovery-handlers/debug-echo/Cargo.toml index fa83ce4bf..252a02dfe 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.4.6" +version = "0.5.0" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handlers/onvif/Cargo.toml b/discovery-handlers/onvif/Cargo.toml index d96be46cd..26ed2bcdc 100644 --- a/discovery-handlers/onvif/Cargo.toml +++ b/discovery-handlers/onvif/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-onvif" -version = "0.4.6" +version = "0.5.0" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handlers/opcua/Cargo.toml b/discovery-handlers/opcua/Cargo.toml index 96d057017..1332ff073 100644 --- a/discovery-handlers/opcua/Cargo.toml +++ b/discovery-handlers/opcua/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-opcua" -version = "0.4.6" +version = "0.5.0" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-handlers/udev/Cargo.toml b/discovery-handlers/udev/Cargo.toml index 9edaffd97..5c355877f 100644 --- a/discovery-handlers/udev/Cargo.toml +++ b/discovery-handlers/udev/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-udev" -version = "0.4.6" +version = "0.5.0" authors = ["Kate Goldenring "] edition = "2018" diff --git a/discovery-utils/Cargo.toml b/discovery-utils/Cargo.toml index bf83ee5aa..7619a00dc 100644 --- a/discovery-utils/Cargo.toml +++ b/discovery-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-discovery-utils" -version = "0.4.6" +version = "0.5.0" authors = ["Kate Goldenring "] edition = "2018" diff --git a/samples/brokers/onvif-video-broker/Akri.cs b/samples/brokers/onvif-video-broker/Akri.cs index 530a05f35..ddb4877a5 100644 --- a/samples/brokers/onvif-video-broker/Akri.cs +++ b/samples/brokers/onvif-video-broker/Akri.cs @@ -32,7 +32,6 @@ public class Instance public bool Shared { get; set; } public IList Nodes { get; set; } public Dictionary DeviceUsage { get; set; } - public string Rbac { get; set; } } public static class Akri diff --git a/samples/brokers/udev-video-broker/Cargo.toml b/samples/brokers/udev-video-broker/Cargo.toml index 23985108d..f77e431eb 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.4.6" +version = "0.5.0" authors = ["Kate Goldenring ", ""] edition = "2018" diff --git a/shared/Cargo.toml b/shared/Cargo.toml index bc6465249..4022c2d56 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "akri-shared" -version = "0.4.6" +version = "0.5.0" authors = [""] edition = "2018" diff --git a/shared/src/akri/instance.rs b/shared/src/akri/instance.rs index a182446e2..66f9373ea 100644 --- a/shared/src/akri/instance.rs +++ b/shared/src/akri/instance.rs @@ -43,10 +43,6 @@ pub struct Instance { /// the slot) #[serde(default)] pub device_usage: HashMap, - - /// This is a placeholder for eventual RBAC support - #[serde(default = "default_rbac")] - pub rbac: String, } /// Get Instances for a given namespace @@ -175,8 +171,7 @@ pub async fn find_instance( /// shared: true, /// nodes: Vec::new(), /// device_usage: std::collections::HashMap::new(), -/// metadata: std::collections::HashMap::new(), -/// rbac: "".to_string(), +/// metadata: std::collections::HashMap::new() /// }, /// "instance-1", /// "default", @@ -322,7 +317,6 @@ pub async fn delete_instance( /// nodes: Vec::new(), /// device_usage: std::collections::HashMap::new(), /// metadata: std::collections::HashMap::new(), -/// rbac: "".to_string(), /// }, /// "instance-1", /// "default", @@ -382,9 +376,6 @@ pub async fn update_instance( fn default_shared() -> bool { false } -fn default_rbac() -> String { - "".to_string() -} #[cfg(test)] mod crd_serializeation_tests { @@ -421,10 +412,9 @@ mod crd_serializeation_tests { assert_eq!(default_shared(), deserialized.shared); assert_eq!(0, deserialized.nodes.len()); assert_eq!(0, deserialized.device_usage.len()); - assert_eq!(0, deserialized.rbac.len()); let serialized = serde_json::to_string(&deserialized).unwrap(); - let expected_deserialized = r#"{"configurationName":"foo","metadata":{},"shared":false,"nodes":[],"deviceUsage":{},"rbac":""}"#; + let expected_deserialized = r#"{"configurationName":"foo","metadata":{},"shared":false,"nodes":[],"deviceUsage":{}}"#; assert_eq!(expected_deserialized, serialized); } @@ -441,10 +431,9 @@ mod crd_serializeation_tests { assert_eq!(default_shared(), deserialized.shared); assert_eq!(0, deserialized.nodes.len()); assert_eq!(0, deserialized.device_usage.len()); - assert_eq!(0, deserialized.rbac.len()); let serialized = serde_json::to_string(&deserialized).unwrap(); - let expected_deserialized = r#"{"configurationName":"foo","metadata":{},"shared":false,"nodes":[],"deviceUsage":{},"rbac":""}"#; + let expected_deserialized = r#"{"configurationName":"foo","metadata":{},"shared":false,"nodes":[],"deviceUsage":{}}"#; assert_eq!(expected_deserialized, serialized); } @@ -459,7 +448,6 @@ mod crd_serializeation_tests { assert_eq!(true, deserialized.shared); assert_eq!(2, deserialized.nodes.len()); assert_eq!(2, deserialized.device_usage.len()); - assert_eq!(0, deserialized.rbac.len()); let _ = serde_json::to_string(&deserialized).unwrap(); } diff --git a/shared/src/k8s/mod.rs b/shared/src/k8s/mod.rs index 78ad8018c..cf4b062ba 100644 --- a/shared/src/k8s/mod.rs +++ b/shared/src/k8s/mod.rs @@ -534,7 +534,6 @@ impl KubeInterface for KubeImpl { /// nodes: Vec::new(), /// device_usage: std::collections::HashMap::new(), /// metadata: std::collections::HashMap::new(), - /// rbac: "".to_string(), /// }, /// "instance-1", /// "instance-namespace", @@ -604,7 +603,6 @@ impl KubeInterface for KubeImpl { /// nodes: Vec::new(), /// device_usage: std::collections::HashMap::new(), /// metadata: std::collections::HashMap::new(), - /// rbac: "".to_string(), /// }, /// "instance-1", /// "instance-namespace" diff --git a/version.txt b/version.txt index ef52a6480..8f0916f76 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.4.6 +0.5.0 diff --git a/webhooks/validating/configuration/Cargo.toml b/webhooks/validating/configuration/Cargo.toml index 9cd0ffa40..88c97a819 100644 --- a/webhooks/validating/configuration/Cargo.toml +++ b/webhooks/validating/configuration/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "webhook-configuration" -version = "0.4.6" +version = "0.5.0" authors = ["DazWilkin "] edition = "2018"