use newer version of webhook source service

Author: mneagul

charts/notification-automation/templates/cloudevents-player-ingress.yaml

@@ -1,40 +1,22 @@
-{{- if and .Values.cloudEventsPlayer.enabled .Values.cloudEventsPlayer.service.create .Values.cloudEventsPlayer.ingress.enabled }}
-{{- $name := printf "%s-cloudevents-player" .Release.Name }}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
+{{- if and .Values.cloudEventsPlayer.enabled .Values.cloudEventsPlayer.domainMapping.domain (ne .Values.cloudEventsPlayer.domainMapping.domain "") }}
+{{- $name := default (printf "%s-cloudevents-player" .Release.Name) .Values.cloudEventsPlayer.nameOverride }}
+apiVersion: serving.knative.dev/v1beta1
+kind: DomainMapping
 metadata:
-  name: {{ $name }}
+  name: {{ .Values.cloudEventsPlayer.domainMapping.domain }}
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: cloudevents-player
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-  {{- with .Values.cloudEventsPlayer.ingress.annotations }}
+{{- if .Values.serving.install }}
   annotations:
-{{ toYaml . | nindent 4 }}
-  {{- end }}
+    "helm.sh/hook": post-install,post-upgrade
+    "helm.sh/hook-weight": "10"
+{{- end }}
 spec:
-  {{- if .Values.cloudEventsPlayer.ingress.className }}
-  ingressClassName: {{ .Values.cloudEventsPlayer.ingress.className }}
-  {{- end }}
-  {{- with .Values.cloudEventsPlayer.ingress.tls }}
-  tls:
-{{ toYaml . | nindent 4 }}
-  {{- end }}
-  rules:
-    {{- range $host := .Values.cloudEventsPlayer.ingress.hosts }}
-    - host: {{ $host.host | quote }}
-      http:
-        paths:
-          {{- $paths := $host.paths | default (list (dict "path" "/" "pathType" "Prefix")) }}
-          {{- range $path := $paths }}
-          - path: {{ $path.path | quote }}
-            pathType: {{ $path.pathType }}
-            backend:
-              service:
-                name: {{ $name }}
-                port:
-                  number: {{ $.Values.cloudEventsPlayer.service.port }}
-          {{- end }}
-    {{- end }}
+  ref:
+    name: {{ $name }}
+    kind: Service
+    apiVersion: serving.knative.dev/v1
 {{- end }}

charts/notification-automation/templates/cloudevents-player-trigger.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.cloudEventsPlayer.enabled }}
-{{- $name := printf "%s-cloudevents-player" .Release.Name }}
+{{- $name := default (printf "%s-cloudevents-player" .Release.Name) .Values.cloudEventsPlayer.nameOverride }}
 {{- if .Values.cloudEventsPlayer.subscribeBroker.enabled }}
 {{- $brokerRef := .Values.cloudEventsPlayer.subscribeBroker.broker }}
 {{- $brokerName := $brokerRef.name }}
@@ -25,7 +25,7 @@ spec:
   broker: {{ $brokerName }}
   subscriber:
     ref:
-      apiVersion: v1
+      apiVersion: serving.knative.dev/v1
       kind: Service
       name: {{ $name }}
     uri: /

charts/notification-automation/templates/cloudevents-player.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.cloudEventsPlayer.enabled }}
-{{- $name := printf "%s-cloudevents-player" .Release.Name }}
+{{- $name := default (printf "%s-cloudevents-player" .Release.Name) .Values.cloudEventsPlayer.nameOverride }}
 {{- $saName := default $name .Values.cloudEventsPlayer.serviceAccount.name }}
 {{- $imageRepo := required "cloudEventsPlayer.image.repository is required when cloudEventsPlayer.enabled=true" .Values.cloudEventsPlayer.image.repository }}
 {{- $imageTag := default "latest" .Values.cloudEventsPlayer.image.tag }}
@@ -16,39 +16,39 @@ metadata:
 ---
 {{- end }}
 
-apiVersion: apps/v1
-kind: Deployment
+apiVersion: serving.knative.dev/v1
+kind: Service
 metadata:
   name: {{ $name }}
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: cloudevents-player
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    {{- if not .Values.cloudEventsPlayer.public }}
+    networking.knative.dev/visibility: cluster-local
+    {{- end }}
+{{- if .Values.serving.install }}
+  annotations:
+    "helm.sh/hook": post-install,post-upgrade
+    "helm.sh/hook-weight": "5"
+{{- end }}
 spec:
-  replicas: {{ .Values.cloudEventsPlayer.replicaCount }}
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: cloudevents-player
-      app.kubernetes.io/instance: {{ .Release.Name }}
   template:
     metadata:
-      labels:
-        app.kubernetes.io/name: cloudevents-player
-        app.kubernetes.io/instance: {{ .Release.Name }}
+      annotations:
+        autoscaling.knative.dev/min-scale: {{ .Values.cloudEventsPlayer.minScale | quote }}
+        autoscaling.knative.dev/max-scale: {{ .Values.cloudEventsPlayer.maxScale | quote }}
     spec:
       serviceAccountName: {{ $saName }}
       containers:
-      - name: cloudevents-player
-        image: {{ $imageRepo }}:{{ $imageTag }}
+      - image: {{ $imageRepo }}:{{ $imageTag }}
         imagePullPolicy: {{ .Values.cloudEventsPlayer.image.pullPolicy }}
         ports:
         - containerPort: {{ .Values.cloudEventsPlayer.containerPort }}
           protocol: TCP
-        env:
-        - name: PORT
-          value: {{ .Values.cloudEventsPlayer.containerPort | quote }}
         {{- if .Values.cloudEventsPlayer.extraEnv }}
+        env:
         {{- toYaml .Values.cloudEventsPlayer.extraEnv | nindent 8 }}
         {{- end }}
         livenessProbe:
@@ -64,26 +64,5 @@ spec:
           initialDelaySeconds: 5
           periodSeconds: 5
 ---
-{{- if .Values.cloudEventsPlayer.service.create }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ $name }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/name: cloudevents-player
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  selector:
-    app.kubernetes.io/name: cloudevents-player
-    app.kubernetes.io/instance: {{ .Release.Name }}
-  ports:
-  - port: {{ .Values.cloudEventsPlayer.service.port }}
-    targetPort: {{ .Values.cloudEventsPlayer.service.targetPort }}
-    protocol: TCP
-  type: {{ .Values.cloudEventsPlayer.service.type }}
----
-{{- end }}
 
 {{- end }}

charts/notification-automation/values.yaml

@@ -103,7 +103,7 @@ webhookSource:
   maxScale: "5"
   image:
     repository: "ghcr.io/eoepca/na-webhook-source"
-    tag: "sha-57b7a6e"
+    tag: "sha-405af37"
     pullPolicy: IfNotPresent
   containerPort: 8080
   serviceAccount:
@@ -171,7 +171,15 @@ apiServerSource:
 # CloudEvents Player configuration
 cloudEventsPlayer:
   enabled: false
-  replicaCount: 1
+  # Override the Knative Service name (determines public URL: <name>.<namespace>.<domain>)
+  # When empty, defaults to "<release>-cloudevents-player"
+  nameOverride: ""
+  # When false (default), the ksvc is cluster-local (private).
+  # Set to true to expose it externally via Knative's ingress gateway.
+  public: false
+  # Knative autoscaling
+  minScale: "1"
+  maxScale: "1"
   image:
     repository: "quay.io/ruben/cloudevents-player"
     tag: "v1.3"
@@ -180,21 +188,11 @@ cloudEventsPlayer:
   serviceAccount:
     create: true
     name: ""
-  service:
-    create: true
-    type: ClusterIP
-    port: 80
-    targetPort: 8080
-  ingress:
-    enabled: false
-    className: ""
-    annotations: {}
-    hosts:
-      - host: cloudevents-player.local
-        paths:
-          - path: /
-            pathType: Prefix
-    tls: []
+  # Optional: custom domain mapping for the Knative Service.
+  # When set, a DomainMapping is created. When empty, the auto-generated
+  # Knative URL is used: <name>.<namespace>.<serving.domain>
+  domainMapping:
+    domain: ""
   subscribeBroker:
     enabled: true
     broker: