From 3bc410f7a64800dff94f135eafdf5dd0de0ad848 Mon Sep 17 00:00:00 2001
From: pwhelan <601645+pwhelan@users.noreply.github.com>
Date: Fri, 5 Jul 2024 16:30:23 +0000
Subject: [PATCH] ci: update Core Operator chart from latest version internally

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 charts/core-crd/Chart.yaml       |   4 +-
 charts/core-crd/README.md        |  36 --------
 charts/core-crd/values.yaml      |   2 +-
 charts/core-instance/Chart.yaml  |   4 +-
 charts/core-instance/values.yaml |   4 +-
 charts/core-operator/Chart.yaml  |   4 +-
 charts/core-operator/test.sh     | 142 +------------------------------
 charts/core-operator/values.yaml |   2 +-
 8 files changed, 11 insertions(+), 187 deletions(-)
 delete mode 100644 charts/core-crd/README.md 
 mode change 100755 => 120000 charts/core-operator/test.sh

diff --git a/charts/core-crd/Chart.yaml b/charts/core-crd/Chart.yaml
index a042703..346f167 100644
--- a/charts/core-crd/Chart.yaml
+++ b/charts/core-crd/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: core-crd
 description: A Helm chart for Kubernetes
 type: application
-version: 2.14.0
-appVersion: "v2.14.0"
+version: 3.0.4
+appVersion: "v3.0.4"
 maintainers:
   - name: Calyptia
     email: hello@calyptia.com
diff --git a/charts/core-crd/README.md  b/charts/core-crd/README.md 
deleted file mode 100644
index 4c2be10..0000000
--- a/charts/core-crd/README.md 	
+++ /dev/null
@@ -1,36 +0,0 @@
-# First time running the chart
-
-```
-HELM_EXPERIMENTAL_OCI=1 helm dependency build core-crd/
-```
-
-#Convert raw CRD to templates
-
-```
-git clone https://github.com/calyptia/core-operator 
-cd core-operator
-make manifests
-make build-manifests
-
-cat config/crd | yq 'select(documentIndex == 0)' > ingest_checks.yaml
-cat config/crd | yq 'select(documentIndex == 1)' > pipelines.yaml
-```
-
-Add templates for pipeline CRD
-
-```
-cat core-crd/templates/pipelines.yaml  | yq '.spec.versions.[0].schema.openAPIV3Schema.properties.spec.properties.hotReloadImage.default |= "{{ template \"hotReload.image\" . }}"' > pipelines.yaml && mv pipelines.yaml core-crd/templates/pipelines.yaml 
-cat core-crd/templates/pipelines.yaml  | yq '.spec.versions.[0].schema.openAPIV3Schema.properties.spec.properties.image.default |= "{{ template \"fluentBit.image\" . }}"' > pipelines.yaml && mv pipelines.yaml core-crd/templates/pipelines.yaml 
-```
-
-Add templates for ingest_checks CRD
-
-```
-cat core-crd/templates/ingest_checks.yaml  | yq '.spec.versions.[0].schema.openAPIV3Schema.properties.spec.properties.fluentBitImage.default |= "{{ template \"fluentBit.image\" . }}"' > ingest_checks.yaml && mv ingest_checks.yaml core-crd/templates/ingest_checks.yaml 
-cat core-crd/templates/ingest_checks.yaml  | yq '.spec.versions.[0].schema.openAPIV3Schema.properties.spec.properties.ingestCheckSidecarImage.default |= "{{ template \"ingestCheck.image\" . }}"' > ingest_checks.yaml && mv ingest_checks.yaml core-crd/templates/ingest_checks.yaml 
-cat core-crd/templates/ingest_checks.yaml  | yq '.spec.versions.[0].schema.openAPIV3Schema.properties.spec.properties.cloudAPI.properties.url.default |= "{{ default \"https://cloud-api.calyptia.com\" .Values.cloudUrl }}"' > ingest_checks.yaml && mv ingest_checks.yaml core-crd/templates/ingest_checks.yaml 
-
-```
-
-
-{{ default "https://cloud-api.calyptia.com" .Values.cloudUrl | quote }}
\ No newline at end of file
diff --git a/charts/core-crd/values.yaml b/charts/core-crd/values.yaml
index 11a21da..926734b 100644
--- a/charts/core-crd/values.yaml
+++ b/charts/core-crd/values.yaml
@@ -7,7 +7,7 @@ images:
   fluentBit:
     registry: ghcr.io
     repository: calyptia/core/calyptia-fluent-bit
-    tag: 24.6.9
+    tag: 24.7.1
     pullSecrets: []
   ingestCheck:
     registry: ghcr.io
diff --git a/charts/core-instance/Chart.yaml b/charts/core-instance/Chart.yaml
index a87870e..fe7e4cb 100644
--- a/charts/core-instance/Chart.yaml
+++ b/charts/core-instance/Chart.yaml
@@ -4,8 +4,8 @@ description: Calyptia Core Instance chart
 home: https://calyptia.com/products/core/
 icon: https://storage.googleapis.com/calyptia_public_resources_bucket/logo-darkmode.svg
 type: application
-version: 2.14.0
-appVersion: "v2.14.0"
+version: 3.0.4
+appVersion: "v3.0.4"
 maintainers:
   - name: Calyptia
     email: hello@calyptia.com
diff --git a/charts/core-instance/values.yaml b/charts/core-instance/values.yaml
index 23eda6b..8aa022c 100644
--- a/charts/core-instance/values.yaml
+++ b/charts/core-instance/values.yaml
@@ -20,12 +20,12 @@ images:
   fromCloud:
     registry: ghcr.io
     repository: calyptia/core-operator/sync-from-cloud
-    tag: 2.14.0
+    tag: 3.0.4
     pullSecrets: []
   toCloud:
     registry: ghcr.io
     repository: calyptia/core-operator/sync-to-cloud
-    tag: 2.14.0
+    tag: 3.0.4
     pullSecrets: []
   hotReload:
     registry: ghcr.io
diff --git a/charts/core-operator/Chart.yaml b/charts/core-operator/Chart.yaml
index 5194de2..0d5c066 100644
--- a/charts/core-operator/Chart.yaml
+++ b/charts/core-operator/Chart.yaml
@@ -4,8 +4,8 @@ description: Calyptia Core Operator chart
 home: https://calyptia.com/products/core/
 icon: https://storage.googleapis.com/calyptia_public_resources_bucket/logo-darkmode.svg
 type: application
-version: 2.14.0
-appVersion: "v2.14.0"
+version: 3.0.4
+appVersion: "v3.0.4"
 maintainers:
   - name: Calyptia
     email: hello@calyptia.com
diff --git a/charts/core-operator/test.sh b/charts/core-operator/test.sh
deleted file mode 100755
index accd241..0000000
--- a/charts/core-operator/test.sh
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/bin/sh
-set -eu
-export NAMESPACE="${NAMESPACE:-default}"
-export PIPELINE_NAME="${PIPELINE_NAME:-test-pipeline}"
-export MAX_ITERATIONS="${MAX_ITERATIONS:-10}"
-export RETRY_TIMEOUT="${RETRY_TIMEOUT:-2s}"
-
-
-echo "Creating a pipeline" 
-if kubectl create -f - <<EOF
-apiVersion: core.calyptia.com/v1
-kind: Pipeline
-metadata:
-  name: $PIPELINE_NAME
-  namespace: $NAMESPACE
-spec:
-  fluentbit:
-    config: |
-      pipeline:
-         inputs:
-            - Name: dummy
-              Tag: dummy.log
-         outputs:
-            - Name: http
-              Match: '*'
-              Host: out-http
-              Port: 8888
-              Format: json
-  kind: deployment
-  ports:
-  - backendPort: 8888
-    frontendPort: 8888
-    port: 8888
-    protocol: tcp
-  replicasCount: 1
-  resources:
-    limits: {}
-    requests:
-      storage:
-        volume-size: 256Mi
-
-EOF
-then 
-    echo "succeeded to create a pipeline"
-else 
-    echo "failed to create a pipline"
-    exit 1
-fi 
-
-echo "Waiting for pipeline deployment to come up"
-until kubectl rollout status -n "$NAMESPACE" deployment/"$PIPELINE_NAME" 
-do
- sleep "$RETRY_TIMEOUT"
-done 
-
-echo "Deleting pipeline deployment to come up"
-if kubectl delete deployment -n "$NAMESPACE" "$PIPELINE_NAME"
-then 
-    echo "delete deployment succeeded"
-else 
-    echo "delete deployment failed"
-    exit 1
-fi
-
-echo "Checking if pipline deployment has been recreated"
-
-counter=0
-
-
-while :
-do
-    counter=$((counter +1))
-    if [ "$counter" -ge "$MAX_ITERATIONS" ]
-    then
-     echo "couldn't get deployment after $counter retries"
-     exit 1
-    fi
-    if kubectl get deploy -n "$NAMESPACE" "$PIPELINE_NAME"
-    then
-     echo "deployment successfully recreated"
-     break
-    else 
-     sleep "$RETRY_TIMEOUT"
-    fi
-done
-
-echo "delete config map"
-if kubectl delete configmap -n "$NAMESPACE" "$PIPELINE_NAME"
-then
-    echo "delete configmap succeeded"
-else
-    echo "delete configmap failed"
-    exit
-fi
-
-counter=0
-
-while :
-do
-    counter=$((counter +1))
-    echo "Retry nr $counter"
-    if [ "$counter" -ge "$MAX_ITERATIONS" ]
-    then
-     echo "couldn't get configmap after $counter retries"
-     exit 1
-    fi
-    if kubectl get configmap -n "$NAMESPACE" "$PIPELINE_NAME"
-    then
-     echo "configmap successfully recreated"
-     break
-    else 
-     sleep "$RETRY_TIMEOUT"
-    fi
-done
-
-counter=0
-while :
-do
-    counter=$((counter +1))
-    echo "Retry nr $counter"
-    if [ "$counter" -ge "$MAX_ITERATIONS" ]
-    then
-     echo "couldn't get service after $counter retries"
-     exit 1
-    fi
-    if kubectl get service -n "$NAMESPACE" "$PIPELINE_NAME"-tcp8888
-    then
-     echo "service successfully recreated"
-     break
-    else 
-     sleep "$RETRY_TIMEOUT"
-    fi
-done
-
-if kubectl delete pipeline -n "$NAMESPACE" "$PIPELINE_NAME" 
-then 
-    echo "removed the pipeline"
-else
-    echo "failed removing the pipeline"
-    exit 1
-fi 
\ No newline at end of file
diff --git a/charts/core-operator/test.sh b/charts/core-operator/test.sh
new file mode 120000
index 0000000..d2b33a3
--- /dev/null
+++ b/charts/core-operator/test.sh
@@ -0,0 +1 @@
+../../scripts/inttest.sh
\ No newline at end of file
diff --git a/charts/core-operator/values.yaml b/charts/core-operator/values.yaml
index 2f6affd..20dab3a 100644
--- a/charts/core-operator/values.yaml
+++ b/charts/core-operator/values.yaml
@@ -4,7 +4,7 @@ images:
   operator:
     registry: ghcr.io
     repository: calyptia/core-operator
-    tag: 2.14.0
+    tag: 3.0.4
     pullSecrets: []
   hotReload:
     registry: ghcr.io