Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Helm: Enabling passing multi-line strings for custom.configuration.discoveryDetails parameter in Helm values. #522

Merged

Conversation

karok2m
Copy link
Contributor

@karok2m karok2m commented Sep 27, 2022

What this PR does / why we need it:

This PR enables passing multi-line strings such as the one bellow to custom.configuration.discoveryDetails parameter in deployment\helm\values.yaml file of the Helm chart.

Ability to provide multi-line strings will enable passing well-structured and complex discovery requests to custom discovery handlers. This will also align configuration of custom discovery handler with the configuration of the existing discovery handlers (debugEcho, onvif, opcua and others) which support more structured hierarchical configuration for discoveryDetails.

custom:
  configuration:
    enabled: true
    name: akri-opcua-asset
    discoveryHandlerName: opcua-asset
    discoveryDetails: |
      discoveryMethod:
        asset:
          endpointUrl: "opc.tcp://umati.akri.svc.cluster.local:4840/"

Special notes for your reviewer:

The changes are only on the Helm chart side. No changes were added to the Rust code, so cargo-related checkboxes below are irrelevant.

If applicable:

  • this PR has an associated PR with documentation in akri-docs
  • this PR contains unit tests
  • added code adheres to standard Rust formatting (cargo fmt)
  • code builds properly (cargo build)
  • code is free of common mistakes (cargo clippy)
  • all Akri tests succeed (cargo test)
  • inline documentation builds (cargo doc)
  • all commits pass the DCO bot check by being signed off -- see the failing DCO check for instructions on how to retroactively sign commits

@karok2m karok2m force-pushed the feature/custom_discovery_details branch from fb18ba1 to 5007131 Compare September 27, 2022 17:51
@kate-goldenring
Copy link
Contributor

/version patch

@github-actions github-actions bot added the version/patch Patch version change is needed label Oct 7, 2022
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Copy link
Contributor

@kate-goldenring kate-goldenring left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @karok2m!

@kate-goldenring kate-goldenring merged commit 2ac813d into project-akri:main Oct 7, 2022
adithyaj added a commit that referenced this pull request Oct 19, 2022
* Use latest version of clap in webhook to remove unmaintained ansi_term dep

Signed-off-by: Kate Goldenring <[email protected]>

* Bump version

Signed-off-by: Kate Goldenring <[email protected]>

* update toml files to v1.63.0 (latest)

Signed-off-by: Adithya J <[email protected]>

* update rust version + use env var in command

Signed-off-by: Adithya J <[email protected]>

* update toolchain + actions

Signed-off-by: Adithya J <[email protected]>

* update readme with new latest version

Signed-off-by: Adithya J <[email protected]>

* revert tarpaulin to 0.20.1, 0.21.0 is not on docker hub yet

Signed-off-by: Adithya J <[email protected]>

* Use `containerd` as default container runtime socket for standard Kubernetes (#508)

* Update tests

Signed-off-by: Rishit Dagli <[email protected]>

* Update helm templates

Signed-off-by: Rishit Dagli <[email protected]>

* Update helm values

Signed-off-by: Rishit Dagli <[email protected]>

* Update helm lint commands

Signed-off-by: Rishit Dagli <[email protected]>

* Updates tests

Signed-off-by: Rishit Dagli <[email protected]>

* Update version

Signed-off-by: Rishit Dagli <[email protected]>

* Remove Kubernetes 1.16

Signed-off-by: Rishit Dagli <[email protected]>

Signed-off-by: Rishit Dagli <[email protected]>

* bump version

Signed-off-by: Kate Goldenring <[email protected]>

* A workflow to auto bump versions (#510)

* A workflow to auto update versions

Signed-off-by: Rishit Dagli <[email protected]>

* Don't run on comment delete

Signed-off-by: Rishit Dagli <[email protected]>

* Allow to checkout on a fork

Signed-off-by: Rishit Dagli <[email protected]>

* Update PR template (#511)

Signed-off-by: Rishit Dagli <[email protected]>

Signed-off-by: Rishit Dagli <[email protected]>

* kubernetes version update

Signed-off-by: Adithya J <[email protected]>

* adding self as a code maintainer

Signed-off-by: Adithya J <[email protected]>

* Add cri-socket arg, get logs for k8s

Signed-off-by: Adithya Jayachandran <[email protected]>

* add images to CTR for containerd

Signed-off-by: Adithya Jayachandran <[email protected]>

* Add status on fail (best effort)

Signed-off-by: Adithya Jayachandran <[email protected]>

* taint appropriate labels

Signed-off-by: Adithya Jayachandran <[email protected]>

* Helm: Enabling passing multi-line strings for custom.configuration.discoveryDetails parameter in Helm values. (#522)

* Enabling passing multi-line strings for custom.configuration.discoveryDetails.

Signed-off-by: Karapet Kostandyan <[email protected]>

* Helm: Enabled usage of network connection for custom discovery handler. (#523)

* Helm: Enabled usage of network connection for custom discovery handler.

Signed-off-by: Karapet Kostandyan <[email protected]>

* Update k3s, microk8s

Signed-off-by: Adithya Jayachandran <[email protected]>

* Update patch version

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Update patch version

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* fix borrow deref ref and use as_ref instead of to_string as linter specifies

Signed-off-by: Adithya Jayachandran <[email protected]>

* needless match lint

Signed-off-by: Adithya Jayachandran <[email protected]>

* Rust format update + ignoring derive PartialEq and Eq check.
prost has an issue where it does not derive Eq along with PartialEq.
Bypassing this until this is solved

Signed-off-by: Adithya Jayachandran <[email protected]>

* invalid ip address msg now reworded to invalid socket address
updating check for that

Signed-off-by: Adithya Jayachandran <[email protected]>

* update opcua to 0.11.0 to fix out of bounds write + uncontrolled resource consumption

Signed-off-by: Adithya J <[email protected]>

* Cargo.lock was previously pushed, updated with latest dependencies

Signed-off-by: Adithya J <[email protected]>

* Update to version 0.8.22

Signed-off-by: Adithya Jayachandran <[email protected]>

* update toml files to v1.63.0 (latest)

Signed-off-by: Adithya J <[email protected]>

* update rust version + use env var in command

Signed-off-by: Adithya J <[email protected]>

* update toolchain + actions

Signed-off-by: Adithya J <[email protected]>

* update readme with new latest version

Signed-off-by: Adithya J <[email protected]>

* revert tarpaulin to 0.20.1, 0.21.0 is not on docker hub yet

Signed-off-by: Adithya J <[email protected]>

* fix borrow deref ref and use as_ref instead of to_string as linter specifies

Signed-off-by: Adithya Jayachandran <[email protected]>

* needless match lint

Signed-off-by: Adithya Jayachandran <[email protected]>

* Rust format update + ignoring derive PartialEq and Eq check.
prost has an issue where it does not derive Eq along with PartialEq.
Bypassing this until this is solved

Signed-off-by: Adithya Jayachandran <[email protected]>

* invalid ip address msg now reworded to invalid socket address
updating check for that

Signed-off-by: Adithya Jayachandran <[email protected]>

* version 0.8.23

Signed-off-by: Adithya Jayachandran <[email protected]>

Signed-off-by: Kate Goldenring <[email protected]>
Signed-off-by: Adithya J <[email protected]>
Signed-off-by: Rishit Dagli <[email protected]>
Signed-off-by: Adithya J <[email protected]>
Signed-off-by: Adithya Jayachandran <[email protected]>
Signed-off-by: Karapet Kostandyan <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Kate Goldenring <[email protected]>
Co-authored-by: Adithya J <[email protected]>
Co-authored-by: Rishit Dagli <[email protected]>
Co-authored-by: Karapet Kostandyan <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@karok2m karok2m deleted the feature/custom_discovery_details branch February 15, 2023 17:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
version/patch Patch version change is needed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants