Skip to content

Commit 3a5350d

Browse files
authored
Merge pull request #1583 from mythi/PR-2023-051
controller cleanups
2 parents 2cdc45b + 48fd7b8 commit 3a5350d

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

pkg/controllers/dlb/controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func (c *controller) newDaemonSetExpected(rawObj client.Object) *apps.DaemonSet
4242
},
4343
ObjectMeta: metav1.ObjectMeta{
4444
Namespace: c.ns,
45-
Name: "intel-dlb-plugin",
45+
Name: appLabel,
4646
Labels: map[string]string{
4747
"app": appLabel,
4848
},

pkg/controllers/dsa/controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func (c *controller) newDaemonSetExpected(rawObj client.Object) *apps.DaemonSet
4343
},
4444
ObjectMeta: metav1.ObjectMeta{
4545
Namespace: c.ns,
46-
Name: "intel-dsa-plugin",
46+
Name: appLabel,
4747
Labels: map[string]string{
4848
"app": appLabel,
4949
},

pkg/controllers/fpga/controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func (c *controller) newDaemonSetExpected(rawObj client.Object) *apps.DaemonSet
4545
},
4646
ObjectMeta: metav1.ObjectMeta{
4747
Namespace: c.ns,
48-
Name: "intel-fpga-plugin",
48+
Name: appLabel,
4949
Labels: map[string]string{
5050
"app": appLabel,
5151
},

pkg/controllers/gpu/controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func (c *controller) newDaemonSetExpected(rawObj client.Object) *apps.DaemonSet
4545
},
4646
ObjectMeta: metav1.ObjectMeta{
4747
Namespace: c.ns,
48-
Name: "intel-gpu-plugin",
48+
Name: appLabel,
4949
Labels: map[string]string{
5050
"app": appLabel,
5151
},

pkg/controllers/qat/controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func (c *controller) newDaemonSetExpected(rawObj client.Object) *apps.DaemonSet
4545
},
4646
ObjectMeta: metav1.ObjectMeta{
4747
Namespace: c.ns,
48-
Name: "intel-qat-plugin",
48+
Name: appLabel,
4949
Labels: map[string]string{
5050
"app": appLabel,
5151
},

pkg/controllers/sgx/controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func (c *controller) newDaemonSetExpected(rawObj client.Object) *apps.DaemonSet
4545
},
4646
ObjectMeta: metav1.ObjectMeta{
4747
Namespace: c.ns,
48-
Name: "intel-sgx-plugin",
48+
Name: appLabel,
4949
Labels: map[string]string{
5050
"app": appLabel,
5151
},

pkg/webhooks/sgx/sgx.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,13 @@ func (s *Mutator) Default(ctx context.Context, obj runtime.Object) error {
153153
// Quote Generation Modes:
154154
//
155155
// in-process: A container has its own quote provider library library: In this mode,
156-
// the container needs a handle to /dev/sgx/provision (sgx.intel.com/provision resource).
156+
// the container needs a handle to /dev/sgx_provision (sgx.intel.com/provision resource).
157157
// out-of-process: A container uses Intel aesmd. In this mode, the container must talk to
158158
// aesmd over /var/run/aesmd/aesm.sock. aesmd can run either as a side-car or a DaemonSet
159159
//
160160
// Mode selection: The mode selection is done by setting sgx.intel.com/quote-provider annotation
161161
// to a value that specifies the container name. If the annotation matches the container requesting
162-
// SGX EPC resources, the webhook adds both /dev/sgx/provision and /dev/sgx/enclave resource requests.
162+
// SGX EPC resources, the webhook adds both /dev/sgx_provision and /dev/sgx_enclave resource requests.
163163
// Without sgx.intel.com/quote-provider annotation set, the container is not able to generate quotes
164164
// for its enclaves. When pods set sgx.intel.com/quote-provider: "aesmd", Intel aesmd specific volume
165165
// mounts are added. In both DaemonSet and sidecar deployment scenarios for aesmd, its container name

0 commit comments

Comments
 (0)