Skip to content

Commit

Permalink
Merge pull request #831 from newrelic/chore/use-k8s-1_24
Browse files Browse the repository at this point in the history
Use K8s v1.24.8 for non-regression testing
  • Loading branch information
rthorn-nr authored Nov 30, 2022
2 parents 758d5da + 4a4282b commit bceed17
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 16 deletions.
34 changes: 19 additions & 15 deletions test/definitions/ohi/linux/k8-linux2.json
Original file line number Diff line number Diff line change
@@ -1,41 +1,45 @@
{
"global_tags": {
"owning_team": "virtuoso",
"Environment": "development",
"Department": "product",
"Product": "virtuoso"
},

"resources": [{
"global_tags": {
"owning_team": "virtuoso",
"Environment": "development",
"Department": "product",
"Product": "virtuoso"
},
"resources": [
{
"id": "k8mini",
"provider": "aws",
"type": "ec2",
"size": "t3.xlarge",
"ami_name": "amazonlinux-2-base*"
}],

"services": [
}
],
"services": [
{
"id": "minik1",
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/kubernetes/minikube/roles",
"port": 9999,
"destinations": ["k8mini"]
"destinations": [
"k8mini"
]
}
],
"instrumentations": {
"resources": [
{
"id": "nr_k8",
"resource_ids": ["k8mini"],
"resource_ids": [
"k8mini"
],
"provider": "newrelic",
"source_repository": "https://github.com/newrelic/open-install-library.git",
"deploy_script_path": "test/deploy/linux/newrelic-cli/install-recipe/roles",
"params": {
"recipe_content_url": "https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/awslinux.yml,https://raw.githubusercontent.com/newrelic/open-install-library/main/recipes/newrelic/infrastructure/kubernetes.yml",
"validate_output": "New Relic installation complete"
"validate_output": "(Kubernetes Integration)\\s+\\(installed\\)"
}
}
]
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
when: is_minikube_installed.stdout|int == 0

- name: Start Minikube
shell: 'minikube start --memory 8192 --cpus 4'
shell: 'minikube start --memory 8192 --cpus 4 --kubernetes-version=v1.24.8'

- name: Create kubectl wrap command
template:
Expand Down

0 comments on commit bceed17

Please sign in to comment.