Skip to content

Commit

Permalink
Bump versions of all dependencies (#37)
Browse files Browse the repository at this point in the history
- Bump versions of Grafana and InfluxDB Helm charts. The latest version
  of Grafana suppresses creation of the PodSecurityPolicy resource if it
  is not available.
- Replace requirements.lock with Chart.lock. Chart.lock is what gets
  generated when dependencies are defined using Chart.yaml. There is no
  requirements.yaml, so requirements.lock should not exist.
- Update versions of dependencies installed in install_deps.sh.
- Update install_deps.sh to use latest minikube and to not use
  --vm-driver, which apparently does not (or no longer) accepts --cpus
  and --memory.
- Use large VM instance, which has 4 cores.
- Update Golang libraries. All dependencies are inherited through the
  nuodb-helm-charts test library, so go.mod was updated to bump the
  nuodb-helm-charts version and all other libraries there were deleted,
  and then 'go mod tidy' was invoked to update go.mod and go.sum.
  • Loading branch information
adriansuarez authored Jan 19, 2023
1 parent 214e2a6 commit 4353ac7
Show file tree
Hide file tree
Showing 8 changed files with 75 additions and 58 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ venv/
versionInject.yaml
valuesInject.yaml
**/*.tgz
**/Chart.lock
13 changes: 7 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,23 @@ go:
services:
- docker

vm:
size: large

env:
jobs:
- TEST_SUITE=Kubernetes
- TEST_SUITE=docker
global:
- HELM_VERSION="v3.2.4"
- DEP_VERSION=0.5.4
- KUBERNETES_VERSION=1.15.0
- MINIKUBE_VERSION=1.2.0
- MINISHIFT_VERSION=1.34.2
- HELM_VERSION="v3.10.2"
- KUBERNETES_VERSION=1.25.2
- MINIKUBE_VERSION=1.28.0
- MINIKUBE_WANTUPDATENOTIFICATION=false
- MINIKUBE_WANTREPORTERRORPROMPT=false
- MINIKUBE_HOME=$HOME
- CHANGE_MINIKUBE_NONE_USER=true
- KUBECONFIG=$HOME/.kube/config
- NUODB_HELM_CHARTS_VERSION="3.0.0"
- NUODB_HELM_CHARTS_VERSION="3.5.0"

before_install:
- |
Expand Down
12 changes: 5 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@ module github.com/nuodb/nuodb-insights
go 1.14

require (
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
github.com/docker/docker v17.12.0-ce-rc1.0.20180718150940-a3ef7e9a9bda+incompatible
github.com/gogo/protobuf v1.3.2 // indirect
github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7
github.com/gruntwork-io/terratest v0.28.10
github.com/nuodb/nuodb-helm-charts/v3 v3.0.1-0.20201112095200-9c0233e6aeed
github.com/stretchr/testify v1.6.1
k8s.io/api v0.18.6
k8s.io/apimachinery v0.18.6
github.com/nuodb/nuodb-helm-charts/v3 v3.5.0
github.com/stretchr/testify v1.7.0
k8s.io/api v0.19.0
k8s.io/apimachinery v0.19.0
)
69 changes: 43 additions & 26 deletions go.sum

Large diffs are not rendered by default.

16 changes: 9 additions & 7 deletions scripts/ci/install_deps.sh
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
#!/usr/bin/env bash

# exit when any command fails
set -e
set -ex

if [[ $TEST_SUITE = "Kubernetes" ]]; then
# conntrack is required by Minikube
sudo apt-get update
sudo apt-get install -y conntrack

# Download kubectl, which is a requirement for using minikube.
curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v"${KUBERNETES_VERSION}"/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/

# Download Helm and Tiller
# Download Helm
wget https://get.helm.sh/helm-"${HELM_VERSION}"-linux-amd64.tar.gz -O /tmp/helm.tar.gz
tar xzf /tmp/helm.tar.gz -C /tmp --strip-components=1 && chmod +x /tmp/helm && sudo mv /tmp/helm /usr/local/bin

# Download minikube.
curl -Lo minikube https://storage.googleapis.com/minikube/releases/v"${MINIKUBE_VERSION}"/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
mkdir -p "$HOME"/.kube "$HOME"/.minikube
touch "$KUBECONFIG"

# start minikube
sudo minikube start --vm-driver=none --kubernetes-version=v"${KUBERNETES_VERSION}" --memory=8000 --cpus=4
sudo chown -R travis: /home/travis/.minikube/
minikube start --kubernetes-version=v"${KUBERNETES_VERSION}" --memory=max --cpus=max
minikube status
kubectl cluster-info

helm version
Expand Down Expand Up @@ -55,4 +57,4 @@ elif [[ $TEST_SUITE = "docker" ]]; then
docker-compose version
else
echo "Skipping installation steps"
fi
fi
9 changes: 9 additions & 0 deletions stable/insights/Chart.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
dependencies:
- name: grafana
repository: https://grafana.github.io/helm-charts
version: 6.50.0
- name: influxdb
repository: https://helm.influxdata.com/
version: 4.12.0
digest: sha256:f3e167e714f976e99e2fd1c560233a54eb60bb74661452224dbed6e876c509b5
generated: "2023-01-18T10:09:40.484674-05:00"
4 changes: 2 additions & 2 deletions stable/insights/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ dependencies:
tags:
- backend
repository: https://grafana.github.io/helm-charts
version: 6.6.0
version: 6.50.0
- name: influxdb
condition: influxdb.enabled
tags:
- backend
repository: https://helm.influxdata.com/
version: 4.9.14
version: 4.12.0

9 changes: 0 additions & 9 deletions stable/insights/requirements.lock

This file was deleted.

0 comments on commit 4353ac7

Please # to comment.