Remove daemonset code

nginx · Feb 11, 2025 · 8265e5d · 8265e5d
1 parent ef71abb
commit 8265e5d
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 6,902 deletions.
diff --git a/apis/v1alpha2/nginxproxy_types.go b/apis/v1alpha2/nginxproxy_types.go
@@ -358,22 +358,14 @@ const (
 	NginxPlusAllowIPAddressType NginxPlusAllowAddressType = "IPAddress"
 )
 
-// Kubernetes contains the configuration for the nginx deployment and service Kubernetes objects.
-// +kubebuilder:validation:XValidation:message="Only one of deployment or daemonset can be specified",rule="((!has(self.deployment) && !has(self.daemonset)) || (has(self.deployment) && !has(self.daemonset)) || (!has(self.deployment) && has(self.daemonset)))"
-//
-//nolint:lll
+// KubernetesSpec contains the configuration for the nginx deployment and service Kubernetes objects.
 type KubernetesSpec struct {
 	// Deployment is the configuration for the nginx Deployment.
 	// This is the default deployment option.
 	//
 	// +optional
 	Deployment *DeploymentSpec `json:"deployment,omitempty"`
 
-	// DaemonSet is the configuration for the nginx DaemonSet.
-	//
-	// +optional
-	DaemonSet *DaemonSetSpec `json:"daemonset,omitempty"`
-
 	// Service is the configuration for the nginx Service.
 	//
 	// +optional
@@ -398,19 +390,6 @@ type DeploymentSpec struct {
 	Container ContainerSpec `json:"container,omitempty"`
 }
 
-// DaemonSet is the configuration for the nginx DaemonSet.
-type DaemonSetSpec struct {
-	// Pod defines Pod-specific fields.
-	//
-	// +optional
-	Pod PodSpec `json:"pod,omitempty"`
-
-	// Container defines container fields for the nginx container.
-	//
-	// +optional
-	Container ContainerSpec `json:"container,omitempty"`
-}
-
 // PodSpec defines Pod-specific fields.
 type PodSpec struct {
 	// TerminationGracePeriodSeconds is the optional duration in seconds the pod needs to terminate gracefully.

diff --git a/apis/v1alpha2/zz_generated.deepcopy.go b/apis/v1alpha2/zz_generated.deepcopy.go
diff --git a/charts/nginx-gateway-fabric/templates/nginxproxy.yaml b/charts/nginx-gateway-fabric/templates/nginxproxy.yaml
@@ -23,18 +23,6 @@ spec:
         {{- end }}
         image:
           {{- toYaml .Values.nginx.image | nindent 10 }}
-    {{- else if eq .Values.nginx.kind "daemonset" }}
-    daemonset:
-      {{- if .Values.nginx.pod }}
-      pod:
-        {{- toYaml .Values.nginx.pod | nindent 8 }}
-      {{- end }}
-      container:
-        {{- if .Values.nginx.container }}
-          {{- toYaml .Values.nginx.container | nindent 8 }}
-        {{- end }}
-        image:
-          {{- toYaml .Values.nginx.image | nindent 10 }}
     {{- end }}
     {{- if .Values.nginx.service }}
     service:

diff --git a/charts/nginx-gateway-fabric/values.schema.json b/charts/nginx-gateway-fabric/values.schema.json
@@ -286,8 +286,7 @@
           "default": "deployment",
           "description": "The kind of NGINX deployment.",
           "enum": [
-            "deployment",
-            "daemonset"
+            "deployment"
           ],
           "required": [],
           "title": "kind"

diff --git a/charts/nginx-gateway-fabric/values.yaml b/charts/nginx-gateway-fabric/values.yaml
@@ -179,7 +179,6 @@ nginx:
   # @schema
   # enum:
   #   - deployment
-  #   - daemonset
   # @schema
   # -- The kind of NGINX deployment.
   kind: deployment

diff --git a/config/crd/bases/gateway.nginx.org_nginxproxies.yaml b/config/crd/bases/gateway.nginx.org_nginxproxies.yaml
diff --git a/deploy/crds.yaml b/deploy/crds.yaml
diff --git a/internal/mode/static/provisioner/objects.go b/internal/mode/static/provisioner/objects.go
@@ -478,8 +478,6 @@ func (p *NginxProvisioner) buildImage(nProxyCfg *graph.EffectiveNginxProxy) (str
 	if nProxyCfg != nil && nProxyCfg.Kubernetes != nil {
 		if nProxyCfg.Kubernetes.Deployment != nil {
 			image, tag, pullPolicy = getImageAndPullPolicy(nProxyCfg.Kubernetes.Deployment.Container)
-		} else if nProxyCfg.Kubernetes.DaemonSet != nil {
-			image, tag, pullPolicy = getImageAndPullPolicy(nProxyCfg.Kubernetes.DaemonSet.Container)
 		}
 	}
 

diff --git a/site/content/reference/api.md b/site/content/reference/api.md
@@ -1991,7 +1991,6 @@ sigs.k8s.io/gateway-api/apis/v1alpha2.PolicyStatus
 </h3>
 <p>
 (<em>Appears on: </em>
-<a href="#gateway.nginx.org/v1alpha2.DaemonSetSpec">DaemonSetSpec</a>,
 <a href="#gateway.nginx.org/v1alpha2.DeploymentSpec">DeploymentSpec</a>)
 </p>
 <p>
@@ -2065,54 +2064,6 @@ until the action is complete, unless the container process fails, in which case
 </tr>
 </tbody>
 </table>
-<h3 id="gateway.nginx.org/v1alpha2.DaemonSetSpec">DaemonSetSpec
-<a class="headerlink" href="#gateway.nginx.org%2fv1alpha2.DaemonSetSpec" title="Permanent link">¶</a>
-</h3>
-<p>
-(<em>Appears on: </em>
-<a href="#gateway.nginx.org/v1alpha2.KubernetesSpec">KubernetesSpec</a>)
-</p>
-<p>
-<p>DaemonSet is the configuration for the nginx DaemonSet.</p>
-</p>
-<table class="table table-bordered table-striped">
-<thead>
-<tr>
-<th>Field</th>
-<th>Description</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>
-<code>pod</code><br/>
-<em>
-<a href="#gateway.nginx.org/v1alpha2.PodSpec">
-PodSpec
-</a>
-</em>
-</td>
-<td>
-<em>(Optional)</em>
-<p>Pod defines Pod-specific fields.</p>
-</td>
-</tr>
-<tr>
-<td>
-<code>container</code><br/>
-<em>
-<a href="#gateway.nginx.org/v1alpha2.ContainerSpec">
-ContainerSpec
-</a>
-</em>
-</td>
-<td>
-<em>(Optional)</em>
-<p>Container defines container fields for the nginx container.</p>
-</td>
-</tr>
-</tbody>
-</table>
 <h3 id="gateway.nginx.org/v1alpha2.DeploymentSpec">DeploymentSpec
 <a class="headerlink" href="#gateway.nginx.org%2fv1alpha2.DeploymentSpec" title="Permanent link">¶</a>
 </h3>
@@ -2319,7 +2270,7 @@ PullPolicy
 <a href="#gateway.nginx.org/v1alpha2.NginxProxySpec">NginxProxySpec</a>)
 </p>
 <p>
-<p>Kubernetes contains the configuration for the nginx deployment and service Kubernetes objects.</p>
+<p>KubernetesSpec contains the configuration for the nginx deployment and service Kubernetes objects.</p>
 </p>
 <table class="table table-bordered table-striped">
 <thead>
@@ -2346,20 +2297,6 @@ This is the default deployment option.</p>
 </tr>
 <tr>
 <td>
-<code>daemonset</code><br/>
-<em>
-<a href="#gateway.nginx.org/v1alpha2.DaemonSetSpec">
-DaemonSetSpec
-</a>
-</em>
-</td>
-<td>
-<em>(Optional)</em>
-<p>DaemonSet is the configuration for the nginx DaemonSet.</p>
-</td>
-</tr>
-<tr>
-<td>
 <code>service</code><br/>
 <em>
 <a href="#gateway.nginx.org/v1alpha2.ServiceSpec">
@@ -2805,7 +2742,6 @@ be unique across all targetRef entries in the ObservabilityPolicy.</p>
 </h3>
 <p>
 (<em>Appears on: </em>
-<a href="#gateway.nginx.org/v1alpha2.DaemonSetSpec">DaemonSetSpec</a>,
 <a href="#gateway.nginx.org/v1alpha2.DeploymentSpec">DeploymentSpec</a>)
 </p>
 <p>