Remove un-utilized CRD field

agent/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "agent"
-version = "0.4.6"
+version = "0.5.0"
 authors = ["Kate Goldenring <[email protected]>", "<[email protected]>"]
 edition = "2018"
 

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

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(),

controller/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "controller"
-version = "0.4.6"
+version = "0.5.0"
 authors = ["<[email protected]>"]
 edition = "2018"
 

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,

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

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

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 <[email protected]>"]
 edition = "2018"
 

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 <[email protected]>"]
 edition = "2018"
 

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 <[email protected]>"]
 edition = "2018"
 

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 <[email protected]>"]
 edition = "2018"
 

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 <[email protected]>"]
 edition = "2018"
 

discovery-handlers/onvif/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "akri-onvif"
-version = "0.4.6"
+version = "0.5.0"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 

discovery-handlers/opcua/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "akri-opcua"
-version = "0.4.6"
+version = "0.5.0"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 

discovery-handlers/udev/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "akri-udev"
-version = "0.4.6"
+version = "0.5.0"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 

discovery-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "akri-discovery-utils"
-version = "0.4.6"
+version = "0.5.0"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 

samples/brokers/onvif-video-broker/Akri.cs

@@ -32,7 +32,6 @@ public class Instance
         public bool Shared { get; set; }
         public IList<String> Nodes { get; set; }
         public Dictionary<String, String> DeviceUsage { get; set; }
-        public string Rbac { get; set; }
     }
 
     public static class Akri 

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 <[email protected]>", "<[email protected]>"]
 edition = "2018"
 

shared/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "akri-shared"
-version = "0.4.6"
+version = "0.5.0"
 authors = ["<[email protected]>"]
 edition = "2018"
 

shared/src/akri/instance.rs

@@ -43,10 +43,6 @@ pub struct Instance {
     /// the slot)
     #[serde(default)]
     pub device_usage: HashMap<String, String>,
-
-    /// 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();
     }

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"

version.txt

@@ -1 +1 @@
-0.4.6
+0.5.0

webhooks/validating/configuration/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "webhook-configuration"
-version = "0.4.6"
+version = "0.5.0"
 authors = ["DazWilkin <[email protected]>"]
 edition = "2018"