-
Notifications
You must be signed in to change notification settings - Fork 178
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add support for extra environment variables
This commit add support for the sriov-device-plugin to inject extra env variables Signed-off-by: Sebastian Sch <[email protected]>
- Loading branch information
Showing
45 changed files
with
775 additions
and
274 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| // Copyright 2018 Intel Corp. All Rights Reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package infoprovider | ||
|
|
||
| import ( | ||
| "github.com/golang/glog" | ||
|
|
||
| pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1" | ||
|
|
||
| "github.com/k8snetworkplumbingwg/sriov-network-device-plugin/pkg/types" | ||
| ) | ||
|
|
||
| /* | ||
| envInfoProvider implements DeviceInfoProvider | ||
| */ | ||
| type envInfoProvider struct { | ||
| pciAddr string | ||
| envs map[string]types.EnvironmentVariables | ||
| } | ||
|
|
||
| // NewEnvInfoProvider create instance of Environment DeviceInfoProvider | ||
| func NewEnvInfoProvider(pciAddr string, envs map[string]types.EnvironmentVariables) types.DeviceInfoProvider { | ||
| return &envInfoProvider{ | ||
| pciAddr: pciAddr, | ||
| envs: envs, | ||
| } | ||
| } | ||
|
|
||
| func (rp *envInfoProvider) GetDeviceSpecs() []*pluginapi.DeviceSpec { | ||
| devSpecs := make([]*pluginapi.DeviceSpec, 0) | ||
| return devSpecs | ||
| } | ||
|
|
||
| func (rp *envInfoProvider) GetEnvVal() map[string]types.EnvironmentVariables { | ||
| envs := make(map[string]string, 0) | ||
|
|
||
| // first we search for global configuration with the * then we check for specific one to override | ||
| for _, value := range []string{"*", rp.pciAddr} { | ||
| extraEnvDict, ok := rp.envs[value] | ||
| if ok { | ||
| for k, v := range extraEnvDict { | ||
| envs[k] = v | ||
| } | ||
| } | ||
| } | ||
| envMap := map[string]types.EnvironmentVariables{"envs": envs} | ||
| glog.Infof("Env GetEnvVal(): %v", envMap) | ||
| return envMap | ||
| } | ||
|
|
||
| func (rp *envInfoProvider) GetMounts() []*pluginapi.Mount { | ||
| mounts := make([]*pluginapi.Mount, 0) | ||
| return mounts | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| /* | ||
| * SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package infoprovider_test | ||
|
|
||
| import ( | ||
| "github.com/k8snetworkplumbingwg/sriov-network-device-plugin/pkg/infoprovider" | ||
| "github.com/k8snetworkplumbingwg/sriov-network-device-plugin/pkg/types" | ||
| . "github.com/onsi/ginkgo" | ||
| . "github.com/onsi/gomega" | ||
| ) | ||
|
|
||
| var _ = Describe("EnvInfoProvider", func() { | ||
| Describe("creating new rdmaInfoProvider", func() { | ||
| It("should return valid rdmaInfoProvider object", func() { | ||
| dip := infoprovider.NewEnvInfoProvider("fake01", map[string]types.EnvironmentVariables{}) | ||
| Expect(dip).NotTo(Equal(nil)) | ||
| }) | ||
| }) | ||
| Describe("GetEnvVal", func() { | ||
| It("should return an empty object if there are no environment variables", func() { | ||
| dip := infoprovider.NewEnvInfoProvider("fake", nil) | ||
| envs := dip.GetEnvVal() | ||
| Expect(len(envs)).To(Equal(1)) | ||
| envMap, exist := envs["envs"] | ||
| Expect(exist).To(BeTrue()) | ||
| Expect(len(envMap)).To(Equal(0)) | ||
| }) | ||
| It("should return an object with environment variables", func() { | ||
| dip := infoprovider.NewEnvInfoProvider("fake", map[string]types.EnvironmentVariables{"*": map[string]string{"test": "test"}}) | ||
| envs := dip.GetEnvVal() | ||
| Expect(len(envs)).To(Equal(1)) | ||
| envMap, exist := envs["envs"] | ||
| Expect(exist).To(BeTrue()) | ||
| Expect(len(envMap)).To(Equal(1)) | ||
| value, exist := envs["envs"]["test"] | ||
| Expect(exist).To(BeTrue()) | ||
| Expect(value).To(Equal("test")) | ||
| }) | ||
| It("should return an object with specific selector for environment variable", func() { | ||
| dip := infoprovider.NewEnvInfoProvider("0000:00:00.1", map[string]types.EnvironmentVariables{"*": map[string]string{"test": "test"}, "0000:00:00.1": map[string]string{"test": "test1"}}) | ||
| envs := dip.GetEnvVal() | ||
| Expect(len(envs)).To(Equal(1)) | ||
| envMap, exist := envs["envs"] | ||
| Expect(exist).To(BeTrue()) | ||
| Expect(len(envMap)).To(Equal(1)) | ||
| value, exist := envs["envs"]["test"] | ||
| Expect(exist).To(BeTrue()) | ||
| Expect(value).To(Equal("test1")) | ||
| }) | ||
| It("should return an object with specific selector for multiple environment variable", func() { | ||
| dip := infoprovider.NewEnvInfoProvider("0000:00:00.1", map[string]types.EnvironmentVariables{"*": map[string]string{"test": "test", "bla": "bla"}, "0000:00:00.1": map[string]string{"test": "test1"}}) | ||
| envs := dip.GetEnvVal() | ||
| Expect(len(envs)).To(Equal(1)) | ||
| envMap, exist := envs["envs"] | ||
| Expect(exist).To(BeTrue()) | ||
| Expect(len(envMap)).To(Equal(2)) | ||
| value, exist := envs["envs"]["test"] | ||
| Expect(exist).To(BeTrue()) | ||
| Expect(value).To(Equal("test1")) | ||
| value, exist = envs["envs"]["bla"] | ||
| Expect(exist).To(BeTrue()) | ||
| Expect(value).To(Equal("bla")) | ||
| }) | ||
| It("should return an object with multiple specific selector for environment variable", func() { | ||
| dip := infoprovider.NewEnvInfoProvider("0000:00:00.1", map[string]types.EnvironmentVariables{"*": map[string]string{"test": "test"}, "0000:00:00.1": map[string]string{"test": "test1", "bla": "bla"}}) | ||
| envs := dip.GetEnvVal() | ||
| Expect(len(envs)).To(Equal(1)) | ||
| envMap, exist := envs["envs"] | ||
| Expect(exist).To(BeTrue()) | ||
| Expect(len(envMap)).To(Equal(2)) | ||
| value, exist := envs["envs"]["test"] | ||
| Expect(exist).To(BeTrue()) | ||
| Expect(value).To(Equal("test1")) | ||
| value, exist = envs["envs"]["bla"] | ||
| Expect(exist).To(BeTrue()) | ||
| Expect(value).To(Equal("bla")) | ||
| }) | ||
| }) | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.