Merge branch 'main' into fix/pod-info-decimal-precision

numaproj · Nov 21, 2024 · 66dadc1 · 66dadc1
2 parents 8b8ea70 + c5afc90
commit 66dadc1
Show file tree

Hide file tree

Showing 51 changed files with 1,289 additions and 1,024 deletions.
diff --git a/api/json-schema/schema.json b/api/json-schema/schema.json
@@ -20922,8 +20922,13 @@
     "io.numaproj.numaflow.v1alpha1.Lifecycle": {
       "properties": {
         "deleteGracePeriodSeconds": {
-          "description": "DeleteGracePeriodSeconds used to delete pipeline gracefully",
-          "format": "int32",
+          "description": "DeleteGracePeriodSeconds used to delete pipeline gracefully Deprecated: Use DeletionGracePeriodSeconds instead",
+          "format": "int64",
+          "type": "integer"
+        },
+        "deletionGracePeriodSeconds": {
+          "description": "DeletionGracePeriodSeconds used to delete pipeline gracefully",
+          "format": "int64",
           "type": "integer"
         },
         "desiredPhase": {
@@ -20932,7 +20937,7 @@
         },
         "pauseGracePeriodSeconds": {
           "description": "PauseGracePeriodSeconds used to pause pipeline gracefully",
-          "format": "int32",
+          "format": "int64",
           "type": "integer"
         }
       },

diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
@@ -20918,9 +20918,14 @@
       "type": "object",
       "properties": {
         "deleteGracePeriodSeconds": {
-          "description": "DeleteGracePeriodSeconds used to delete pipeline gracefully",
+          "description": "DeleteGracePeriodSeconds used to delete pipeline gracefully Deprecated: Use DeletionGracePeriodSeconds instead",
           "type": "integer",
-          "format": "int32"
+          "format": "int64"
+        },
+        "deletionGracePeriodSeconds": {
+          "description": "DeletionGracePeriodSeconds used to delete pipeline gracefully",
+          "type": "integer",
+          "format": "int64"
         },
         "desiredPhase": {
           "description": "DesiredPhase used to bring the pipeline from current phase to desired phase",
@@ -20929,7 +20934,7 @@
         "pauseGracePeriodSeconds": {
           "description": "PauseGracePeriodSeconds used to pause pipeline gracefully",
           "type": "integer",
-          "format": "int32"
+          "format": "int64"
         }
       }
     },

diff --git a/config/base/crds/full/numaflow.numaproj.io_pipelines.yaml b/config/base/crds/full/numaflow.numaproj.io_pipelines.yaml
@@ -108,7 +108,11 @@ spec:
                 properties:
                   deleteGracePeriodSeconds:
                     default: 30
-                    format: int32
+                    format: int64
+                    type: integer
+                  deletionGracePeriodSeconds:
+                    default: 30
+                    format: int64
                     type: integer
                   desiredPhase:
                     default: Running
@@ -122,7 +126,7 @@ spec:
                     type: string
                   pauseGracePeriodSeconds:
                     default: 30
-                    format: int32
+                    format: int64
                     type: integer
                 type: object
               limits:

diff --git a/config/install.yaml b/config/install.yaml
@@ -9846,7 +9846,11 @@ spec:
                 properties:
                   deleteGracePeriodSeconds:
                     default: 30
-                    format: int32
+                    format: int64
+                    type: integer
+                  deletionGracePeriodSeconds:
+                    default: 30
+                    format: int64
                     type: integer
                   desiredPhase:
                     default: Running
@@ -9860,7 +9864,7 @@ spec:
                     type: string
                   pauseGracePeriodSeconds:
                     default: 30
-                    format: int32
+                    format: int64
                     type: integer
                 type: object
               limits:

diff --git a/config/namespace-install.yaml b/config/namespace-install.yaml
@@ -9846,7 +9846,11 @@ spec:
                 properties:
                   deleteGracePeriodSeconds:
                     default: 30
-                    format: int32
+                    format: int64
+                    type: integer
+                  deletionGracePeriodSeconds:
+                    default: 30
+                    format: int64
                     type: integer
                   desiredPhase:
                     default: Running
@@ -9860,7 +9864,7 @@ spec:
                     type: string
                   pauseGracePeriodSeconds:
                     default: 30
-                    format: int32
+                    format: int64
                     type: integer
                 type: object
               limits:

diff --git a/docs/APIs.md b/docs/APIs.md
@@ -5497,15 +5497,15 @@ Description
 
 <td>
 
-<code>deleteGracePeriodSeconds</code></br> <em> int32 </em>
+<code>deletionGracePeriodSeconds</code></br> <em> int64 </em>
 </td>
 
 <td>
 
 <em>(Optional)</em>
 <p>
 
-DeleteGracePeriodSeconds used to delete pipeline gracefully
+DeletionGracePeriodSeconds used to delete pipeline gracefully
 </p>
 
 </td>
@@ -5538,7 +5538,7 @@ phase
 
 <td>
 
-<code>pauseGracePeriodSeconds</code></br> <em> int32 </em>
+<code>pauseGracePeriodSeconds</code></br> <em> int64 </em>
 </td>
 
 <td>
@@ -5553,6 +5553,26 @@ PauseGracePeriodSeconds used to pause pipeline gracefully
 
 </tr>
 
+<tr>
+
+<td>
+
+<code>deleteGracePeriodSeconds</code></br> <em> int64 </em>
+</td>
+
+<td>
+
+<em>(Optional)</em>
+<p>
+
+DeleteGracePeriodSeconds used to delete pipeline gracefully Deprecated:
+Use DeletionGracePeriodSeconds instead
+</p>
+
+</td>
+
+</tr>
+
 </tbody>
 
 </table>

diff --git a/docs/user-guide/reference/pipeline-operations.md b/docs/user-guide/reference/pipeline-operations.md
@@ -36,4 +36,4 @@ The command below will bring the pipeline back to `Running` status.
 
 ## Delete a Pipeline
 
-When deleting a pipeline, before terminating all the pods, it will try to wait for all the backlog messages that have already been ingested into the pipeline to be processed. However, it will not wait forever, if the backlog is too large, it will terminate the pods after `terminationGracePeriodSeconds`, which defaults to 30, and can be customized by setting `spec.lifecycle.terminationGracePeriodSeconds`.
+When deleting a pipeline, before terminating all the pods, it will try to wait for all the backlog messages that have already been ingested into the pipeline to be processed. However, it will not wait forever, if the backlog is too large, it will terminate the pods after `deletionGracePeriodSeconds`, which defaults to 30, and can be customized by setting `spec.lifecycle.deletionGracePeriodSeconds`.
diff --git a/examples/21-simple-mono-vertex.yaml b/examples/21-simple-mono-vertex.yaml
@@ -14,4 +14,4 @@ spec:
   sink:
     udsink:
       container:
-        image: quay.io/numaio/numaflow-rs/sink-log:stable
+        image: quay.io/numaio/numaflow-rs/sink-log:stable
diff --git a/pkg/apis/numaflow/v1alpha1/container_builder.go b/pkg/apis/numaflow/v1alpha1/container_builder.go
@@ -16,7 +16,10 @@ limitations under the License.
 
 package v1alpha1
 
-import corev1 "k8s.io/api/core/v1"
+import (
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/utils/ptr"
+)
 
 type containerBuilder corev1.Container
 
@@ -85,6 +88,11 @@ func (b containerBuilder) resources(x corev1.ResourceRequirements) containerBuil
 	return b
 }
 
+func (b containerBuilder) asSidecar() containerBuilder {
+	b.RestartPolicy = ptr.To[corev1.ContainerRestartPolicy](corev1.ContainerRestartPolicyAlways)
+	return b
+}
+
 func (b containerBuilder) build() corev1.Container {
 	return corev1.Container(b)
 }
diff --git a/pkg/apis/numaflow/v1alpha1/container_builder_test.go b/pkg/apis/numaflow/v1alpha1/container_builder_test.go
@@ -22,6 +22,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	resource "k8s.io/apimachinery/pkg/api/resource"
+	"k8s.io/utils/ptr"
 )
 
 var (
@@ -49,6 +50,7 @@ func Test_containerBuilder(t *testing.T) {
 		appendEnv(corev1.EnvVar{
 			Name: "env", Value: "value"}).
 		appendPorts(corev1.ContainerPort{Name: "port", ContainerPort: 8080}).
+		asSidecar().
 		build()
 	assert.Equal(t, "numa", c.Name)
 	assert.Len(t, c.VolumeMounts, 1)
@@ -58,4 +60,5 @@ func Test_containerBuilder(t *testing.T) {
 	assert.Equal(t, corev1.PullIfNotPresent, c.ImagePullPolicy)
 	assert.Equal(t, []corev1.EnvVar{{Name: "env", Value: "value"}}, c.Env)
 	assert.Equal(t, []corev1.ContainerPort{{Name: "port", ContainerPort: 8080}}, c.Ports)
+	assert.Equal(t, ptr.To[corev1.ContainerRestartPolicy](corev1.ContainerRestartPolicyAlways), c.RestartPolicy)
 }
diff --git a/pkg/apis/numaflow/v1alpha1/container_supplier.go b/pkg/apis/numaflow/v1alpha1/container_supplier.go
@@ -29,5 +29,6 @@ type getContainerReq struct {
 }
 
 type containerSupplier interface {
-	getContainers(req getContainerReq) ([]corev1.Container, error)
+	// getContainers returns the sidecar containers and main containers for the vertex.
+	getContainers(req getContainerReq) ([]corev1.Container, []corev1.Container, error)
 }