Skip to content

Commit

Permalink
refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
@basti1302
basti1302 committed Oct 2, 2024
1 parent 09dd598 commit 42461df
Show file tree
Hide file tree
Showing 26 changed files with 515 additions and 200 deletions.
10 changes: 8 additions & 2 deletions cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ type environmentVariables struct {
configurationReloaderImagePullPolicy corev1.PullPolicy
filelogOffsetSynchImage string
filelogOffsetSynchImagePullPolicy corev1.PullPolicy
selfMonitoringAndApiAuthToken string
}

const (
Expand Down Expand Up @@ -399,6 +400,8 @@ func readEnvironmentVariables() error {
filelogOffsetSynchImagePullPolicy :=
readOptionalPullPolicyFromEnvironmentVariable(filelogOffsetSynchImagePullPolicyEnvVarName)

selfMonitoringAndApiAuthToken := os.Getenv(util.SelfMonitoringAndApiAuthTokenEnvVarName)

envVars = environmentVariables{
operatorNamespace: operatorNamespace,
deploymentName: deploymentName,
Expand All @@ -412,6 +415,7 @@ func readEnvironmentVariables() error {
configurationReloaderImagePullPolicy: configurationReloaderImagePullPolicy,
filelogOffsetSynchImage: filelogOffsetSynchImage,
filelogOffsetSynchImagePullPolicy: filelogOffsetSynchImagePullPolicy,
selfMonitoringAndApiAuthToken: selfMonitoringAndApiAuthToken,
}

return nil
Expand Down Expand Up @@ -514,7 +518,9 @@ func startDash0Controllers(
return fmt.Errorf("unable to set up the backend connection reconciler: %w", err)
}

persesDashboardCrdReconciler := &controller.PersesDashboardCrdReconciler{}
persesDashboardCrdReconciler := &controller.PersesDashboardCrdReconciler{
AuthToken: envVars.selfMonitoringAndApiAuthToken,
}
if err := persesDashboardCrdReconciler.SetupWithManager(ctx, mgr, startupTasksK8sClient, &setupLog); err != nil {
return fmt.Errorf("unable to set up the Perses dashboard reconciler: %w", err)
}
Expand Down Expand Up @@ -664,7 +670,7 @@ func instrumentAtStartup(

func logCurrentSelfMonitoringSettings(deploymentSelfReference *appsv1.Deployment) {
selfMonitoringConfiguration, err :=
selfmonitoring.GetSelfMonitoringConfigurationFromManagerDeployment(
selfmonitoring.GetSelfMonitoringConfigurationFromControllerDeployment(
deploymentSelfReference,
controller.ManagerContainerName,
)
Expand Down
4 changes: 2 additions & 2 deletions internal/backendconnection/backendconnection_manager_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
)

var (
operatorNamespace = Dash0OperatorNamespace
operatorNamespace = OperatorNamespace

dash0MonitoringResource = &dash0v1alpha1.Dash0Monitoring{
Spec: dash0v1alpha1.Dash0MonitoringSpec{
Expand All @@ -46,7 +46,7 @@ var _ = Describe("The backend connection manager", Ordered, func() {
var manager *BackendConnectionManager

BeforeAll(func() {
EnsureDash0OperatorNamespaceExists(ctx, k8sClient)
EnsureOperatorNamespaceExists(ctx, k8sClient)
EnsureTestNamespaceExists(ctx, k8sClient)
})

Expand Down
2 changes: 1 addition & 1 deletion internal/backendconnection/otelcolresources/desired_state_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ func findVolumeMountByName(objects []corev1.VolumeMount, name string) *corev1.Vo
// Note: There is no real need to parse the env vars on the daemonset back into a SelfMonitoringConfiguration, we could
// just read the env vars and check that they have the expected values. We might want to refactor/simplify later.
// However, this also tests the functionality used in
// selfmonitoring.GetSelfMonitoringConfigurationFromManagerDeployment.
// selfmonitoring.GetSelfMonitoringConfigurationFromControllerDeployment.
func parseBackSelfMonitoringEnvVarsFromCollectorDaemonSet(collectorDemonSet *appsv1.DaemonSet) (
selfmonitoring.SelfMonitoringConfiguration,
error,
Expand Down
78 changes: 39 additions & 39 deletions internal/backendconnection/otelcolresources/otelcol_resources_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ var (
},
ObjectMeta: metav1.ObjectMeta{
Name: "test-config-map",
Namespace: Dash0OperatorNamespace,
Namespace: OperatorNamespace,
Labels: map[string]string{
"label": "value",
},
Expand All @@ -48,7 +48,7 @@ var _ = Describe("The OpenTelemetry Collector resource manager", Ordered, func()
var dash0MonitoringResource *dash0v1alpha1.Dash0Monitoring

BeforeAll(func() {
EnsureDash0OperatorNamespaceExists(ctx, k8sClient)
EnsureOperatorNamespaceExists(ctx, k8sClient)
EnsureTestNamespaceExists(ctx, k8sClient)
dash0MonitoringResource = EnsureMonitoringResourceExists(ctx, k8sClient)
})
Expand All @@ -67,13 +67,13 @@ var _ = Describe("The OpenTelemetry Collector resource manager", Ordered, func()
AfterEach(func() {
Expect(oTelColResourceManager.DeleteResources(
ctx,
Dash0OperatorNamespace,
OperatorNamespace,
&logger,
)).To(Succeed())
Eventually(func(g Gomega) {
VerifyCollectorResourcesDoNotExist(ctx, k8sClient, Dash0OperatorNamespace)
VerifyCollectorResourcesDoNotExist(ctx, k8sClient, OperatorNamespace)
}, 500*time.Millisecond, 20*time.Millisecond).Should(Succeed())
Expect(k8sClient.DeleteAllOf(ctx, &corev1.ConfigMap{}, client.InNamespace(Dash0OperatorNamespace))).To(Succeed())
Expect(k8sClient.DeleteAllOf(ctx, &corev1.ConfigMap{}, client.InNamespace(OperatorNamespace))).To(Succeed())
})

Describe("when dealing with individual resources", func() {
Expand Down Expand Up @@ -125,7 +125,7 @@ var _ = Describe("The OpenTelemetry Collector resource manager", Ordered, func()
resourcesHaveBeenCreated, resourcesHaveBeenUpdated, err :=
oTelColResourceManager.CreateOrUpdateOpenTelemetryCollectorResources(
ctx,
Dash0OperatorNamespace,
OperatorNamespace,
TestImages,
dash0MonitoringResource,
&logger,
Expand All @@ -134,7 +134,7 @@ var _ = Describe("The OpenTelemetry Collector resource manager", Ordered, func()
Expect(resourcesHaveBeenCreated).To(BeTrue())
Expect(resourcesHaveBeenUpdated).To(BeFalse())

VerifyCollectorResources(ctx, k8sClient, Dash0OperatorNamespace)
VerifyCollectorResources(ctx, k8sClient, OperatorNamespace)
})

It("should fall back to the operator configuration export settings if the monitoring resource has no export", func() {
Expand All @@ -144,7 +144,7 @@ var _ = Describe("The OpenTelemetry Collector resource manager", Ordered, func()
)
resourcesHaveBeenCreated, resourcesHaveBeenUpdated, err := oTelColResourceManager.CreateOrUpdateOpenTelemetryCollectorResources(
ctx,
Dash0OperatorNamespace,
OperatorNamespace,
TestImages,
&dash0v1alpha1.Dash0Monitoring{
Spec: dash0v1alpha1.Dash0MonitoringSpec{},
Expand All @@ -154,13 +154,13 @@ var _ = Describe("The OpenTelemetry Collector resource manager", Ordered, func()
Expect(err).ToNot(HaveOccurred())
Expect(resourcesHaveBeenCreated).To(BeTrue())
Expect(resourcesHaveBeenUpdated).To(BeFalse())
VerifyCollectorResources(ctx, k8sClient, Dash0OperatorNamespace)
VerifyCollectorResources(ctx, k8sClient, OperatorNamespace)
})

It("should fail if the monitoring resource has no export and there is no operator configuration resource", func() {
_, _, err := oTelColResourceManager.CreateOrUpdateOpenTelemetryCollectorResources(
ctx,
Dash0OperatorNamespace,
OperatorNamespace,
TestImages,
&dash0v1alpha1.Dash0Monitoring{
Spec: dash0v1alpha1.Dash0MonitoringSpec{},
Expand All @@ -171,7 +171,7 @@ var _ = Describe("The OpenTelemetry Collector resource manager", Ordered, func()
MatchError(
"the provided Dash0Monitoring resource does not have an export configuration and no " +
"Dash0OperatorConfiguration resource has been found"))
VerifyCollectorResourcesDoNotExist(ctx, k8sClient, Dash0OperatorNamespace)
VerifyCollectorResourcesDoNotExist(ctx, k8sClient, OperatorNamespace)
})

It("should fail if the monitoring resource has no export and the existing operator configuration "+
Expand All @@ -183,7 +183,7 @@ var _ = Describe("The OpenTelemetry Collector resource manager", Ordered, func()
)
_, _, err := oTelColResourceManager.CreateOrUpdateOpenTelemetryCollectorResources(
ctx,
Dash0OperatorNamespace,
OperatorNamespace,
TestImages,
&dash0v1alpha1.Dash0Monitoring{
Spec: dash0v1alpha1.Dash0MonitoringSpec{},
Expand All @@ -192,21 +192,21 @@ var _ = Describe("The OpenTelemetry Collector resource manager", Ordered, func()
)
Expect(err).To(MatchError("the provided Dash0Monitoring resource does not have an export configuration " +
"and the Dash0OperatorConfiguration resource does not have one either"))
VerifyCollectorResourcesDoNotExist(ctx, k8sClient, Dash0OperatorNamespace)
VerifyCollectorResourcesDoNotExist(ctx, k8sClient, OperatorNamespace)
})

It("should delete outdated resources from older operator versions", func() {
nameOfOutdatedResources := fmt.Sprintf("%s-opentelemetry-collector-agent", NamePrefix)
Expect(k8sClient.Create(ctx, &corev1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: nameOfOutdatedResources,
Namespace: Dash0OperatorNamespace,
Namespace: OperatorNamespace,
},
})).To(Succeed())
Expect(k8sClient.Create(ctx, &appsv1.DaemonSet{
ObjectMeta: metav1.ObjectMeta{
Name: nameOfOutdatedResources,
Namespace: Dash0OperatorNamespace,
Namespace: OperatorNamespace,
},
Spec: appsv1.DaemonSetSpec{
Selector: &metav1.LabelSelector{
Expand All @@ -231,7 +231,7 @@ var _ = Describe("The OpenTelemetry Collector resource manager", Ordered, func()
_, _, err :=
oTelColResourceManager.CreateOrUpdateOpenTelemetryCollectorResources(
ctx,
Dash0OperatorNamespace,
OperatorNamespace,
TestImages,
dash0MonitoringResource,
&logger,
Expand All @@ -241,14 +241,14 @@ var _ = Describe("The OpenTelemetry Collector resource manager", Ordered, func()
VerifyResourceDoesNotExist(
ctx,
k8sClient,
Dash0OperatorNamespace,
OperatorNamespace,
nameOfOutdatedResources,
&corev1.ConfigMap{},
)
VerifyResourceDoesNotExist(
ctx,
k8sClient,
Dash0OperatorNamespace,
OperatorNamespace,
nameOfOutdatedResources,
&appsv1.DaemonSet{},
)
Expand All @@ -260,7 +260,7 @@ var _ = Describe("The OpenTelemetry Collector resource manager", Ordered, func()
_, _, err :=
oTelColResourceManager.CreateOrUpdateOpenTelemetryCollectorResources(
ctx,
Dash0OperatorNamespace,
OperatorNamespace,
TestImages,
dash0MonitoringResource,
&logger,
Expand All @@ -270,12 +270,12 @@ var _ = Describe("The OpenTelemetry Collector resource manager", Ordered, func()
// Change some arbitrary fields in some resources, then simulate a reconcile cycle and verify that all
// resources are back in their desired state.

daemonSetConifgMap := GetOTelColDaemonSetConfigMap(ctx, k8sClient, Dash0OperatorNamespace)
daemonSetConifgMap := GetOTelColDaemonSetConfigMap(ctx, k8sClient, OperatorNamespace)
daemonSetConifgMap.Data["config.yaml"] = "{}"
daemonSetConifgMap.Data["bogus-key"] = ""
Expect(k8sClient.Update(ctx, daemonSetConifgMap)).To(Succeed())

daemonSet := GetOTelColDaemonSet(ctx, k8sClient, Dash0OperatorNamespace)
daemonSet := GetOTelColDaemonSet(ctx, k8sClient, OperatorNamespace)
daemonSet.Spec.Template.Spec.InitContainers = []corev1.Container{}
daemonSet.Spec.Template.Spec.Containers[0].Image = "wrong-collector-image:latest"
daemonSet.Spec.Template.Spec.Containers[0].Ports = []corev1.ContainerPort{
Expand All @@ -284,12 +284,12 @@ var _ = Describe("The OpenTelemetry Collector resource manager", Ordered, func()
}
Expect(k8sClient.Update(ctx, daemonSet)).To(Succeed())

deploymentConfigMap := GetOTelColDeploymentConfigMap(ctx, k8sClient, Dash0OperatorNamespace)
deploymentConfigMap := GetOTelColDeploymentConfigMap(ctx, k8sClient, OperatorNamespace)
deploymentConfigMap.Data["config.yaml"] = "{}"
deploymentConfigMap.Data["bogus-key"] = ""
Expect(k8sClient.Update(ctx, deploymentConfigMap)).To(Succeed())

deployment := GetOTelColDeployment(ctx, k8sClient, Dash0OperatorNamespace)
deployment := GetOTelColDeployment(ctx, k8sClient, OperatorNamespace)
var changedReplicas int32 = 5
deployment.Spec.Replicas = &changedReplicas
deployment.Spec.Template.Spec.Containers[0].Ports = []corev1.ContainerPort{
Expand All @@ -300,7 +300,7 @@ var _ = Describe("The OpenTelemetry Collector resource manager", Ordered, func()
resourcesHaveBeenCreated, resourcesHaveBeenUpdated, err :=
oTelColResourceManager.CreateOrUpdateOpenTelemetryCollectorResources(
ctx,
Dash0OperatorNamespace,
OperatorNamespace,
TestImages,
dash0MonitoringResource,
&logger,
Expand All @@ -309,7 +309,7 @@ var _ = Describe("The OpenTelemetry Collector resource manager", Ordered, func()
Expect(resourcesHaveBeenCreated).To(BeFalse())
Expect(resourcesHaveBeenUpdated).To(BeTrue())

VerifyCollectorResources(ctx, k8sClient, Dash0OperatorNamespace)
VerifyCollectorResources(ctx, k8sClient, OperatorNamespace)
})
})

Expand All @@ -318,7 +318,7 @@ var _ = Describe("The OpenTelemetry Collector resource manager", Ordered, func()
_, _, err :=
oTelColResourceManager.CreateOrUpdateOpenTelemetryCollectorResources(
ctx,
Dash0OperatorNamespace,
OperatorNamespace,
TestImages,
dash0MonitoringResource,
&logger,
Expand All @@ -328,27 +328,27 @@ var _ = Describe("The OpenTelemetry Collector resource manager", Ordered, func()
// Delete some arbitrary resources, then simulate a reconcile cycle and verify that all resources have been
// recreated.

daemonSetConifgMap := GetOTelColDaemonSetConfigMap(ctx, k8sClient, Dash0OperatorNamespace)
daemonSetConifgMap := GetOTelColDaemonSetConfigMap(ctx, k8sClient, OperatorNamespace)
Expect(k8sClient.Delete(ctx, daemonSetConifgMap)).To(Succeed())

deploymentConfigMap := GetOTelColDeploymentConfigMap(ctx, k8sClient, Dash0OperatorNamespace)
deploymentConfigMap := GetOTelColDeploymentConfigMap(ctx, k8sClient, OperatorNamespace)
Expect(k8sClient.Delete(ctx, deploymentConfigMap)).To(Succeed())

deployment := GetOTelColDeployment(ctx, k8sClient, Dash0OperatorNamespace)
deployment := GetOTelColDeployment(ctx, k8sClient, OperatorNamespace)
Expect(k8sClient.Delete(ctx, deployment)).To(Succeed())

resourcesHaveBeenCreated, _, err :=
oTelColResourceManager.CreateOrUpdateOpenTelemetryCollectorResources(
ctx,
Dash0OperatorNamespace,
OperatorNamespace,
TestImages,
dash0MonitoringResource,
&logger,
)
Expect(err).ToNot(HaveOccurred())
Expect(resourcesHaveBeenCreated).To(BeTrue())

VerifyCollectorResources(ctx, k8sClient, Dash0OperatorNamespace)
VerifyCollectorResources(ctx, k8sClient, OperatorNamespace)
})
})

Expand All @@ -357,7 +357,7 @@ var _ = Describe("The OpenTelemetry Collector resource manager", Ordered, func()
// create resources
_, _, err := oTelColResourceManager.CreateOrUpdateOpenTelemetryCollectorResources(
ctx,
Dash0OperatorNamespace,
OperatorNamespace,
TestImages,
dash0MonitoringResource,
&logger,
Expand All @@ -369,7 +369,7 @@ var _ = Describe("The OpenTelemetry Collector resource manager", Ordered, func()
// resources).
resourcesHaveBeenCreated, resourcesHaveBeenUpdated, err := oTelColResourceManager.CreateOrUpdateOpenTelemetryCollectorResources(
ctx,
Dash0OperatorNamespace,
OperatorNamespace,
TestImages,
dash0MonitoringResource,
&logger,
Expand All @@ -383,7 +383,7 @@ var _ = Describe("The OpenTelemetry Collector resource manager", Ordered, func()
resourcesHaveBeenCreated, resourcesHaveBeenUpdated, err =
oTelColResourceManager.CreateOrUpdateOpenTelemetryCollectorResources(
ctx,
Dash0OperatorNamespace,
OperatorNamespace,
TestImages,
dash0MonitoringResource,
&logger,
Expand All @@ -392,7 +392,7 @@ var _ = Describe("The OpenTelemetry Collector resource manager", Ordered, func()
Expect(resourcesHaveBeenCreated).To(BeFalse())
Expect(resourcesHaveBeenUpdated).To(BeFalse())

VerifyCollectorResources(ctx, k8sClient, Dash0OperatorNamespace)
VerifyCollectorResources(ctx, k8sClient, OperatorNamespace)
})
})

Expand All @@ -401,23 +401,23 @@ var _ = Describe("The OpenTelemetry Collector resource manager", Ordered, func()
// create resources (so there is something to delete)
_, _, err := oTelColResourceManager.CreateOrUpdateOpenTelemetryCollectorResources(
ctx,
Dash0OperatorNamespace,
OperatorNamespace,
TestImages,
dash0MonitoringResource,
&logger,
)
Expect(err).ToNot(HaveOccurred())
VerifyCollectorResources(ctx, k8sClient, Dash0OperatorNamespace)
VerifyCollectorResources(ctx, k8sClient, OperatorNamespace)

// delete everything again
err = oTelColResourceManager.DeleteResources(
ctx,
Dash0OperatorNamespace,
OperatorNamespace,
&logger,
)
Expect(err).ToNot(HaveOccurred())

VerifyCollectorResourcesDoNotExist(ctx, k8sClient, Dash0OperatorNamespace)
VerifyCollectorResourcesDoNotExist(ctx, k8sClient, OperatorNamespace)
})
})
})
Expand Down
Loading

0 comments on commit 42461df

Please sign in to comment.