Added AutomountServiceAccountToken to PodSpec

apache · Jun 3, 2024 · 81d9b26 · 81d9b26
1 parent 45b7a70
commit 81d9b26
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 1 deletion.
diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
@@ -4909,6 +4909,13 @@ PodSpec defines a group of Kubernetes resources.
 |Field
 |Description
 
+|`automountServiceAccountToken` +
+bool
+|
+
+
+AutomountServiceAccountToken
+
 |`volumes` +
 *https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#volume-v1-core[[\]Kubernetes core/v1.Volume]*
 |

diff --git a/helm/camel-k/crds/crd-integration.yaml b/helm/camel-k/crds/crd-integration.yaml
@@ -242,6 +242,9 @@ spec:
                         description: ActiveDeadlineSeconds
                         format: int64
                         type: integer
+                      automountServiceAccountToken:
+                        description: AutomountServiceAccountToken
+                        type: boolean
                       containers:
                         description: Containers
                         items:

diff --git a/helm/camel-k/crds/crd-kamelet-binding.yaml b/helm/camel-k/crds/crd-kamelet-binding.yaml
@@ -238,6 +238,9 @@ spec:
                             description: ActiveDeadlineSeconds
                             format: int64
                             type: integer
+                          automountServiceAccountToken:
+                            description: AutomountServiceAccountToken
+                            type: boolean
                           containers:
                             description: Containers
                             items:

diff --git a/helm/camel-k/crds/crd-pipe.yaml b/helm/camel-k/crds/crd-pipe.yaml
@@ -236,6 +236,9 @@ spec:
                             description: ActiveDeadlineSeconds
                             format: int64
                             type: integer
+                          automountServiceAccountToken:
+                            description: AutomountServiceAccountToken
+                            type: boolean
                           containers:
                             description: Containers
                             items:

diff --git a/pkg/apis/camel/v1/integration_types.go b/pkg/apis/camel/v1/integration_types.go
@@ -23,7 +23,7 @@ import (
 )
 
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
-// Important: Run "make generate-deepcopy" to regenerate code after modifying this file
+// Important: Run "make generate" to regenerate code after modifying this file
 
 // +genclient
 // +genclient:method=GetScale,verb=get,subresource=scale,result=k8s.io/api/autoscaling/v1.Scale
@@ -284,6 +284,8 @@ type PodSpecTemplate struct {
 
 // PodSpec defines a group of Kubernetes resources.
 type PodSpec struct {
+	// AutomountServiceAccountToken
+	AutomountServiceAccountToken *bool `json:"automountServiceAccountToken,omitempty" protobuf:"varint,21,opt,name=automountServiceAccountToken"`
 	// Volumes
 	Volumes []corev1.Volume `json:"volumes,omitempty" patchStrategy:"merge,retainKeys" patchMergeKey:"name" protobuf:"bytes,1,rep,name=volumes"`
 	// InitContainers

diff --git a/pkg/apis/camel/v1/zz_generated.deepcopy.go b/pkg/apis/camel/v1/zz_generated.deepcopy.go
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/podspec.go b/pkg/client/camel/applyconfiguration/camel/v1/podspec.go
diff --git a/pkg/resources/config/crd/bases/camel.apache.org_integrations.yaml b/pkg/resources/config/crd/bases/camel.apache.org_integrations.yaml
@@ -242,6 +242,9 @@ spec:
                         description: ActiveDeadlineSeconds
                         format: int64
                         type: integer
+                      automountServiceAccountToken:
+                        description: AutomountServiceAccountToken
+                        type: boolean
                       containers:
                         description: Containers
                         items:

diff --git a/pkg/resources/config/crd/bases/camel.apache.org_kameletbindings.yaml b/pkg/resources/config/crd/bases/camel.apache.org_kameletbindings.yaml
@@ -238,6 +238,9 @@ spec:
                             description: ActiveDeadlineSeconds
                             format: int64
                             type: integer
+                          automountServiceAccountToken:
+                            description: AutomountServiceAccountToken
+                            type: boolean
                           containers:
                             description: Containers
                             items:

diff --git a/pkg/resources/config/crd/bases/camel.apache.org_pipes.yaml b/pkg/resources/config/crd/bases/camel.apache.org_pipes.yaml
@@ -236,6 +236,9 @@ spec:
                             description: ActiveDeadlineSeconds
                             format: int64
                             type: integer
+                          automountServiceAccountToken:
+                            description: AutomountServiceAccountToken
+                            type: boolean
                           containers:
                             description: Containers
                             items:

diff --git a/pkg/trait/pod_test.go b/pkg/trait/pod_test.go
@@ -104,6 +104,14 @@ func TestSupplementalGroup(t *testing.T) {
 	assert.Contains(t, templateSpec.Spec.SecurityContext.SupplementalGroups, int64(666))
 }
 
+func TestAutomountServiceAccountToken(t *testing.T) {
+	templateString := `automountServiceAccountToken: false`
+	templateSpec := testPodTemplateSpec(t, templateString)
+
+	assert.NotNil(t, templateSpec.Spec.AutomountServiceAccountToken)
+	assert.False(t, *templateSpec.Spec.AutomountServiceAccountToken)
+}
+
 // nolint: unparam
 func createPodTest(podSpecTemplate string) (*podTrait, *Environment, *appsv1.Deployment) {
 	trait, _ := newPodTrait().(*podTrait)