update integ tests, remove awscli update, add gh token

DataDog · Feb 14, 2024 · c583603 · c583603
1 parent dac4ae5
commit c583603
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,7 +1,3 @@
-variables:
-  # Do not modify this - must be the repository name for Kubernetes gitlab runners to run
-  KUBERNETES_SERVICE_ACCOUNT_OVERWRITE: helm-charts
-
 stages:
   - e2e
 
@@ -19,16 +15,17 @@ e2e:
   before_script:
     # Update awscli v2
     - aws --version
-    - curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
-    - unzip awscliv2.zip
-    - ./aws/install --update
-    - aws --version
+#    - curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+#    - unzip awscliv2.zip
+#    - ./aws/install --update
+#    - aws --version
     # Setup AWS Credentials
     - mkdir -p ~/.aws
     - set +x
     - aws ssm get-parameter --region us-east-1 --name ci.helm-charts.e2e-agent-qa-profile --with-decryption --query "Parameter.Value" --out text >> ~/.aws/config
     - set -x
     - export AWS_PROFILE=agent-qa-ci
+    - export GITHUB_TOKEN=$(aws ssm get-parameter --region us-east-1 --name ci.helm-charts.github_token --with-decryption --query "Parameter.Value" --out text)
     - pulumi login "s3://dd-pulumi-state?region=us-east-1&awssdk=v2&profile=$AWS_PROFILE"
   script:
     - make test-e2e
diff --git a/test/datadog-operator/baseline/DatadogAgent_CRD_default.yaml b/test/datadog-operator/baseline/DatadogAgent_CRD_default.yaml
@@ -9,7 +9,7 @@ metadata:
   name: datadogagents.datadoghq.com
   labels:
     helm.sh/chart: 'datadogCRDs-1.3.0'
-    app.kubernetes.io/managed-by: 'Helm'
+    app.kubernetes.io/managed-by: eks-addon
     app.kubernetes.io/name: 'datadogCRDs'
     app.kubernetes.io/instance: 'datadog-operator'
 spec:

diff --git a/test/datadog-operator/baseline/DatadogAgent_CRD_with_certManager.yaml b/test/datadog-operator/baseline/DatadogAgent_CRD_with_certManager.yaml
@@ -10,7 +10,7 @@ metadata:
   name: datadogagents.datadoghq.com
   labels:
     helm.sh/chart: 'datadogCRDs-1.3.0'
-    app.kubernetes.io/managed-by: 'Helm'
+    app.kubernetes.io/managed-by: eks-addon
     app.kubernetes.io/name: 'datadogCRDs'
     app.kubernetes.io/instance: 'datadog-operator'
 spec:

diff --git a/test/datadog-operator/baseline/Operator_Deployment_default.yaml b/test/datadog-operator/baseline/Operator_Deployment_default.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: datadog-agent
   labels:
     app.kubernetes.io/name: datadog-operator
-    helm.sh/chart: datadog-operator-1.4.1
+    helm.sh/chart: datadog-operator-1.4.2
     app.kubernetes.io/instance: datadog-operator
     app.kubernetes.io/version: "1.3.0"
     app.kubernetes.io/managed-by: Helm

diff --git a/test/datadog-operator/baseline/Operator_Deployment_with_certManager.yaml b/test/datadog-operator/baseline/Operator_Deployment_with_certManager.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: datadog-agent
   labels:
     app.kubernetes.io/name: datadog-operator
-    helm.sh/chart: datadog-operator-1.4.1
+    helm.sh/chart: datadog-operator-1.4.2
     app.kubernetes.io/instance: datadog-operator
     app.kubernetes.io/version: "1.3.0"
     app.kubernetes.io/managed-by: Helm