Allow overwriting controller.nodeSelectors (#194)

* Allow overwriting controller.nodeSelectors

* Add note about `sed` for MacOS contributors

agent/Cargo.toml

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

controller/Cargo.toml

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

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.1.5
+version: 0.1.6
 
 # 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.1.5
+appVersion: 0.1.6

deployment/helm/templates/controller.yaml

@@ -44,14 +44,14 @@ spec:
       {{- end }}
       {{- if or .Values.controller.linuxOnly .Values.controller.onlyOnControlPlane .Values.controller.nodeSelectors }}
       nodeSelector:
-        {{- if .Values.controller.nodeSelectors }}
-          {{- toYaml .Values.controller.nodeSelectors | nindent 8 }}
+        {{- if .Values.controller.onlyOnControlPlane }}
+        node-role.kubernetes.io/master: ""
         {{- end }}
         {{- if .Values.controller.linuxOnly }}
         "kubernetes.io/os": linux
         {{- end }}
-        {{- if .Values.controller.onlyOnControlPlane }}
-        node-role.kubernetes.io/master: ""
+        {{- if .Values.controller.nodeSelectors }}
+          {{- toYaml .Values.controller.nodeSelectors | nindent 8 }}
         {{- end }}
       {{- end }}
-{{- end }}
+{{- end }}

docs/contributing.md

@@ -21,14 +21,16 @@ Contributions can be made by forking the repository and creating a pull request.
 See the [Development](./development.md) documentation for more information on how to set up your environment and build Akri components locally.
 
 ## Versioning
-We follow the [SymVer](https://semver.org/) versioning strategy: [MAJOR].[MINOR].[PATCH].  Our current version can be found in `./version.txt`.
+We follow the [SymVer](https://semver.org/) versioning strategy: [MAJOR].[MINOR].[PATCH]. Our current version can be found in `./version.txt`.
 
 * For non-breaking bug fixes and small code changes, [PATCH] should be incremented.  This can be accomplished by running `version.sh -u -p`
 * For non-breaking feature changes, [MINOR] should be incremented.  This can be accomplished by running `version.sh -u -n`
 * For major and/or breaking changes, [MAJOR] should be incremented.  This can be accomplished by running `version.sh -u -m`
 
 To ensure that all product versioning is consistent, our CI builds will execute `version.sh -c` to check all known instances of version in our YAML, TOML, and code.  This will also check to make sure that version.txt has been changed.  If a pull request is needed where the version should not be changed, include `[SAME VERSION]` in the pull request title.
 
+> Note for MacOS users: `version.sh` uses the GNU `sed` command under-the-hood, but MacOS has built-in its own version. We recommend installing the GNU version via `brew install gnu-sed`. Then follow the brew instructions on how to use the installed GNU `sed` instead of the MacOS one.
+
 ## PR title flags
 Akri's workflows check for three flags in the titles of PRs in order to decide whether to execute certain checks. 
 
@@ -45,4 +47,4 @@ Most contributions require you to agree to a Contributor License Agreement (CLA)
 When you submit a pull request, a CLA-bot will automatically determine whether you need to provide a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions provided by the bot. You will only need to do this once across all repos using our CLA.
 
 ## Code of Conduct
-Participation in the Akri community is governed by the [Code of Conduct](../CODE_OF_CONDUCT.md).
+Participation in the Akri community is governed by the [Code of Conduct](../CODE_OF_CONDUCT.md).

docs/user-guide.md

@@ -96,9 +96,11 @@ helm install akri akri-helm-charts/akri
     controller.allowOnControlPlane=false` to your install command below. Conversely, if you only want the Controller to
     run on control plane nodes, add `--set controller.onlyOnControlPlane=true`. This will guarantee the Controller only
     runs on nodes with the label (key, value) of (`node-role.kubernetes.io/master`, ""), which is the default label for
-    the control plane node for Kubernetes. However, control plane nodes on MicroK8s and K3s do not have this label by
+    the control plane node for Kubernetes.
+
+    However, control plane nodes on MicroK8s and K3s may not have this exact label by
     default, so you can add it by running `kubectl label node ${HOSTNAME,,} node-role.kubernetes.io/master=
-    --overwrite=true`. 
+    --overwrite=true`. Or alternatively, in K3s, you can keep the default label value on the master and add `--set controller.nodeSelectors."node-role\.kubernetes\.io/master"=true` to the install command below.
 
     Run the following to fetch the Akri Helm chart, install Akri, and apply the default configuration for `<protocol>`,
     optionally specifying the image for the broker pod that should be deployed to utilize each discovered device.

samples/brokers/udev-video-broker/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "udev-video-broker"
-version = "0.1.5"
+version = "0.1.6"
 authors = ["Kate Goldenring <[email protected]>", "<[email protected]>"]
 edition = "2018"
 

shared/Cargo.toml

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

version.txt

@@ -1 +1 @@
-0.1.5
+0.1.6