add image_pull_policy for containers

Author: bestgopher

src/reconcile.rs

@@ -20,7 +20,7 @@ use kube::runtime::controller::Action;
 use snafu::Snafu;
 use std::sync::Arc;
 use std::time::Duration;
-use tracing::error;
+use tracing::{debug, error};
 
 #[derive(Snafu, Debug)]
 pub enum Error {
@@ -36,6 +36,11 @@ pub async fn reconcile_rustfs(tenant: Arc<Tenant>, ctx: Arc<Context>) -> Result<
     let latest_tenant = ctx.get::<Tenant>(&tenant.name(), &ns).await?;
 
     if latest_tenant.metadata.deletion_timestamp.is_some() {
+        debug!(
+            "tenant {} is deleted, deletion_timestamp is {:?}",
+            tenant.name(),
+            latest_tenant.metadata.deletion_timestamp
+        );
         return Ok(Action::await_change());
     }
 

src/types/v1alpha1/k8s.rs

@@ -16,14 +16,22 @@
 
 use k8s_openapi::schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
+use strum::Display;
 
 /// Pod management policy for StatefulSets
-#[derive(Default, Deserialize, Serialize, Clone, Debug, JsonSchema)]
+/// - OrderedReady: Respect the ordering guarantees demonstrated
+/// - Parallel: launch or terminate all Pods in parallel, and not to wait for Pods to become Running
+///   and Ready or completely terminated prior to launching or terminating another Pod
+///
+///https://kubernetes.io/docs/tutorials/stateful-application/basic-stateful-set/#pod-management-policy
+#[derive(Default, Deserialize, Serialize, Clone, Debug, JsonSchema, Display)]
 #[serde(rename_all = "PascalCase")]
 #[schemars(rename_all = "PascalCase")]
 pub enum PodManagementPolicy {
+    #[strum(to_string = "OrderedReady")]
     OrderedReady,
 
+    #[strum(to_string = "Parallel")]
     #[default]
     Parallel,
 }
@@ -32,12 +40,19 @@ pub enum PodManagementPolicy {
 /// - Always: Always pull the image
 /// - Never: Never pull the image
 /// - IfNotPresent: Pull the image if not present locally (default)
-#[derive(Default, Deserialize, Serialize, Clone, Debug, JsonSchema)]
+///
+/// https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy
+#[derive(Default, Deserialize, Serialize, Clone, Debug, JsonSchema, Display)]
 #[serde(rename_all = "PascalCase")]
 #[schemars(rename_all = "PascalCase")]
 pub enum ImagePullPolicy {
+    #[strum(to_string = "Always")]
     Always,
+
+    #[strum(to_string = "Never")]
     Never,
+
+    #[strum(to_string = "IfNotPresent")]
     #[default]
     IfNotPresent,
 }

src/types/v1alpha1/status/pool.rs

@@ -27,13 +27,13 @@ pub struct Pool {
 
 #[derive(Deserialize, Serialize, Clone, Debug, Display)]
 pub enum PoolState {
-    #[strum(serialize = "PoolCreated")]
+    #[strum(to_string = "PoolCreated")]
     Created,
 
-    #[strum(serialize = "PoolNotCreated")]
+    #[strum(to_string = "PoolNotCreated")]
     NotCreated,
 
-    #[strum(serialize = "PoolInitialized")]
+    #[strum(to_string = "PoolInitialized")]
     Initialized,
 }
 

src/types/v1alpha1/status/state.rs

@@ -16,24 +16,24 @@ use strum::Display;
 
 #[derive(Display)]
 pub enum State {
-    #[strum(serialize = "Initialized")]
+    #[strum(to_string = "Initialized")]
     Initialized,
 
-    #[strum(serialize = "Statefulset not controlled by operator")]
+    #[strum(to_string = "Statefulset not controlled by operator")]
     NotOwned,
 
-    #[strum(serialize = "Pool Decommissioning Not Allowed")]
+    #[strum(to_string = "Pool Decommissioning Not Allowed")]
     DecommissioningNotAllowed,
 
-    #[strum(serialize = "Provisioning IO Service")]
+    #[strum(to_string = "Provisioning IO Service")]
     ProvisioningIOService,
 
-    #[strum(serialize = "Provisioning Console Service")]
+    #[strum(to_string = "Provisioning Console Service")]
     ProvisioningConsoleService,
 
-    #[strum(serialize = "Provisioning Headless Service")]
+    #[strum(to_string = "Provisioning Headless Service")]
     ProvisioningHeadlessService,
 
-    #[strum(serialize = "Multiple tenants exist in the namespace")]
+    #[strum(to_string = "Multiple tenants exist in the namespace")]
     MultipleTenantsExist,
 }

src/types/v1alpha1/tenant/workloads.rs

@@ -14,7 +14,6 @@
 
 use super::Tenant;
 use crate::types;
-use crate::types::v1alpha1::k8s::PodManagementPolicy;
 use crate::types::v1alpha1::pool::Pool;
 use k8s_openapi::api::apps::v1;
 use k8s_openapi::api::core::v1 as corev1;
@@ -206,6 +205,11 @@ impl Tenant {
             lifecycle: self.spec.lifecycle.clone(),
             // Apply pool-level resource requirements to container
             resources: pool.scheduling.resources.clone(),
+            image_pull_policy: self
+                .spec
+                .image_pull_policy
+                .as_ref()
+                .map(ToString::to_string),
             ..Default::default()
         };
 
@@ -220,10 +224,11 @@ impl Tenant {
             spec: Some(v1::StatefulSetSpec {
                 replicas: Some(pool.servers),
                 service_name: Some(self.headless_service_name()),
-                pod_management_policy: Some(match self.spec.pod_management_policy {
-                    Some(PodManagementPolicy::Parallel) | None => "Parallel".to_owned(),
-                    Some(PodManagementPolicy::OrderedReady) => "OrderedReady".to_owned(),
-                }),
+                pod_management_policy: self
+                    .spec
+                    .pod_management_policy
+                    .as_ref()
+                    .map(ToString::to_string),
                 selector: metav1::LabelSelector {
                     match_labels: Some(selector_labels),
                     ..Default::default()