Moved to knative charts.

Author: pantierra

.github/workflows/helm-tests.yml

@@ -67,48 +67,6 @@ jobs:
 
           echo "✅ K3s is ready"
 
-      - name: Install Knative Serving
-        run: |
-          echo "=== Installing Knative Serving ==="
-          # Install Knative Serving CRDs
-          kubectl apply -f https://github.com/knative/serving/releases/download/knative-v1.17.0/serving-crds.yaml
-          # Install Knative Serving core components
-          kubectl apply -f https://github.com/knative/serving/releases/download/knative-v1.17.0/serving-core.yaml
-          # Install Kourier networking layer for Knative
-          kubectl apply -f https://github.com/knative/net-kourier/releases/download/knative-v1.17.0/kourier.yaml
-          # Configure Knative to use Kourier
-          kubectl patch configmap/config-network \
-            --namespace knative-serving \
-            --type merge \
-            --patch '{"data":{"ingress-class":"kourier.ingress.networking.knative.dev"}}'
-          # Wait for Knative Serving to be ready
-          echo "Waiting for Knative Serving to be ready..."
-          kubectl wait --for=condition=Ready pod -l app=controller -n knative-serving --timeout=300s
-          kubectl wait --for=condition=Ready pod -l app=webhook -n knative-serving --timeout=300s
-          kubectl wait --for=condition=Ready pod -l app=3scale-kourier-gateway -n kourier-system --timeout=300s
-
-      - name: Install Knative Eventing
-        run: |
-          echo "=== Installing Knative Eventing ==="
-          # Install Knative Eventing CRDs (includes SinkBinding)
-          kubectl apply -f https://github.com/knative/eventing/releases/download/knative-v1.17.0/eventing-crds.yaml
-          # Install Knative Eventing core components
-          kubectl apply -f https://github.com/knative/eventing/releases/download/knative-v1.17.0/eventing-core.yaml
-          # Wait for Knative Eventing to be ready
-          echo "Waiting for Knative Eventing to be ready..."
-          kubectl wait --for=condition=Ready pod -l app=eventing-controller -n knative-eventing --timeout=300s
-          kubectl wait --for=condition=Ready pod -l app=eventing-webhook -n knative-eventing --timeout=300s
-
-      - name: Deploy CloudEvents sink for eoapi-notifier
-        run: |
-          echo "=== Deploying CloudEvents sink ==="
-          # Create the namespace first
-          kubectl create namespace eoapi || true
-          # Deploy the CloudEvents sink service
-          kubectl apply -f charts/eoapi/samples/cloudevents-sink.yaml
-          # Wait for the Knative service to be ready
-          echo "Waiting for CloudEvents sink to be ready..."
-          kubectl wait --for=condition=Ready ksvc/eoapi-cloudevents-sink -n eoapi --timeout=300s
 
       - name: Wait for Traefik to be ready
         run: |

charts/eoapi/Chart.yaml

@@ -57,3 +57,7 @@ dependencies:
     version: 0.0.7
     repository: "oci://ghcr.io/developmentseed/charts"
     condition: eoapi-notifier.enabled
+  - name: knative-operator
+    version: 1.19.4
+    repository: https://knative.github.io/operator
+    condition: knative.enabled

charts/eoapi/templates/cloudevents-sink.yaml

@@ -0,0 +1,36 @@
+{{- if and (index .Values "eoapi-notifier").enabled .Values.knative.enabled }}
+{{- range (index .Values "eoapi-notifier").outputs }}
+{{- if eq .type "cloudevents" }}
+---
+apiVersion: serving.knative.dev/v1
+kind: Service
+metadata:
+  name: eoapi-cloudevents-sink
+  namespace: {{ $.Release.Namespace }}
+  labels:
+    {{- include "eoapi.labels" $ | nindent 4 }}
+    app.kubernetes.io/component: cloudevents-sink
+spec:
+  template:
+    metadata:
+      annotations:
+        autoscaling.knative.dev/minScale: "1"
+        autoscaling.knative.dev/maxScale: "1"
+      labels:
+        {{- include "eoapi.selectorLabels" $ | nindent 8 }}
+        app.kubernetes.io/component: cloudevents-sink
+    spec:
+      containers:
+      - name: cloudevents-sink
+        image: {{ $.Values.knative.cloudEventsSink.image }}
+        ports:
+        - containerPort: 8080
+        env:
+        - name: TARGET
+          value: "CloudEvents Sink"
+        resources:
+          {{- toYaml $.Values.knative.cloudEventsSink.resources | nindent 10 }}
+{{- break }}
+{{- end }}
+{{- end }}
+{{- end }}

charts/eoapi/test-helm-values.yaml

@@ -1,5 +1,8 @@
 # this file is used with `helm-tests` job in CI
 
+knative:
+  enabled: false
+
 ingress:
   className: "nginx"
   enabled: true

charts/eoapi/test-k3s-unittest-values.yaml

@@ -1,5 +1,9 @@
 # used in GH Actions `.github/workflows/helm-tests.yml.jobs.integration-tests`
 testing: true
+
+knative:
+  enabled: true
+
 ingress:
   enabled: true
   className: "traefik"

charts/eoapi/test-local-values.yaml

@@ -2,6 +2,10 @@
 # Based on test-k3s-unittest-values.yaml with minimal changes for local environment
 
 testing: true
+
+knative:
+  enabled: true
+
 ingress:
   enabled: true
   className: "nginx"  # Changed from "traefik" for minikube

charts/eoapi/values.yaml

@@ -520,8 +520,45 @@ eoapi-notifier:
             kind: Broker
             name: my-channel-1
             namespace: serverless
-        # For HTTP endpoints, use: endpoint: https://webhook.example.com
+            # For HTTP endpoints, use: endpoint: https://webhook.example.com
 
+######################
+# KNATIVE
+######################
+# Optional Knative components for CloudEvents and serverless workloads
+knative:
+  enabled: false
+  version: "v1.19.6"
+  # CloudEvents sink configuration (deployed when eoapi-notifier uses CloudEvents output)
+  cloudEventsSink:
+    enabled: true
+    image: gcr.io/knative-samples/helloworld-go
+    resources:
+      requests:
+        cpu: 100m
+        memory: 128Mi
+      limits:
+        cpu: 200m
+        memory: 256Mi
+
+# Knative operator sub-chart configuration
+# These values are passed directly to the knative-operator sub-chart
+# The operator will be installed and can then deploy Knative Serving/Eventing via CRs
+knative-operator:
+  knative_operator:
+    knative_operator:
+      tag: "v1.19.4"
+      resources:
+        requests:
+          cpu: 100m
+          memory: 100Mi
+        limits:
+          cpu: 500m
+          memory: 500Mi
+
+######################
+# VERSION MANAGEMENT
+######################
 # Version being upgraded from, used for migration purposes
 # Dont set the value in the values.yaml file
 # prefer to set it in the command line

scripts/deploy.sh

@@ -81,54 +81,9 @@ install_pgo() {
     kubectl get pods -l postgres-operator.crunchydata.com/control-plane=postgres-operator
 }
 
-# Setup Knative for local development
-setup_knative() {
-    log_info "Setting up Knative for local development..."
 
-    if kubectl get namespace knative-serving &>/dev/null && kubectl get namespace knative-eventing &>/dev/null; then
-        log_info "Knative already installed, skipping installation"
-        return 0
-    fi
-
-    log_info "Installing Knative Serving..."
-    kubectl apply -f https://github.com/knative/serving/releases/download/knative-v1.17.0/serving-crds.yaml
-    kubectl apply -f https://github.com/knative/serving/releases/download/knative-v1.17.0/serving-core.yaml
-    kubectl apply -f https://github.com/knative/net-kourier/releases/download/knative-v1.17.0/kourier.yaml
-    # Configure Knative to use Kourier
-    kubectl patch configmap/config-network \
-        --namespace knative-serving \
-        --type merge \
-        --patch '{"data":{"ingress-class":"kourier.ingress.networking.knative.dev"}}'
-
-    log_info "Installing Knative Eventing..."
-    # Install Knative Eventing CRDs (includes SinkBinding)
-    kubectl apply -f https://github.com/knative/eventing/releases/download/knative-v1.17.0/eventing-crds.yaml
-    # Install Knative Eventing core components
-    kubectl apply -f https://github.com/knative/eventing/releases/download/knative-v1.17.0/eventing-core.yaml
-
-    log_info "Waiting for Knative components to be ready..."
-    kubectl wait --for=condition=Ready pod -l app=controller -n knative-serving --timeout=300s
-    kubectl wait --for=condition=Ready pod -l app=webhook -n knative-serving --timeout=300s
-    kubectl wait --for=condition=Ready pod -l app=3scale-kourier-gateway -n kourier-system --timeout=300s
-    kubectl wait --for=condition=Ready pod -l app=eventing-controller -n knative-eventing --timeout=300s
-    kubectl wait --for=condition=Ready pod -l app=eventing-webhook -n knative-eventing --timeout=300s
-
-    log_info "✅ Knative installation complete"
-}
 
-deploy_cloudevents_sink() {
-    log_info "Deploying CloudEvents sink for notifications..."
 
-    kubectl create namespace "$NAMESPACE" --dry-run=client -o yaml | kubectl apply -f -
-
-    if kubectl apply -f charts/eoapi/samples/cloudevents-sink.yaml; then
-        log_info "Waiting for CloudEvents sink to be ready..."
-        kubectl wait --for=condition=Ready ksvc/eoapi-cloudevents-sink -n "$NAMESPACE" --timeout=300s
-        log_info "✅ CloudEvents sink deployed successfully"
-    else
-        log_warn "Failed to deploy CloudEvents sink, continuing without it"
-    fi
-}
 
 # Integrated Helm dependency setup
 setup_helm_dependencies() {
@@ -237,9 +192,7 @@ deploy_eoapi() {
         fi
     fi
 
-    if [ "$CI_MODE" != true ]; then
-        deploy_cloudevents_sink
-    fi
+
 
     # Verify deployment
     log_info "Verifying deployment..."
@@ -306,10 +259,6 @@ case $COMMAND in
         ;;
     deploy)
         install_pgo
-
-        if [ "$CI_MODE" != true ]; then
-            setup_knative
-        fi
         setup_helm_dependencies
         deploy_eoapi
         ;;