fix: Modify upgrade_local_vs_remote test to get new remote version from config instead of updater (#1462)

Author: alvarocabanas

agent-control/tests/k8s/agent_control_cli/installation.rs

@@ -1,12 +1,13 @@
+use crate::common::opamp::FakeServer;
 use crate::common::runtime::block_on;
 use crate::k8s::self_update::LOCAL_CHART_REPOSITORY;
 use crate::k8s::tools::cmd::{assert_stdout_contains, print_cli_output};
 use crate::k8s::tools::k8s_api::create_values_secret;
 use crate::k8s::tools::k8s_env::K8sEnv;
+use crate::k8s::tools::opamp::get_minikube_opamp_url_from_fake_server;
 use assert_cmd::Command;
 use kube::Client;
 use std::time::Duration;
-
 // NOTE: The tests below are using the latest '*' chart version, and they will likely fail
 // if breaking changes need to be introduced in the chart.
 // If this situation occurs, we need to temporarily skip the tests or use
@@ -20,12 +21,14 @@ fn k8s_cli_install_agent_control_installation_with_invalid_chart_version() {
     let mut k8s_env = block_on(K8sEnv::new());
     let ac_namespace = block_on(k8s_env.test_namespace());
     let subagents_namespace = block_on(k8s_env.test_namespace());
+    let opamp_server = FakeServer::start_new();
 
     create_simple_values_secret(
         k8s_env.client.clone(),
         &ac_namespace,
         &subagents_namespace,
         "test-secret",
+        opamp_server.endpoint().as_str(),
         "values.yaml",
     );
 
@@ -71,12 +74,14 @@ fn k8s_cli_install_agent_control_installation_failed_upgrade() {
     let mut k8s_env = block_on(K8sEnv::new());
     let ac_namespace = block_on(k8s_env.test_namespace());
     let subagents_namespace = block_on(k8s_env.test_namespace());
+    let opamp_server = FakeServer::start_new();
 
     create_simple_values_secret(
         k8s_env.client.clone(),
         &ac_namespace,
         &subagents_namespace,
         "test-secret",
+        opamp_server.endpoint().as_str(),
         "values.yaml",
     );
 
@@ -116,15 +121,28 @@ pub(crate) fn create_simple_values_secret(
     ac_ns: &str,
     subagents_ns: &str,
     secret_name: &str,
+    opamp_url: &str,
     values_key: &str,
 ) {
+    let opamp_endpoint = get_minikube_opamp_url_from_fake_server(opamp_url);
+
     let values = serde_json::json!({
         "nameOverride": "",
         "subAgentsNamespace": subagents_ns,
         "config": {
             "fleet_control": {
                 "enabled": false,
             },
+            "agentControl": {
+                "content": {
+                    "fleet_control": {
+                        "endpoint": opamp_endpoint.as_str(),
+                        "signature_validation": {
+                            "enabled": "false",
+                        },
+                    },
+                },
+            },
         },
         "global": {
             "cluster": "test-cluster",

agent-control/tests/k8s/agent_control_cli/upgrade_local_vs_remote.rs

@@ -1,14 +1,14 @@
+use crate::common::opamp::{ConfigResponse, FakeServer};
 use crate::common::retry::retry;
 use crate::common::runtime::{block_on, tokio_runtime};
 use crate::k8s::agent_control_cli::installation::{ac_install_cmd, create_simple_values_secret};
 use crate::k8s::self_update::{LOCAL_CHART_NEW_VERSION, LOCAL_CHART_PREVIOUS_VERSION};
 use crate::k8s::tools::cmd::print_cli_output;
+use crate::k8s::tools::instance_id;
 use crate::k8s::tools::k8s_env::K8sEnv;
-use newrelic_agent_control::agent_control::config::{
-    AgentControlDynamicConfig, helmrelease_v2_type_meta,
-};
-use newrelic_agent_control::agent_control::version_updater::k8s::K8sACUpdater;
-use newrelic_agent_control::agent_control::version_updater::updater::VersionUpdater;
+use crate::k8s::tools::logs::print_pod_logs;
+use newrelic_agent_control::agent_control::agent_id::AgentID;
+use newrelic_agent_control::agent_control::config::helmrelease_v2_type_meta;
 use newrelic_agent_control::cli::install_agent_control::RELEASE_NAME;
 use newrelic_agent_control::k8s::client::{ClientConfig, SyncK8sClient};
 use newrelic_agent_control::k8s::labels::{AGENT_CONTROL_VERSION_SET_FROM, LOCAL_VAL, REMOTE_VAL};
@@ -17,24 +17,30 @@ use std::error::Error;
 use std::sync::Arc;
 use std::time::Duration;
 
+const CLI_AC_LABEL_SELECTOR: &str = "app.kubernetes.io/name=agent-control-deployment";
+
 #[test]
 #[ignore = "needs k8s cluster"]
 // This test can break if the chart introduces any breaking changes.
 // If this situation occurs, we will need to disable the test or use
 // a similar workaround than the one we use in the tiltfile.
 // The test is checking how local and remote upgrade are interacting
 fn k8s_cli_local_and_remote_updates() {
+    let mut opamp_server = FakeServer::start_new();
     let mut k8s_env = block_on(K8sEnv::new());
     let ac_namespace = block_on(k8s_env.test_namespace());
     let subagents_namespace = block_on(k8s_env.test_namespace());
     let k8s_client =
         Arc::new(SyncK8sClient::try_new(tokio_runtime(), &ClientConfig::new()).unwrap());
 
+    print_pod_logs(k8s_env.client.clone(), &ac_namespace, CLI_AC_LABEL_SELECTOR);
+
     create_simple_values_secret(
         k8s_env.client.clone(),
         &ac_namespace,
         &subagents_namespace,
         "test-secret",
+        opamp_server.endpoint().as_str(),
         "values.yaml",
     );
 
@@ -76,20 +82,24 @@ fn k8s_cli_local_and_remote_updates() {
         )
     });
 
-    // running updater doing an upgrade to "*"
-    let updater = K8sACUpdater::new(
-        k8s_client.clone(),
-        ac_namespace.clone(),
-        LOCAL_CHART_NEW_VERSION.to_string(),
-    );
     let latest_version = "*";
-    let config_to_update = &AgentControlDynamicConfig {
-        agents: Default::default(),
-        chart_version: Some(latest_version.to_string()),
-    };
-    updater
-        .update(config_to_update)
-        .expect("updater should not fail");
+    let ac_instance_id = instance_id::get_instance_id(
+        k8s_env.client.clone(),
+        ac_namespace.as_str(),
+        &AgentID::new_agent_control_id(),
+    );
+    opamp_server.set_config_response(
+        ac_instance_id.clone(),
+        ConfigResponse::from(
+            format!(
+                r#"
+agents: {{}}
+chart_version: "{latest_version}"
+"#
+            )
+            .as_str(),
+        ),
+    );
 
     retry(15, Duration::from_secs(5), || {
         check_version_and_source(&k8s_client, latest_version, REMOTE_VAL, &ac_namespace)

agent-control/tests/k8s/self_update.rs

@@ -8,6 +8,7 @@ use crate::common::retry::retry;
 use crate::common::runtime::block_on;
 use crate::k8s::tools::instance_id;
 use crate::k8s::tools::logs::{AC_LABEL_SELECTOR, print_pod_logs};
+use crate::k8s::tools::opamp::get_minikube_opamp_url_from_fake_server;
 use assert_cmd::Command;
 use k8s_openapi::api::core::v1::Pod;
 use kube::api::ListParams;
@@ -17,10 +18,8 @@ use newrelic_agent_control::agent_control::defaults::OPAMP_CHART_VERSION_ATTRIBU
 use newrelic_agent_control::opamp::instance_id::InstanceID;
 use opamp_client::opamp::proto::any_value::Value;
 use opamp_client::opamp::proto::{AnyValue, KeyValue, RemoteConfigStatuses};
-use std::str::FromStr;
 use std::time::Duration;
 use url::Url;
-
 // These tests leverages an in-cluster chart repository populated with fixed versions which consist in the latest
 // released chart with a changed version.
 // The AC image corresponds to the compiled from the current code. Tilt is used to orchestrate all these
@@ -41,10 +40,6 @@ const MISSING_VERSION: &str = "9.9.9";
 const SECRET_NAME: &str = "ac-values";
 const VALUES_KEY: &str = "values.yaml";
 
-// URL to access to services binded on ports from minikube host
-// https://minikube.sigs.k8s.io/docs/handbook/host-access/
-const MINIKUBE_HOST_ACCESS: &str = "host.minikube.internal";
-
 #[test]
 #[ignore = "needs k8s cluster"]
 /// This test installs AC using the image from our public repository,
@@ -381,8 +376,7 @@ fn bootstrap_ac(
     namespace: &str,
     chart_version: &str,
 ) -> InstanceID {
-    let mut opamp_endpoint = Url::from_str(&opamp_server.endpoint()).unwrap();
-    opamp_endpoint.set_host(Some(MINIKUBE_HOST_ACCESS)).unwrap();
+    let opamp_endpoint = get_minikube_opamp_url_from_fake_server(opamp_server.endpoint().as_str());
 
     print_pod_logs(client.clone(), namespace, AC_LABEL_SELECTOR);
 

agent-control/tests/k8s/tools/mod.rs

@@ -10,5 +10,6 @@ pub mod k8s_api;
 /// Provides a k8s testing environment.
 pub mod k8s_env;
 pub mod logs;
+pub mod opamp;
 /// Defines the Foo CRD to be created and used in testing k8s clusters.
 pub mod test_crd;

agent-control/tests/k8s/tools/opamp.rs

@@ -0,0 +1,12 @@
+use std::str::FromStr;
+use url::Url;
+
+// URL to access to services binded on ports from minikube host
+// https://minikube.sigs.k8s.io/docs/handbook/host-access/
+pub const MINIKUBE_HOST_ACCESS: &str = "host.minikube.internal";
+
+pub fn get_minikube_opamp_url_from_fake_server(opamp_endpoint: &str) -> Url {
+    let mut opamp_endpoint = Url::from_str(opamp_endpoint).unwrap();
+    opamp_endpoint.set_host(Some(MINIKUBE_HOST_ACCESS)).unwrap();
+    opamp_endpoint
+}