From 427176559ab534b771876561ba116eb8a9f0d762 Mon Sep 17 00:00:00 2001 From: Jestin Woods Date: Thu, 16 Nov 2023 10:00:29 -0800 Subject: [PATCH 1/2] Release operator image 0.20.1 --- VERSION | 2 +- charts/humio-operator/crds/core.humio.com_humioactions.yaml | 2 +- charts/humio-operator/crds/core.humio.com_humioalerts.yaml | 2 +- charts/humio-operator/crds/core.humio.com_humioclusters.yaml | 2 +- .../crds/core.humio.com_humioexternalclusters.yaml | 2 +- .../humio-operator/crds/core.humio.com_humioingesttokens.yaml | 2 +- charts/humio-operator/crds/core.humio.com_humioparsers.yaml | 2 +- .../humio-operator/crds/core.humio.com_humiorepositories.yaml | 2 +- charts/humio-operator/crds/core.humio.com_humioviews.yaml | 2 +- config/crd/bases/core.humio.com_humioactions.yaml | 2 +- config/crd/bases/core.humio.com_humioalerts.yaml | 2 +- config/crd/bases/core.humio.com_humioclusters.yaml | 2 +- config/crd/bases/core.humio.com_humioexternalclusters.yaml | 2 +- config/crd/bases/core.humio.com_humioingesttokens.yaml | 2 +- config/crd/bases/core.humio.com_humioparsers.yaml | 2 +- config/crd/bases/core.humio.com_humiorepositories.yaml | 2 +- config/crd/bases/core.humio.com_humioviews.yaml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/VERSION b/VERSION index 5a03fb73..847e9aef 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.20.0 +0.20.1 diff --git a/charts/humio-operator/crds/core.humio.com_humioactions.yaml b/charts/humio-operator/crds/core.humio.com_humioactions.yaml index 16555a2c..e39ba3a3 100644 --- a/charts/humio-operator/crds/core.humio.com_humioactions.yaml +++ b/charts/humio-operator/crds/core.humio.com_humioactions.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: 'humio-operator' app.kubernetes.io/instance: 'humio-operator' app.kubernetes.io/managed-by: 'Helm' - helm.sh/chart: 'humio-operator-0.20.0' + helm.sh/chart: 'humio-operator-0.20.1' spec: group: core.humio.com names: diff --git a/charts/humio-operator/crds/core.humio.com_humioalerts.yaml b/charts/humio-operator/crds/core.humio.com_humioalerts.yaml index caf6363c..98b6d7d6 100644 --- a/charts/humio-operator/crds/core.humio.com_humioalerts.yaml +++ b/charts/humio-operator/crds/core.humio.com_humioalerts.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: 'humio-operator' app.kubernetes.io/instance: 'humio-operator' app.kubernetes.io/managed-by: 'Helm' - helm.sh/chart: 'humio-operator-0.20.0' + helm.sh/chart: 'humio-operator-0.20.1' spec: group: core.humio.com names: diff --git a/charts/humio-operator/crds/core.humio.com_humioclusters.yaml b/charts/humio-operator/crds/core.humio.com_humioclusters.yaml index 4c2996ce..ac1a9fa7 100644 --- a/charts/humio-operator/crds/core.humio.com_humioclusters.yaml +++ b/charts/humio-operator/crds/core.humio.com_humioclusters.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: 'humio-operator' app.kubernetes.io/instance: 'humio-operator' app.kubernetes.io/managed-by: 'Helm' - helm.sh/chart: 'humio-operator-0.20.0' + helm.sh/chart: 'humio-operator-0.20.1' spec: group: core.humio.com names: diff --git a/charts/humio-operator/crds/core.humio.com_humioexternalclusters.yaml b/charts/humio-operator/crds/core.humio.com_humioexternalclusters.yaml index e82d085e..60dbea73 100644 --- a/charts/humio-operator/crds/core.humio.com_humioexternalclusters.yaml +++ b/charts/humio-operator/crds/core.humio.com_humioexternalclusters.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: 'humio-operator' app.kubernetes.io/instance: 'humio-operator' app.kubernetes.io/managed-by: 'Helm' - helm.sh/chart: 'humio-operator-0.20.0' + helm.sh/chart: 'humio-operator-0.20.1' spec: group: core.humio.com names: diff --git a/charts/humio-operator/crds/core.humio.com_humioingesttokens.yaml b/charts/humio-operator/crds/core.humio.com_humioingesttokens.yaml index fc286b11..54667c61 100644 --- a/charts/humio-operator/crds/core.humio.com_humioingesttokens.yaml +++ b/charts/humio-operator/crds/core.humio.com_humioingesttokens.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: 'humio-operator' app.kubernetes.io/instance: 'humio-operator' app.kubernetes.io/managed-by: 'Helm' - helm.sh/chart: 'humio-operator-0.20.0' + helm.sh/chart: 'humio-operator-0.20.1' spec: group: core.humio.com names: diff --git a/charts/humio-operator/crds/core.humio.com_humioparsers.yaml b/charts/humio-operator/crds/core.humio.com_humioparsers.yaml index d6ae6c98..babc4d58 100644 --- a/charts/humio-operator/crds/core.humio.com_humioparsers.yaml +++ b/charts/humio-operator/crds/core.humio.com_humioparsers.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: 'humio-operator' app.kubernetes.io/instance: 'humio-operator' app.kubernetes.io/managed-by: 'Helm' - helm.sh/chart: 'humio-operator-0.20.0' + helm.sh/chart: 'humio-operator-0.20.1' spec: group: core.humio.com names: diff --git a/charts/humio-operator/crds/core.humio.com_humiorepositories.yaml b/charts/humio-operator/crds/core.humio.com_humiorepositories.yaml index 99ab6760..8c3873ec 100644 --- a/charts/humio-operator/crds/core.humio.com_humiorepositories.yaml +++ b/charts/humio-operator/crds/core.humio.com_humiorepositories.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: 'humio-operator' app.kubernetes.io/instance: 'humio-operator' app.kubernetes.io/managed-by: 'Helm' - helm.sh/chart: 'humio-operator-0.20.0' + helm.sh/chart: 'humio-operator-0.20.1' spec: group: core.humio.com names: diff --git a/charts/humio-operator/crds/core.humio.com_humioviews.yaml b/charts/humio-operator/crds/core.humio.com_humioviews.yaml index f6c47d56..541fe4b5 100644 --- a/charts/humio-operator/crds/core.humio.com_humioviews.yaml +++ b/charts/humio-operator/crds/core.humio.com_humioviews.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: 'humio-operator' app.kubernetes.io/instance: 'humio-operator' app.kubernetes.io/managed-by: 'Helm' - helm.sh/chart: 'humio-operator-0.20.0' + helm.sh/chart: 'humio-operator-0.20.1' spec: group: core.humio.com names: diff --git a/config/crd/bases/core.humio.com_humioactions.yaml b/config/crd/bases/core.humio.com_humioactions.yaml index 16555a2c..e39ba3a3 100644 --- a/config/crd/bases/core.humio.com_humioactions.yaml +++ b/config/crd/bases/core.humio.com_humioactions.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: 'humio-operator' app.kubernetes.io/instance: 'humio-operator' app.kubernetes.io/managed-by: 'Helm' - helm.sh/chart: 'humio-operator-0.20.0' + helm.sh/chart: 'humio-operator-0.20.1' spec: group: core.humio.com names: diff --git a/config/crd/bases/core.humio.com_humioalerts.yaml b/config/crd/bases/core.humio.com_humioalerts.yaml index caf6363c..98b6d7d6 100644 --- a/config/crd/bases/core.humio.com_humioalerts.yaml +++ b/config/crd/bases/core.humio.com_humioalerts.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: 'humio-operator' app.kubernetes.io/instance: 'humio-operator' app.kubernetes.io/managed-by: 'Helm' - helm.sh/chart: 'humio-operator-0.20.0' + helm.sh/chart: 'humio-operator-0.20.1' spec: group: core.humio.com names: diff --git a/config/crd/bases/core.humio.com_humioclusters.yaml b/config/crd/bases/core.humio.com_humioclusters.yaml index 4c2996ce..ac1a9fa7 100644 --- a/config/crd/bases/core.humio.com_humioclusters.yaml +++ b/config/crd/bases/core.humio.com_humioclusters.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: 'humio-operator' app.kubernetes.io/instance: 'humio-operator' app.kubernetes.io/managed-by: 'Helm' - helm.sh/chart: 'humio-operator-0.20.0' + helm.sh/chart: 'humio-operator-0.20.1' spec: group: core.humio.com names: diff --git a/config/crd/bases/core.humio.com_humioexternalclusters.yaml b/config/crd/bases/core.humio.com_humioexternalclusters.yaml index e82d085e..60dbea73 100644 --- a/config/crd/bases/core.humio.com_humioexternalclusters.yaml +++ b/config/crd/bases/core.humio.com_humioexternalclusters.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: 'humio-operator' app.kubernetes.io/instance: 'humio-operator' app.kubernetes.io/managed-by: 'Helm' - helm.sh/chart: 'humio-operator-0.20.0' + helm.sh/chart: 'humio-operator-0.20.1' spec: group: core.humio.com names: diff --git a/config/crd/bases/core.humio.com_humioingesttokens.yaml b/config/crd/bases/core.humio.com_humioingesttokens.yaml index fc286b11..54667c61 100644 --- a/config/crd/bases/core.humio.com_humioingesttokens.yaml +++ b/config/crd/bases/core.humio.com_humioingesttokens.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: 'humio-operator' app.kubernetes.io/instance: 'humio-operator' app.kubernetes.io/managed-by: 'Helm' - helm.sh/chart: 'humio-operator-0.20.0' + helm.sh/chart: 'humio-operator-0.20.1' spec: group: core.humio.com names: diff --git a/config/crd/bases/core.humio.com_humioparsers.yaml b/config/crd/bases/core.humio.com_humioparsers.yaml index d6ae6c98..babc4d58 100644 --- a/config/crd/bases/core.humio.com_humioparsers.yaml +++ b/config/crd/bases/core.humio.com_humioparsers.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: 'humio-operator' app.kubernetes.io/instance: 'humio-operator' app.kubernetes.io/managed-by: 'Helm' - helm.sh/chart: 'humio-operator-0.20.0' + helm.sh/chart: 'humio-operator-0.20.1' spec: group: core.humio.com names: diff --git a/config/crd/bases/core.humio.com_humiorepositories.yaml b/config/crd/bases/core.humio.com_humiorepositories.yaml index 99ab6760..8c3873ec 100644 --- a/config/crd/bases/core.humio.com_humiorepositories.yaml +++ b/config/crd/bases/core.humio.com_humiorepositories.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: 'humio-operator' app.kubernetes.io/instance: 'humio-operator' app.kubernetes.io/managed-by: 'Helm' - helm.sh/chart: 'humio-operator-0.20.0' + helm.sh/chart: 'humio-operator-0.20.1' spec: group: core.humio.com names: diff --git a/config/crd/bases/core.humio.com_humioviews.yaml b/config/crd/bases/core.humio.com_humioviews.yaml index f6c47d56..541fe4b5 100644 --- a/config/crd/bases/core.humio.com_humioviews.yaml +++ b/config/crd/bases/core.humio.com_humioviews.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: 'humio-operator' app.kubernetes.io/instance: 'humio-operator' app.kubernetes.io/managed-by: 'Helm' - helm.sh/chart: 'humio-operator-0.20.0' + helm.sh/chart: 'humio-operator-0.20.1' spec: group: core.humio.com names: From 81e0c2e9df65a2db188d2492e70dd97d14352844 Mon Sep 17 00:00:00 2001 From: Jestin Woods Date: Thu, 16 Nov 2023 13:02:51 -0800 Subject: [PATCH 2/2] Apply CRDs when running e2e tests using kubectl --- hack/run-e2e-tests-using-kubectl-kind.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hack/run-e2e-tests-using-kubectl-kind.sh b/hack/run-e2e-tests-using-kubectl-kind.sh index cbb64bca..45740a57 100755 --- a/hack/run-e2e-tests-using-kubectl-kind.sh +++ b/hack/run-e2e-tests-using-kubectl-kind.sh @@ -11,6 +11,9 @@ if ! kubectl get daemonset -n kube-system kindnet ; then exit 1 fi +kubectl create -k config/crd/ +kubectl label node --overwrite --all topology.kubernetes.io/zone=az1 + kubectl patch clusterrolebinding cluster-admin --type='json' -p='[{"op": "add", "path": "/subjects/1", "value": {"kind": "ServiceAccount", "name": "default", "namespace": "default" } }]' kubectl run -n default test-pod --env="HUMIO_E2E_LICENSE=$HUMIO_E2E_LICENSE" --env="E2E_LOGS_HUMIO_HOSTNAME=$E2E_LOGS_HUMIO_HOSTNAME" --env="E2E_LOGS_HUMIO_INGEST_TOKEN=$E2E_LOGS_HUMIO_INGEST_TOKEN" --env="E2E_RUN_ID=$E2E_RUN_ID" --env="GINKGO_NODES=$GINKGO_NODES" --env="DOCKER_USERNAME=$DOCKER_USERNAME" --env="DOCKER_PASSWORD=$DOCKER_PASSWORD" --restart=Never --image=testcontainer --image-pull-policy=Never -- sleep 86400 while [[ $(kubectl get -n default pods test-pod -o 'jsonpath={..status.conditions[?(@.type=="Ready")].status}') != "True" ]]; do echo "waiting for pod" ; kubectl describe -n default pod test-pod ; sleep 1 ; done