Skip to content

[DO NOT MERGE] Add TLS certification to operator #166

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.

Sign up for GitHub

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

Closed
wants to merge 4 commits into from
Closed

[DO NOT MERGE] Add TLS certification to operator #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3676586
init testing container injection
okankoAMZ Apr 30, 2024
0d9aba7
Fixing pod mutator tests
okankoAMZ May 15, 2024
2d888b1
Added indexing to container
okankoAMZ May 16, 2024
4bb42aa
clean up
okankoAMZ May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/constants/env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const (
EnvOTELPropagators = "OTEL_PROPAGATORS"
EnvOTELTracesSampler = "OTEL_TRACES_SAMPLER"
EnvOTELTracesSamplerArg = "OTEL_TRACES_SAMPLER_ARG"

InstrumentationPrefix = "instrumentation.opentelemetry.io/"
AnnotationDefaultAutoInstrumentationJava = InstrumentationPrefix + "default-auto-instrumentation-java-image"
AnnotationDefaultAutoInstrumentationNodeJS = InstrumentationPrefix + "default-auto-instrumentation-nodejs-image"
Expand Down
24 changes: 14 additions & 10 deletions pkg/instrumentation/dotnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,10 @@ func injectDotNetSDK(dotNetSpec v1alpha1.DotNet, pod corev1.Pod, index int, runt
setDotNetEnvVar(container, envDotNetOTelAutoHome, dotNetOTelAutoHomePath, doNotConcatEnvValues)

setDotNetEnvVar(container, envDotNetSharedStore, dotNetSharedStorePath, concatEnvValues)

err = injectSecret(&pod, index, dotNetSpec.Resources)
if err != nil {
return pod, err
}
container.VolumeMounts = append(container.VolumeMounts, corev1.VolumeMount{
Name: dotnetVolumeName,
MountPath: dotnetInstrMountPath,
Expand All @@ -112,17 +115,18 @@ func injectDotNetSDK(dotNetSpec v1alpha1.DotNet, pod corev1.Pod, index int, runt
SizeLimit: volumeSize(dotNetSpec.VolumeSizeLimit),
},
}})

volumeMount := corev1.VolumeMount{
Name: dotnetVolumeName,
MountPath: dotnetInstrMountPath,
}
pod.Spec.InitContainers = append(pod.Spec.InitContainers, corev1.Container{
Name: dotnetInitContainerName,
Image: dotNetSpec.Image,
Command: []string{"cp", "-a", "/autoinstrumentation/.", dotnetInstrMountPath},
Resources: dotNetSpec.Resources,
VolumeMounts: []corev1.VolumeMount{{
Name: dotnetVolumeName,
MountPath: dotnetInstrMountPath,
}},
Name: dotnetInitContainerName,
Image: dotNetSpec.Image,
Command: []string{"cp", "-a", "/autoinstrumentation/.", dotnetInstrMountPath},
Resources: dotNetSpec.Resources,
VolumeMounts: []corev1.VolumeMount{volumeMount},
})

}
return pod, nil
}
Expand Down
95 changes: 95 additions & 0 deletions pkg/instrumentation/dotnet_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@ func TestInjectDotNetSDK(t *testing.T) {
expected: corev1.Pod{
Spec: corev1.PodSpec{
Volumes: []corev1.Volume{
{
Name: certVolumeName,
VolumeSource: corev1.VolumeSource{
EmptyDir: &corev1.EmptyDirVolumeSource{
SizeLimit: &defaultVolumeLimitSize,
},
},
},
{
Name: "opentelemetry-auto-instrumentation-dotnet",
VolumeSource: corev1.VolumeSource{
Expand All @@ -46,6 +54,18 @@ func TestInjectDotNetSDK(t *testing.T) {
},
},
InitContainers: []corev1.Container{
{
Name: initCertContainerName,
Image: shellContainerName,
Command: []string{"/bin/sh", "-c",
"mkdir -p amazon-cloudwatch-agent && echo 'open /etc/amazon-cloudwatch-app-signals-cert/tls-ca.crt: no such file or directory' > ./amazon-cloudwatch-agent/ca.crt"},
VolumeMounts: []corev1.VolumeMount{{
Name: certVolumeName,
MountPath: certVolumePath,
}},
WorkingDir: certVolumePath,
Resources: testResourceRequirements,
},
{
Name: "opentelemetry-auto-instrumentation-dotnet",
Image: "foo/bar:1",
Expand All @@ -60,6 +80,10 @@ func TestInjectDotNetSDK(t *testing.T) {
Containers: []corev1.Container{
{
VolumeMounts: []corev1.VolumeMount{
{
Name: certVolumeName,
MountPath: certVolumePath,
},
{
Name: "opentelemetry-auto-instrumentation-dotnet",
MountPath: "/otel-auto-instrumentation-dotnet",
Expand Down Expand Up @@ -141,6 +165,14 @@ func TestInjectDotNetSDK(t *testing.T) {
expected: corev1.Pod{
Spec: corev1.PodSpec{
Volumes: []corev1.Volume{
{
Name: certVolumeName,
VolumeSource: corev1.VolumeSource{
EmptyDir: &corev1.EmptyDirVolumeSource{
SizeLimit: &defaultVolumeLimitSize,
},
},
},
{
Name: "opentelemetry-auto-instrumentation-dotnet",
VolumeSource: corev1.VolumeSource{
Expand All @@ -151,6 +183,17 @@ func TestInjectDotNetSDK(t *testing.T) {
},
},
InitContainers: []corev1.Container{
{
Name: initCertContainerName,
Image: shellContainerName,
Command: []string{"/bin/sh", "-c",
"mkdir -p amazon-cloudwatch-agent && echo 'open /etc/amazon-cloudwatch-app-signals-cert/tls-ca.crt: no such file or directory' > ./amazon-cloudwatch-agent/ca.crt"},
VolumeMounts: []corev1.VolumeMount{{
Name: certVolumeName,
MountPath: certVolumePath,
}},
WorkingDir: certVolumePath,
},
{
Name: "opentelemetry-auto-instrumentation-dotnet",
Image: "foo/bar:1",
Expand All @@ -164,6 +207,10 @@ func TestInjectDotNetSDK(t *testing.T) {
Containers: []corev1.Container{
{
VolumeMounts: []corev1.VolumeMount{
{
Name: certVolumeName,
MountPath: certVolumePath,
},
{
Name: "opentelemetry-auto-instrumentation-dotnet",
MountPath: "/otel-auto-instrumentation-dotnet",
Expand Down Expand Up @@ -370,6 +417,14 @@ func TestInjectDotNetSDK(t *testing.T) {
expected: corev1.Pod{
Spec: corev1.PodSpec{
Volumes: []corev1.Volume{
{
Name: certVolumeName,
VolumeSource: corev1.VolumeSource{
EmptyDir: &corev1.EmptyDirVolumeSource{
SizeLimit: &defaultVolumeLimitSize,
},
},
},
{
Name: dotnetVolumeName,
VolumeSource: corev1.VolumeSource{
Expand All @@ -380,6 +435,18 @@ func TestInjectDotNetSDK(t *testing.T) {
},
},
InitContainers: []corev1.Container{
{
Name: initCertContainerName,
Image: shellContainerName,
Command: []string{"/bin/sh", "-c",
"mkdir -p amazon-cloudwatch-agent && echo 'open /etc/amazon-cloudwatch-app-signals-cert/tls-ca.crt: no such file or directory' > ./amazon-cloudwatch-agent/ca.crt"},
VolumeMounts: []corev1.VolumeMount{{
Name: certVolumeName,
MountPath: certVolumePath,
}},
WorkingDir: certVolumePath,
Resources: testResourceRequirements,
},
{
Name: dotnetInitContainerName,
Image: "foo/bar:1",
Expand All @@ -394,6 +461,10 @@ func TestInjectDotNetSDK(t *testing.T) {
Containers: []corev1.Container{
{
VolumeMounts: []corev1.VolumeMount{
{
Name: certVolumeName,
MountPath: certVolumePath,
},
{
Name: dotnetVolumeName,
MountPath: "/otel-auto-instrumentation-dotnet",
Expand Down Expand Up @@ -449,6 +520,14 @@ func TestInjectDotNetSDK(t *testing.T) {
expected: corev1.Pod{
Spec: corev1.PodSpec{
Volumes: []corev1.Volume{
{
Name: certVolumeName,
VolumeSource: corev1.VolumeSource{
EmptyDir: &corev1.EmptyDirVolumeSource{
SizeLimit: &defaultVolumeLimitSize,
},
},
},
{
Name: dotnetVolumeName,
VolumeSource: corev1.VolumeSource{
Expand All @@ -459,6 +538,18 @@ func TestInjectDotNetSDK(t *testing.T) {
},
},
InitContainers: []corev1.Container{
{
Name: initCertContainerName,
Image: shellContainerName,
Command: []string{"/bin/sh", "-c",
"mkdir -p amazon-cloudwatch-agent && echo 'open /etc/amazon-cloudwatch-app-signals-cert/tls-ca.crt: no such file or directory' > ./amazon-cloudwatch-agent/ca.crt"},
VolumeMounts: []corev1.VolumeMount{{
Name: certVolumeName,
MountPath: certVolumePath,
}},
WorkingDir: certVolumePath,
Resources: testResourceRequirements,
},
{
Name: dotnetInitContainerName,
Image: "foo/bar:1",
Expand All @@ -473,6 +564,10 @@ func TestInjectDotNetSDK(t *testing.T) {
Containers: []corev1.Container{
{
VolumeMounts: []corev1.VolumeMount{
{
Name: certVolumeName,
MountPath: certVolumePath,
},
{
Name: dotnetVolumeName,
MountPath: "/otel-auto-instrumentation-dotnet",
Expand Down
24 changes: 16 additions & 8 deletions pkg/instrumentation/golang.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ func injectGoSDK(goSpec v1alpha1.Go, pod corev1.Pod) (corev1.Pod, error) {
true := true
zero := int64(0)
pod.Spec.ShareProcessNamespace = &true

volumeMount := corev1.VolumeMount{
MountPath: "/sys/kernel/debug",
Name: kernelDebugVolumeName,
}
goAgent := corev1.Container{
Name: sideCarName,
Image: goSpec.Image,
Expand All @@ -51,12 +54,7 @@ func injectGoSDK(goSpec v1alpha1.Go, pod corev1.Pod) (corev1.Pod, error) {
RunAsUser: &zero,
Privileged: &true,
},
VolumeMounts: []corev1.VolumeMount{
{
MountPath: "/sys/kernel/debug",
Name: kernelDebugVolumeName,
},
},
VolumeMounts: []corev1.VolumeMount{},
}

// Annotation takes precedence for OTEL_GO_AUTO_TARGET_EXE
Expand All @@ -76,8 +74,17 @@ func injectGoSDK(goSpec v1alpha1.Go, pod corev1.Pod) (corev1.Pod, error) {
goAgent.Env = append(goAgent.Env, env)
}
}

pod.Spec.Containers = append(pod.Spec.Containers, goAgent)
goAgentPtr := &pod.Spec.Containers[len(pod.Spec.Containers)-1]
for index, _ := range pod.Spec.Containers {
err := injectSecret(&pod, index, goAgent.Resources)
if err != nil {
return pod, err
}
}
//we want to add it after injection to make it consistent with other languages
goAgentPtr.VolumeMounts = append(goAgentPtr.VolumeMounts, volumeMount)

pod.Spec.Volumes = append(pod.Spec.Volumes, corev1.Volume{
Name: kernelDebugVolumeName,
VolumeSource: corev1.VolumeSource{
Expand All @@ -86,5 +93,6 @@ func injectGoSDK(goSpec v1alpha1.Go, pod corev1.Pod) (corev1.Pod, error) {
},
},
})

return pod, nil
}
Loading
Loading