From 01dcb99bc3064ba436dbaacb34cb4322e4b3850b Mon Sep 17 00:00:00 2001 From: Luis Garcia Date: Thu, 22 Oct 2020 08:39:50 +0200 Subject: [PATCH 1/9] Update documentation for Operator v0.9.0 release --- CHANGELOG.md | 36 +++++++++++++++++++++++++----------- README.md | 3 ++- deploy/cr-apm.yaml | 24 +++++++++++------------- deploy/cr.yaml | 10 ++++++++-- 4 files changed, 46 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 885612bc..d6d11c30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,24 +1,39 @@ # Changelog -### Future +## v0.9 + +### v0.9.0 #### Features -* Control whether the init container crashes in case of download failures through the `oneagent.dynatrace.com/failure-policy: fail` annotation, off by default ([#288](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/234)) -* Adaptions to the OneAgent webhook injection ([#286](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/286), [#290](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/290), [#301](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/301)) - * When enabled, use image from Dynatrace environment's Docker registry to fetch OneAgent binaries. - * Disabled when a custom installer URL annotation is set, or `.spec.useImmutableImage` is false ([#306](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/306)) - * A dedicated OneAgent version can be set as a property now (e.g. 1.185.1). If not set it defaults to the latest version -* Added the metrics endpoint for the webhook pod (port 8383 and 8484) ([#305](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/305)) -* Fixed the metrics port for the operator pod ([#305](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/305)) -* Added check if cluster and agent versions are compatible with immutable images ([#314](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/314), [#334](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/334)) +* Added support for immutable OneAgent images where the OneAgent package has been embedded into. + + Enabled by using the `.spec.useImmutableImage` field on the OneAgent ([#300](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/300)) and OneAgentAPM ([#286](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/286), [#290](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/290), [#301](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/301)) custom resources, and off by default. + + By default images are fetched from the Docker registry provisioned from the Dynatrace or ActiveGate instance configured as API URL. + + * For OneAgent objects, the image used can be overriden on the `.spec.image` field. + * For OneAgentAPM objects, it can be done as well through the `oneagent.dynatrace.com/image` Pod annotation. + + If using the default image, an specific OneAgent version can be also configured through the `.spec.agentVersion` in both OneAgent and OneAgentAPM objects. If unset, the latest is used. + + Notes: + * For OneAgentAPM deployments, the Secret's `apiToken` needs to be set. + * `.spec.proxy` and `.spec.trustedCAs` are ignored when using the immutable image. The container runtime (e.g., Docker) use their own independent settings as well. +* Provide Prometheus metrics for the Operator pod on port 8080, and Webhook Pod on ports 8383 and 8484 ([#305](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/305)) +* Control whether the init container crashes in case of download failures through the `oneagent.dynatrace.com/failure-policy: fail` Pod annotation, off by default ([#288](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/288)) + * Regardless of the annotation, if the unzip operation fails, a file `package.zip` will be included on the target directory for debugging purposes. + +* Early Adopter: support full-stack OneAgent running on unprivileged mode ([#324](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/324), [#332](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/332)) #### Bug fixes * Logged errors when API token is missing on OneAgentAPM's secret ([#298](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/298)) -* Fixed printing the name of the used token secret for OneAgent instances ([311](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/311)) +* Fixed printing the name of the used token secret for OneAgent instances ([311](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/311)) * Fixed setting instances metadata when auto-update is disabled ([#313](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/313)) * Fixed logging problem - [incorrect stackdriver severity on GCP](https://github.com/Dynatrace/dynatrace-oneagent-operator/issues/277) ([#318](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/318)) #### Other changes +* Added check if cluster and agent versions are compatible with immutable images ([#314](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/314), [#334](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/334)) +* Immutable image mode is disabled when a custom installer URL annotation is set, or `.spec.useImmutableImage` is false ([#306](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/306)) * Pod and node metadata added for the OneAgent ([#294](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/294), [#295](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/295), [#308](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/308), [#325](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/325), [#326](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/326)) * Code cleanup to remove unused functions, variables and beautify the code ([#302](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/302)) * Sped up TravisCI duration ([#310](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/310), [#312](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/312)) @@ -26,7 +41,6 @@ * Added a resource limit and resource request for the OneAgentAPM initContainer ([#315](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/315), [#317](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/317)) * Add linter to TravisCI pipeline ([#316](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/316)) * App-only init container will log an warning when the full-stack OneAgent has been injected on it ([#323](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/323)) -* Early Adopter: support full-stack OneAgent running on unprivileged mode ([#324](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/324), [#332](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/332)) * Improve error message when OneAgentAPM is missing ([#327](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/327)) * Improve descriptions on cr.yaml example ([#328](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/328)) diff --git a/README.md b/README.md index b0e3f3fd..b12d1b2b 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,8 @@ Depending of the version of the Dynatrace OneAgent Operator, it supports the fol | Dynatrace OneAgent Operator version | Kubernetes | OpenShift Container Platform | | ----------------------------------- | ---------- | ------------------------------------------ | -| master | 1.14+ | 3.11[[1]](#openshift-311), 4.1+ | +| master | 1.15+ | 3.11[[1]](#openshift-311), 4.3+ | +| v0.9.0 | 1.15+ | 3.11[[1]](#openshift-311), 4.3+ | | v0.8.2 | 1.14+ | 3.11[[1]](#openshift-311), 4.1+ | | v0.7.1 | 1.14+ | 3.11[[1]](#openshift-311), 4.1+ | | v0.6.0 | 1.11+ | 3.11+ | diff --git a/deploy/cr-apm.yaml b/deploy/cr-apm.yaml index 9948fbeb..dca0c5a8 100644 --- a/deploy/cr-apm.yaml +++ b/deploy/cr-apm.yaml @@ -9,22 +9,20 @@ spec: # Either set ENVIRONMENTID to the proper tenant id or change the apiUrl as a whole, e.q. for Managed. apiUrl: https://ENVIRONMENTID.live.dynatrace.com/api - # Optional: Custom OneAgent docker image - # In case you have the docker image for the oneagent in a custom docker registry you need to provide it here - # - image: "" - - # if set the immutable image from the dynatrace environment or your custom registry will be used - # else the installer will be used - useImmutableImage: false + # Name of secret holding `paasToken`. If unset, name of custom resource is used. + tokens: "oneagent" - # Optional: The version of the oneagent to be used - # Default (if nothing set): latest + # [Since Operator v0.9.0] + # Optional: if enabled, the Operator will use the immutable image from the Dynatrace environment + # or from your custom registry, otherwise an installer image is used. # - agentVersion: "" + # useImmutableImage: true - # Name of secret holding `paasToken`. If unset, name of custom resource is used. - tokens: "oneagent" + # [Since Operator v0.9.0] + # Optional: set agent version to use when immutable images are enabled, and the default image is + # used. Latest by default. + # + # agentVersion: "" # Optional: disable certificate validation checks for installer download and API communication. # diff --git a/deploy/cr.yaml b/deploy/cr.yaml index fa5889fd..61fbd6fa 100644 --- a/deploy/cr.yaml +++ b/deploy/cr.yaml @@ -35,12 +35,18 @@ spec: # # image: "" - # [On development, to be released] + # [Since Operator v0.9.0] # Optional: if enabled, the Operator will use the immutable image from the Dynatrace environment # or from your custom registry, otherwise an installer image is used. # # useImmutableImage: true + # [Since Operator v0.9.0] + # Optional: set agent version to use when immutable images are enabled, and the default image is + # used. Latest by default. + # + # agentVersion: "" + # Optional: arguments to add to the OneAgent installer. # Available options: https://www.dynatrace.com/support/help/shortlink/linux-custom-installation # Limitations: https://www.dynatrace.com/support/help/shortlink/oneagent-docker#limitations @@ -121,7 +127,7 @@ spec: # # networkZone: name-of-my-network-zone - # [On development, to be released as Early Adopter] + # [Since Operator v0.9.0, Early Adopter] # Optional: when enabled the OneAgent Pods will run as unprivileged. Disabled by default. # # useUnprivilegedMode: true From 12ab246488f9e73052d9781437aa9592f35add83 Mon Sep 17 00:00:00 2001 From: Luis Garcia Date: Thu, 22 Oct 2020 09:14:49 +0200 Subject: [PATCH 2/9] Hide unready OneAgent and OneAgentAPM fields --- pkg/apis/dynatrace/v1alpha1/oneagent_types.go | 2 +- pkg/apis/dynatrace/v1alpha1/oneagentapm_types.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/apis/dynatrace/v1alpha1/oneagent_types.go b/pkg/apis/dynatrace/v1alpha1/oneagent_types.go index 11e6ddfb..b2b68630 100644 --- a/pkg/apis/dynatrace/v1alpha1/oneagent_types.go +++ b/pkg/apis/dynatrace/v1alpha1/oneagent_types.go @@ -60,7 +60,7 @@ type OneAgentSpec struct { // Work in progress // Disables automatic injection into applications // OneAgentAPM together with the webhook will then do the injection - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=false // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors.displayName="Webhook injection" // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors.x-descriptors="urn:alm:descriptor:com.tectonic.ui:advanced,urn:alm:descriptor:com.tectonic.ui:booleanSwitch" WebhookInjection bool `json:"webhookInjection,omitempty"` diff --git a/pkg/apis/dynatrace/v1alpha1/oneagentapm_types.go b/pkg/apis/dynatrace/v1alpha1/oneagentapm_types.go index a7a8ff90..4ee5a90a 100644 --- a/pkg/apis/dynatrace/v1alpha1/oneagentapm_types.go +++ b/pkg/apis/dynatrace/v1alpha1/oneagentapm_types.go @@ -28,7 +28,7 @@ type OneAgentAPMSpec struct { // Optional: Custom code modules OneAgent docker image // In case you have the docker image for the oneagent in a custom docker registry you need to provide it here - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=false // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors.displayName="Image" // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors.x-descriptors="urn:alm:descriptor:com.tectonic.ui:advanced,urn:alm:descriptor:com.tectonicx.ui:text" Image string `json:"image,omitempty"` From b59745175e698d7911eb719d81993f0c35016bc6 Mon Sep 17 00:00:00 2001 From: Luis Garcia Date: Fri, 23 Oct 2020 10:21:24 +0200 Subject: [PATCH 3/9] Return errors when looking at outdated OneAgent Pods --- pkg/controller/oneagent/oneagent_update.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/controller/oneagent/oneagent_update.go b/pkg/controller/oneagent/oneagent_update.go index 31520eb6..809e9eb1 100644 --- a/pkg/controller/oneagent/oneagent_update.go +++ b/pkg/controller/oneagent/oneagent_update.go @@ -142,23 +142,22 @@ func (r *ReconcileOneAgent) findOutdatedPodsImmutableImage(logger logr.Logger, i // If image is not yet pulled skip check continue } - logger.Info("pods container status", "pod", pod.Name, "container", status.Name, "image id", status.ImageID) + logger.Info("pods container status", "pod", pod.Name, "container", status.Name, "imageID", status.ImageID) imagePullSecret := &corev1.Secret{} pullSecretName := instance.GetName() + "-pull-secret" if instance.GetOneAgentSpec().CustomPullSecret != "" { pullSecretName = instance.GetOneAgentSpec().CustomPullSecret } + err := r.client.Get(context.TODO(), client.ObjectKey{Namespace: pod.Namespace, Name: pullSecretName}, imagePullSecret) if err != nil { - logger.Error(err, err.Error()) + return nil, err } isLatest, err := isLatestFn(logger, status.Image, status.ImageID, imagePullSecret) if err != nil { - logger.Info(err.Error()) - //Error during image check, do nothing an continue with next status - continue + return nil, fmt.Errorf("failed to verify if Pod is outdated: %w", err) } if !isLatest { From 8d46860464ec8b019124fe76e0a8702138121955 Mon Sep 17 00:00:00 2001 From: Luis Garcia Date: Fri, 23 Oct 2020 12:33:16 +0200 Subject: [PATCH 4/9] Init container resources are configurable --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6d11c30..82e35c2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,7 +23,9 @@ * Control whether the init container crashes in case of download failures through the `oneagent.dynatrace.com/failure-policy: fail` Pod annotation, off by default ([#288](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/288)) * Regardless of the annotation, if the unzip operation fails, a file `package.zip` will be included on the target directory for debugging purposes. -* Early Adopter: support full-stack OneAgent running on unprivileged mode ([#324](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/324), [#332](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/332)) +* Resource limits and requests for the OneAgentAPM initContainer are configurable on the `.spec.resources` field ([#332](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/332)) + +* Early Adopter: support full-stack OneAgent running on unprivileged mode ([#324](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/324), [#333](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/333)) #### Bug fixes * Logged errors when API token is missing on OneAgentAPM's secret ([#298](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/298)) @@ -38,7 +40,6 @@ * Code cleanup to remove unused functions, variables and beautify the code ([#302](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/302)) * Sped up TravisCI duration ([#310](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/310), [#312](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/312)) * Upgrade to Go 1.15 ([#310](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/310)) -* Added a resource limit and resource request for the OneAgentAPM initContainer ([#315](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/315), [#317](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/317)) * Add linter to TravisCI pipeline ([#316](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/316)) * App-only init container will log an warning when the full-stack OneAgent has been injected on it ([#323](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/323)) * Improve error message when OneAgentAPM is missing ([#327](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/327)) From 804e89e09b9d48de10045e1115691f1578ad71b6 Mon Sep 17 00:00:00 2001 From: Luis Garcia Date: Fri, 23 Oct 2020 12:34:04 +0200 Subject: [PATCH 5/9] Create pull secrets when default image is used --- pkg/controller/oneagent/oneagent_controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/controller/oneagent/oneagent_controller.go b/pkg/controller/oneagent/oneagent_controller.go index d0ab4b8e..889465ee 100644 --- a/pkg/controller/oneagent/oneagent_controller.go +++ b/pkg/controller/oneagent/oneagent_controller.go @@ -221,7 +221,7 @@ func (r *ReconcileOneAgent) reconcileImpl(rec *reconciliation) { return } - if rec.instance.GetOneAgentStatus().UseImmutableImage && rec.instance.GetOneAgentSpec().CustomPullSecret == "" { + if rec.instance.GetOneAgentStatus().UseImmutableImage && rec.instance.GetOneAgentSpec().Image == "" { err = r.reconcilePullSecret(rec.instance, rec.log) if rec.Error(err) { return From 3a6af17679d5c5de8b17260693044e3473e4cb34 Mon Sep 17 00:00:00 2001 From: Luis Garcia Date: Fri, 23 Oct 2020 17:33:04 +0200 Subject: [PATCH 6/9] Allow custom images on OneAgent CR --- pkg/controller/oneagent/oneagent_controller.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/controller/oneagent/oneagent_controller.go b/pkg/controller/oneagent/oneagent_controller.go index 889465ee..aac200a9 100644 --- a/pkg/controller/oneagent/oneagent_controller.go +++ b/pkg/controller/oneagent/oneagent_controller.go @@ -577,6 +577,11 @@ func preparePodSpecImmutableImage(p *corev1.PodSpec, instance *dynatracev1alpha1 Name: pullSecretName, }) + if instance.Spec.Image != "" { + p.Containers[0].Image = instance.Spec.Image + return nil + } + i, err := utils.BuildOneAgentImage(instance.GetSpec().APIURL, instance.GetOneAgentSpec().AgentVersion) if err != nil { return err From 10ab242f69c65d328a1d7b49408472f4ba560f8d Mon Sep 17 00:00:00 2001 From: Luis Garcia Date: Fri, 23 Oct 2020 18:23:23 +0200 Subject: [PATCH 7/9] Set minimum versions for immutable images --- pkg/version/agent_version.go | 2 +- pkg/version/cluster_version.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/version/agent_version.go b/pkg/version/agent_version.go index 7faf37ac..ec57a440 100644 --- a/pkg/version/agent_version.go +++ b/pkg/version/agent_version.go @@ -7,7 +7,7 @@ import ( // Pre-production, adapt accordingly once images are released var minSupportedAgentVersion = versionInfo{ major: 1, - minor: 198, + minor: 203, release: 0, } diff --git a/pkg/version/cluster_version.go b/pkg/version/cluster_version.go index 6cdaa2c3..e204c966 100644 --- a/pkg/version/cluster_version.go +++ b/pkg/version/cluster_version.go @@ -6,7 +6,7 @@ import ( var minSupportedClusterVersion = versionInfo{ major: 1, - minor: 198, + minor: 205, release: 0, } From 4a231fbd867a4d7729a26ccd24cd3524e363a21a Mon Sep 17 00:00:00 2001 From: Luis Garcia Date: Fri, 23 Oct 2020 18:24:26 +0200 Subject: [PATCH 8/9] Discard support for immutable images while until it's ready on the cluster side --- CHANGELOG.md | 15 +-------------- deploy/cr-apm.yaml | 12 ------------ deploy/cr.yaml | 12 ------------ 3 files changed, 1 insertion(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82e35c2f..0992929c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,20 +5,6 @@ ### v0.9.0 #### Features -* Added support for immutable OneAgent images where the OneAgent package has been embedded into. - - Enabled by using the `.spec.useImmutableImage` field on the OneAgent ([#300](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/300)) and OneAgentAPM ([#286](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/286), [#290](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/290), [#301](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/301)) custom resources, and off by default. - - By default images are fetched from the Docker registry provisioned from the Dynatrace or ActiveGate instance configured as API URL. - - * For OneAgent objects, the image used can be overriden on the `.spec.image` field. - * For OneAgentAPM objects, it can be done as well through the `oneagent.dynatrace.com/image` Pod annotation. - - If using the default image, an specific OneAgent version can be also configured through the `.spec.agentVersion` in both OneAgent and OneAgentAPM objects. If unset, the latest is used. - - Notes: - * For OneAgentAPM deployments, the Secret's `apiToken` needs to be set. - * `.spec.proxy` and `.spec.trustedCAs` are ignored when using the immutable image. The container runtime (e.g., Docker) use their own independent settings as well. * Provide Prometheus metrics for the Operator pod on port 8080, and Webhook Pod on ports 8383 and 8484 ([#305](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/305)) * Control whether the init container crashes in case of download failures through the `oneagent.dynatrace.com/failure-policy: fail` Pod annotation, off by default ([#288](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/288)) * Regardless of the annotation, if the unzip operation fails, a file `package.zip` will be included on the target directory for debugging purposes. @@ -34,6 +20,7 @@ * Fixed logging problem - [incorrect stackdriver severity on GCP](https://github.com/Dynatrace/dynatrace-oneagent-operator/issues/277) ([#318](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/318)) #### Other changes +* Added support for immutable OneAgent images - waiting for support on Dynatrace cluster ([#300](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/300), [#286](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/286), [#290](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/290), [#301](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/301)) * Added check if cluster and agent versions are compatible with immutable images ([#314](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/314), [#334](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/334)) * Immutable image mode is disabled when a custom installer URL annotation is set, or `.spec.useImmutableImage` is false ([#306](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/306)) * Pod and node metadata added for the OneAgent ([#294](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/294), [#295](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/295), [#308](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/308), [#325](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/325), [#326](https://github.com/Dynatrace/dynatrace-oneagent-operator/pull/326)) diff --git a/deploy/cr-apm.yaml b/deploy/cr-apm.yaml index dca0c5a8..1252818b 100644 --- a/deploy/cr-apm.yaml +++ b/deploy/cr-apm.yaml @@ -12,18 +12,6 @@ spec: # Name of secret holding `paasToken`. If unset, name of custom resource is used. tokens: "oneagent" - # [Since Operator v0.9.0] - # Optional: if enabled, the Operator will use the immutable image from the Dynatrace environment - # or from your custom registry, otherwise an installer image is used. - # - # useImmutableImage: true - - # [Since Operator v0.9.0] - # Optional: set agent version to use when immutable images are enabled, and the default image is - # used. Latest by default. - # - # agentVersion: "" - # Optional: disable certificate validation checks for installer download and API communication. # # skipCertCheck: false diff --git a/deploy/cr.yaml b/deploy/cr.yaml index 61fbd6fa..7bb7e253 100644 --- a/deploy/cr.yaml +++ b/deploy/cr.yaml @@ -35,18 +35,6 @@ spec: # # image: "" - # [Since Operator v0.9.0] - # Optional: if enabled, the Operator will use the immutable image from the Dynatrace environment - # or from your custom registry, otherwise an installer image is used. - # - # useImmutableImage: true - - # [Since Operator v0.9.0] - # Optional: set agent version to use when immutable images are enabled, and the default image is - # used. Latest by default. - # - # agentVersion: "" - # Optional: arguments to add to the OneAgent installer. # Available options: https://www.dynatrace.com/support/help/shortlink/linux-custom-installation # Limitations: https://www.dynatrace.com/support/help/shortlink/oneagent-docker#limitations From e16287f2feaaa8e94e8cc090f28d4e9c3e4e35d5 Mon Sep 17 00:00:00 2001 From: Luis Garcia Date: Fri, 23 Oct 2020 18:30:19 +0200 Subject: [PATCH 9/9] Fix test --- pkg/version/cluster_version_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/version/cluster_version_test.go b/pkg/version/cluster_version_test.go index 2e78230a..64633d11 100644 --- a/pkg/version/cluster_version_test.go +++ b/pkg/version/cluster_version_test.go @@ -12,7 +12,7 @@ func TestIsRemoteClusterVersionSupported(t *testing.T) { logger := zap.New(zap.UseDevMode(true), zap.WriteTo(os.Stdout)) t.Run("IsRemoteClusterVersionSupported", func(t *testing.T) { - isSupported := IsRemoteClusterVersionSupported(logger, "1.203.0") + isSupported := IsRemoteClusterVersionSupported(logger, "1.205.0") assert.True(t, isSupported) }) t.Run("IsRemoteClusterVersionSupported unsupported version", func(t *testing.T) {