diff --git a/VERSION b/VERSION index 2f0ed73..428b770 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.3-dev +1.4.3 diff --git a/deployment-package/common/registry-akri.yaml b/deployment-package/common/registry-akri.yaml deleted file mode 100644 index 2ed0f44..0000000 --- a/deployment-package/common/registry-akri.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-FileCopyrightText: (C) 2025 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 ---- -specSchema: "Registry" -schemaVersion: "0.1" -$schema: "https://schema.intel.com/catalog.orchestrator/0.1/schema" - -name: "akri-helm-registry" -description: "Public registry for akri chart" -type: "HELM" -rootUrl: "https://project-akri.github.io/akri/" diff --git a/deployment-package/usb/akri-values.yaml b/deployment-package/usb/akri-values.yaml deleted file mode 100644 index 3b7fb25..0000000 --- a/deployment-package/usb/akri-values.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-FileCopyrightText: (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 ---- -useDevelopmentContainers: false -kubernetesDistro: k3s -# agent: -# nodeSelectors: -# kubernetes.io/os: linux -controller: - enabled: false - image: - pullPolicy: IfNotPresent -webhookConfiguration: - image: - pullPolicy: IfNotPresent -udev: - discovery: - enabled: true -# nodeSelectors: -# kubernetes.io/os: linux diff --git a/deployment-package/usb/application.yaml b/deployment-package/usb/application.yaml deleted file mode 100644 index 31d40a4..0000000 --- a/deployment-package/usb/application.yaml +++ /dev/null @@ -1,44 +0,0 @@ -# SPDX-FileCopyrightText: (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 ---- -specSchema: Application -schemaVersion: "0.1" -$schema: "https://schema.intel.com/catalog.orchestrator/0.1/schema" - -name: akri -version: 0.14.0 -description: "akri base application" -kind: extension - -helmRegistry: "akri-helm-registry" -chartName: "akri" -chartVersion: 0.13.8 - -profiles: - - name: default - displayName: Default - valuesFileName: akri-values.yaml - ---- -specSchema: Application -schemaVersion: "0.1" -$schema: "https://schema.intel.com/catalog.orchestrator/0.1/schema" - -name: usb-device-plugin -version: 1.2.0 -description: "Exposes USB devices to the k8s cluster" -kind: extension - -helmRegistry: "intel-rs-helm" -chartName: "edge-orch/en/charts/akri" -chartVersion: 1.1.1 - -profiles: - - name: default - displayName: Default - valuesFileName: usb-device-values.yaml - parameterTemplates: - - name: usbList - displayName: "USB dongle List" - mandatory: true - type: string diff --git a/deployment-package/usb/deployment-package.yaml b/deployment-package/usb/deployment-package.yaml deleted file mode 100644 index 1e9e333..0000000 --- a/deployment-package/usb/deployment-package.yaml +++ /dev/null @@ -1,37 +0,0 @@ -# SPDX-FileCopyrightText: (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 ---- -specSchema: "DeploymentPackage" -schemaVersion: "0.1" -$schema: "https://schema.intel.com/catalog.orchestrator/0.1/schema" - -name: "usb" -description: "Brings USB allocation for containers/VMs running on k8s cluster" -version: 0.5.0 -forbidsMultipleDeployments: true -kind: extension - -applications: - - name: akri - version: 0.14.0 - - name: usb-device-plugin - version: 1.2.0 - -defaultNamespaces: - usb-device-plugin: akri - akri: akri - -namespaces: - - name: akri - labels: - pod-security.kubernetes.io/enforce: privileged - name: akri - -deploymentProfiles: - - name: "default-profile" - displayName: "Default Configuration" - applicationProfiles: - - application: "usb-device-plugin" - profile: "default" - - application: "akri" - profile: "default" diff --git a/deployment-package/usb/usb-device-values.yaml b/deployment-package/usb/usb-device-values.yaml deleted file mode 100644 index 4cb3fbf..0000000 --- a/deployment-package/usb/usb-device-values.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-FileCopyrightText: (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 ---- - -# format: name;vid;pid,name;vid;pid -# sample: wifi-dongle;0bda;0811,gsm-dongle;0bda;2838 -usbList: "" - -# This block can deliver definitions of akri -extensionImages: - - "ghcr.io/project-akri/akri/agent:v0.12.20" - - "ghcr.io/project-akri/akri/udev-discovery:v0.12.20" - - "ghcr.io/project-akri/akri/controller:v0.12.20" - - "ghcr.io/project-akri/akri/webhook-configuration:v0.12.20" - - "registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.1.1" diff --git a/helm/akri/.gitignore b/helm/akri/.gitignore deleted file mode 100644 index 2fddbaa..0000000 --- a/helm/akri/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-FileCopyrightText: (C) 2023 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -charts/ -Chart.lock diff --git a/helm/akri/.helmignore b/helm/akri/.helmignore deleted file mode 100644 index a0759cf..0000000 --- a/helm/akri/.helmignore +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-FileCopyrightText: (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/helm/akri/Chart.yaml b/helm/akri/Chart.yaml deleted file mode 100644 index 9c3164e..0000000 --- a/helm/akri/Chart.yaml +++ /dev/null @@ -1,21 +0,0 @@ -# SPDX-FileCopyrightText: (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 ---- -apiVersion: v2 -name: akri -description: A wrapper Helm chart for Kubernetes - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -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: 1.1.1 diff --git a/helm/akri/README.md b/helm/akri/README.md deleted file mode 100644 index c6d94b8..0000000 --- a/helm/akri/README.md +++ /dev/null @@ -1,16 +0,0 @@ - - -# Akri Helm Chart - -[https://github.com/project-akri/akri](https://github.com/project-akri/akri) - -## To update deps - -`helm dependency update extensions/usb/helm/akri/` - -## To package chart - -`helm package extensions/usb/helm/akri` diff --git a/helm/akri/templates/akri-configurations.yaml b/helm/akri/templates/akri-configurations.yaml deleted file mode 100644 index 16c034d..0000000 --- a/helm/akri/templates/akri-configurations.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-FileCopyrightText: (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 -{{ if not (eq .Values.usbList "") }} -{{ $usbs := split "," .Values.usbList }} -{{ range $i, $v := $usbs }} -{{ $parts := split ";" $v }} ---- -apiVersion: akri.sh/v0 -kind: Configuration -metadata: - name: {{ $parts._0 }} - namespace: {{ $.Release.Namespace }} -spec: - discoveryHandler: - name: udev - discoveryDetails: |+ - udevRules: - - SUBSYSTEM=="usb", ATTR{idVendor}=="{{ $parts._1 }}", ATTR{idProduct}=="{{ $parts._2 }}" - brokerProperties: {} - capacity: 1 -{{ end }} -{{ end }} diff --git a/helm/akri/values.yaml b/helm/akri/values.yaml deleted file mode 100644 index 4898336..0000000 --- a/helm/akri/values.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-FileCopyrightText: (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 ---- -# format: name;vid;pid,name;vid;pid -usbList: "" # sample: wifi-dongle;0bda;0811,gsm-dongle;0bda;2838 - -# This block can deliver definitions of akri -extensionImages: - - "ghcr.io/project-akri/akri/agent:v0.12.20" - - "ghcr.io/project-akri/akri/udev-discovery:v0.12.20" - - "ghcr.io/project-akri/akri/controller:v0.12.20" - - "ghcr.io/project-akri/akri/webhook-configuration:v0.12.20" - - "registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.1.1" diff --git a/manifest/manifest.yaml b/manifest/manifest.yaml index 2ceba65..9e59170 100644 --- a/manifest/manifest.yaml +++ b/manifest/manifest.yaml @@ -3,7 +3,7 @@ --- metadata: schemaVersion: 0.3.0 - release: 1.4.2 + release: 1.4.3 lpke: deploymentPackages: - dpkg: edge-orch/en/file/cert-manager @@ -22,8 +22,6 @@ lpke: version: 0.3.0 - dpkg: edge-orch/en/file/trusted-compute version: 0.6.0 - - dpkg: edge-orch/en/file/usb - version: 0.5.0 - dpkg: edge-orch/en/file/virtualization version: 0.6.0 - dpkg: edge-orch/en/file/observability