Skip to content

Commit b1ba3e8

Browse files
pantierrapantierra
committed
Moved to knative charts.
1 parent dcaf3e4 commit b1ba3e8

File tree

7 files changed

+42
-69
lines changed

7 files changed

+42
-69
lines changed

‎.github/workflows/helm-tests.yml‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -67,37 +67,6 @@ jobs:
6767
6868
echo "✅ K3s is ready"
6969
70-
- name: Install Knative Serving
71-
run: |
72-
echo "=== Installing Knative Serving ==="
73-
# Install Knative Serving CRDs
74-
kubectl apply -f https://github.com/knative/serving/releases/download/knative-v1.17.0/serving-crds.yaml
75-
# Install Knative Serving core components
76-
kubectl apply -f https://github.com/knative/serving/releases/download/knative-v1.17.0/serving-core.yaml
77-
# Install Kourier networking layer for Knative
78-
kubectl apply -f https://github.com/knative/net-kourier/releases/download/knative-v1.17.0/kourier.yaml
79-
# Configure Knative to use Kourier
80-
kubectl patch configmap/config-network \
81-
--namespace knative-serving \
82-
--type merge \
83-
--patch '{"data":{"ingress-class":"kourier.ingress.networking.knative.dev"}}'
84-
# Wait for Knative Serving to be ready
85-
echo "Waiting for Knative Serving to be ready..."
86-
kubectl wait --for=condition=Ready pod -l app=controller -n knative-serving --timeout=300s
87-
kubectl wait --for=condition=Ready pod -l app=webhook -n knative-serving --timeout=300s
88-
kubectl wait --for=condition=Ready pod -l app=3scale-kourier-gateway -n kourier-system --timeout=300s
89-
90-
- name: Install Knative Eventing
91-
run: |
92-
echo "=== Installing Knative Eventing ==="
93-
# Install Knative Eventing CRDs (includes SinkBinding)
94-
kubectl apply -f https://github.com/knative/eventing/releases/download/knative-v1.17.0/eventing-crds.yaml
95-
# Install Knative Eventing core components
96-
kubectl apply -f https://github.com/knative/eventing/releases/download/knative-v1.17.0/eventing-core.yaml
97-
# Wait for Knative Eventing to be ready
98-
echo "Waiting for Knative Eventing to be ready..."
99-
kubectl wait --for=condition=Ready pod -l app=eventing-controller -n knative-eventing --timeout=300s
100-
kubectl wait --for=condition=Ready pod -l app=eventing-webhook -n knative-eventing --timeout=300s
10170
10271
- name: Deploy CloudEvents sink for eoapi-notifier
10372
run: |

‎charts/eoapi/Chart.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,7 @@ dependencies:
5757
version: 0.0.7
5858
repository: "oci://ghcr.io/developmentseed/charts"
5959
condition: eoapi-notifier.enabled
60+
- name: knative-operator
61+
version: 1.19.4
62+
repository: https://knative.github.io/operator
63+
condition: knative.enabled

‎charts/eoapi/test-helm-values.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# this file is used with `helm-tests` job in CI
22

3+
knative:
4+
enabled: false
5+
36
ingress:
47
className: "nginx"
58
enabled: true

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# used in GH Actions `.github/workflows/helm-tests.yml.jobs.integration-tests`
22
testing: true
3+
4+
knative:
5+
enabled: true
6+
37
ingress:
48
enabled: true
59
className: "traefik"

‎charts/eoapi/test-local-values.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
# Based on test-k3s-unittest-values.yaml with minimal changes for local environment
33

44
testing: true
5+
6+
knative:
7+
enabled: true
8+
59
ingress:
610
enabled: true
711
className: "nginx" # Changed from "traefik" for minikube

‎charts/eoapi/values.yaml‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,8 +520,34 @@ eoapi-notifier:
520520
kind: Broker
521521
name: my-channel-1
522522
namespace: serverless
523-
# For HTTP endpoints, use: endpoint: https://webhook.example.com
523+
# For HTTP endpoints, use: endpoint: https://webhook.example.com
524524

525+
######################
526+
# KNATIVE
527+
######################
528+
# Optional Knative components for CloudEvents and serverless workloads
529+
knative:
530+
enabled: false
531+
version: "v1.19.6"
532+
533+
# Knative operator sub-chart configuration
534+
# These values are passed directly to the knative-operator sub-chart
535+
# The operator will be installed and can then deploy Knative Serving/Eventing via CRs
536+
knative-operator:
537+
knative_operator:
538+
knative_operator:
539+
tag: "v1.19.4"
540+
resources:
541+
requests:
542+
cpu: 100m
543+
memory: 100Mi
544+
limits:
545+
cpu: 500m
546+
memory: 500Mi
547+
548+
######################
549+
# VERSION MANAGEMENT
550+
######################
525551
# Version being upgraded from, used for migration purposes
526552
# Dont set the value in the values.yaml file
527553
# prefer to set it in the command line

‎scripts/deploy.sh‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -81,40 +81,7 @@ install_pgo() {
8181
kubectl get pods -l postgres-operator.crunchydata.com/control-plane=postgres-operator
8282
}
8383

84-
# Setup Knative for local development
85-
setup_knative() {
86-
log_info "Setting up Knative for local development..."
8784

88-
if kubectl get namespace knative-serving &>/dev/null && kubectl get namespace knative-eventing &>/dev/null; then
89-
log_info "Knative already installed, skipping installation"
90-
return 0
91-
fi
92-
93-
log_info "Installing Knative Serving..."
94-
kubectl apply -f https://github.com/knative/serving/releases/download/knative-v1.17.0/serving-crds.yaml
95-
kubectl apply -f https://github.com/knative/serving/releases/download/knative-v1.17.0/serving-core.yaml
96-
kubectl apply -f https://github.com/knative/net-kourier/releases/download/knative-v1.17.0/kourier.yaml
97-
# Configure Knative to use Kourier
98-
kubectl patch configmap/config-network \
99-
--namespace knative-serving \
100-
--type merge \
101-
--patch '{"data":{"ingress-class":"kourier.ingress.networking.knative.dev"}}'
102-
103-
log_info "Installing Knative Eventing..."
104-
# Install Knative Eventing CRDs (includes SinkBinding)
105-
kubectl apply -f https://github.com/knative/eventing/releases/download/knative-v1.17.0/eventing-crds.yaml
106-
# Install Knative Eventing core components
107-
kubectl apply -f https://github.com/knative/eventing/releases/download/knative-v1.17.0/eventing-core.yaml
108-
109-
log_info "Waiting for Knative components to be ready..."
110-
kubectl wait --for=condition=Ready pod -l app=controller -n knative-serving --timeout=300s
111-
kubectl wait --for=condition=Ready pod -l app=webhook -n knative-serving --timeout=300s
112-
kubectl wait --for=condition=Ready pod -l app=3scale-kourier-gateway -n kourier-system --timeout=300s
113-
kubectl wait --for=condition=Ready pod -l app=eventing-controller -n knative-eventing --timeout=300s
114-
kubectl wait --for=condition=Ready pod -l app=eventing-webhook -n knative-eventing --timeout=300s
115-
116-
log_info "✅ Knative installation complete"
117-
}
11885

11986
deploy_cloudevents_sink() {
12087
log_info "Deploying CloudEvents sink for notifications..."
@@ -306,10 +273,6 @@ case $COMMAND in
306273
;;
307274
deploy)
308275
install_pgo
309-
310-
if [ "$CI_MODE" != true ]; then
311-
setup_knative
312-
fi
313276
setup_helm_dependencies
314277
deploy_eoapi
315278
;;

0 commit comments

Comments
 (0)