Update and cleanup examples

nagare-media · Dec 18, 2024 · 9bfc713 · 9bfc713
1 parent 5081f53
commit 9bfc713
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 579 deletions.
diff --git a/config/deployment-gateway-nbmp/gateway-nbmp_config.yaml b/config/deployment-gateway-nbmp/gateway-nbmp_config.yaml
@@ -8,5 +8,3 @@ metadata:
     app.kubernetes.io/created-by: nagare-media-engine
     app.kubernetes.io/part-of: nagare-media-engine
     app.kubernetes.io/managed-by: kustomize
-webserver:
-  bindAddress: :8080
diff --git a/config/deployment-workflow-manager/workflow-manager_config.yaml b/config/deployment-workflow-manager/workflow-manager_config.yaml
@@ -8,12 +8,7 @@ metadata:
     app.kubernetes.io/created-by: nagare-media-engine
     app.kubernetes.io/part-of: nagare-media-engine
     app.kubernetes.io/managed-by: kustomize
-health:
-  healthProbeBindAddress: :8081
-metrics:
-  bindAddress: :8080
-webhook:
-  port: 9443
 leaderElection:
   leaderElect: true
-  resourceName: a3df9e9e.engine.nagare.media
+nats:
+  url: nats://nats.nats.svc.cluster.local:4222
diff --git a/config/output-skaffold/gateway-nbmp_config.yaml b/config/output-skaffold/gateway-nbmp_config.yaml
@@ -9,9 +9,4 @@ metadata:
     app.kubernetes.io/part-of: nagare-media-engine
     app.kubernetes.io/managed-by: kustomize
 webserver:
-  bindAddress: :8080
   publicBaseURL: http://engine.nagare.localtest.me
-workflow:
-  kubernetes:
-    namespace: default
-    gpuResourceName: nvidia.com/gpu
diff --git a/config/output-skaffold/gateway-nbmp_ingress.yaml b/config/output-skaffold/gateway-nbmp_ingress.yaml
@@ -2,6 +2,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
+    # Don't fail requests when debugging.
     nginx.ingress.kubernetes.io/proxy-read-timeout: "999999"
   labels:
     app.kubernetes.io/name: ingress

diff --git a/config/output-skaffold/workflow-manager_config.yaml b/config/output-skaffold/workflow-manager_config.yaml
@@ -8,14 +8,7 @@ metadata:
     app.kubernetes.io/created-by: nagare-media-engine
     app.kubernetes.io/part-of: nagare-media-engine
     app.kubernetes.io/managed-by: kustomize
-health:
-  healthProbeBindAddress: :8081
-metrics:
-  bindAddress: :8080
-webhook:
-  port: 9443
 leaderElection:
   leaderElect: false
-  resourceName: a3df9e9e.engine.nagare.media
 nats:
   url: nats://nats.nats.svc.cluster.local:4222
diff --git a/config/samples/docker/compose.yaml b/config/samples/docker/compose.yaml
diff --git a/config/samples/engine/gateway-nbmp-config.yaml b/config/samples/engine/gateway-nbmp-config.yaml
@@ -8,10 +8,4 @@ metadata:
     app.kubernetes.io/created-by: nagare-media-engine
     app.kubernetes.io/part-of: nagare-media-engine
     app.kubernetes.io/managed-by: kustomize
-webserver:
-  bindAddress: :8080
-  publicBaseURL: http://engine.nagare.localtest.me
-workflow:
-  kubernetes:
-    namespace: default
-    gpuResourceName: nvidia.com/gpu
+# TODO: add all options with defaults
diff --git a/config/samples/engine/workflow-manager-config.yaml b/config/samples/engine/workflow-manager-config.yaml
@@ -8,16 +8,4 @@ metadata:
     app.kubernetes.io/created-by: nagare-media-engine
     app.kubernetes.io/part-of: nagare-media-engine
     app.kubernetes.io/managed-by: kustomize
-health:
-  healthProbeBindAddress: :8081
-metrics:
-  bindAddress: :8080
-webhook:
-  port: 9443
-leaderElection:
-  leaderElect: false
-  resourceName: a3df9e9e.engine.nagare.media
-nats:
-  url: nats://nats:4222
-  username: nagare-media-engine
-  password: nagare-media-engine
+# TODO: add all options with defaults
diff --git a/config/samples/engine/workflow-manager-helper-config.yaml b/config/samples/engine/workflow-manager-helper-config.yaml
@@ -3,3 +3,4 @@ kind: WorkflowManagerHelperConfig
 task:
   # assume task is a sidecar
   taskAPI: http://127.0.0.1:8888/v2/tasks
+# TODO: add all options with defaults
diff --git a/config/samples/k8s/v1alpha1_engine.nagare.media_medialocations.yaml b/config/samples/k8s/v1alpha1_engine.nagare.media_medialocations.yaml
diff --git a/...nagare.media_mediaprocessingentities.yaml → ...mediaprocessingentities_edge-cluster.yaml b/...nagare.media_mediaprocessingentities.yaml → ...mediaprocessingentities_edge-cluster.yaml
@@ -1,20 +1,3 @@
----
-apiVersion: engine.nagare.media/v1alpha1
-kind: MediaProcessingEntity
-metadata:
-  annotations:
-    engine.nagare.media/is-default-media-processing-entity: "true"
-  labels:
-    app.kubernetes.io/name: mediaprocessingentity
-    app.kubernetes.io/instance: local-cluster
-    app.kubernetes.io/part-of: nagare-media-engine
-    app.kubernetes.io/created-by: nagare-media-engine
-  name: local-cluster
-  namespace: default
-spec:
-  local:
-    namespace: default
----
 apiVersion: engine.nagare.media/v1alpha1
 kind: ClusterMediaProcessingEntity
 metadata:

diff --git a/config/samples/k8s/v1alpha1_engine.nagare.media_mediaprocessingentities_local-cluster.yaml b/config/samples/k8s/v1alpha1_engine.nagare.media_mediaprocessingentities_local-cluster.yaml
@@ -0,0 +1,14 @@
+apiVersion: engine.nagare.media/v1alpha1
+kind: ClusterMediaProcessingEntity
+metadata:
+  annotations:
+    engine.nagare.media/is-default-media-processing-entity: "true"
+  labels:
+    app.kubernetes.io/name: mediaprocessingentity
+    app.kubernetes.io/instance: local-cluster
+    app.kubernetes.io/part-of: nagare-media-engine
+    app.kubernetes.io/created-by: nagare-media-engine
+  name: local-cluster
+spec:
+  local:
+    namespace: default
diff --git a/config/samples/nbmp/v2_nbmp_live.wdd b/config/samples/nbmp/v2_nbmp_live.wdd