Skip to content

Fix #6724: Allow setting enableServiceLinks on the Integration pod template #6725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lsergio wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix #6724: Allow setting enableServiceLinks on the Integration pod template #6725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions helm/camel-k/crds/camel-k-crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15093,6 +15093,12 @@ spec:
dnsPolicy:
description: DNSPolicy
type: string
enableServiceLinks:
description: EnableServiceLinks indicates whether information
about services should be injected into the Pod's environment
variables, matching the syntax of Docker links. Defaults
to true.
type: boolean
ephemeralContainers:
description: EphemeralContainers
items:
Expand Down Expand Up @@ -28057,6 +28063,12 @@ spec:
dnsPolicy:
description: DNSPolicy
type: string
enableServiceLinks:
description: EnableServiceLinks indicates whether information
about services should be injected into the Pod's environment
variables, matching the syntax of Docker links. Defaults
to true.
type: boolean
ephemeralContainers:
description: EphemeralContainers
items:
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/camel/v1/integration_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,8 @@ type PodSpecTemplate struct {
type PodSpec struct {
// AutomountServiceAccountToken
AutomountServiceAccountToken *bool `json:"automountServiceAccountToken,omitempty" protobuf:"varint,21,opt,name=automountServiceAccountToken"`
// EnableServiceLinks indicates whether information about services should be injected into the Pod's environment variables, matching the syntax of Docker links. Defaults to true.
EnableServiceLinks *bool `json:"enableServiceLinks,omitempty" protobuf:"varint,30,opt,name=enableServiceLinks"`
// Volumes
Volumes []corev1.Volume `json:"volumes,omitempty" patchMergeKey:"name" patchStrategy:"merge,retainKeys" protobuf:"bytes,1,rep,name=volumes"`
// InitContainers
Expand Down
5 changes: 5 additions & 0 deletions pkg/apis/camel/v1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions pkg/client/camel/applyconfiguration/camel/v1/podspec.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions pkg/resources/config/crd/bases/camel.apache.org_integrations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1836,6 +1836,12 @@ spec:
dnsPolicy:
description: DNSPolicy
type: string
enableServiceLinks:
description: EnableServiceLinks indicates whether information
about services should be injected into the Pod's environment
variables, matching the syntax of Docker links. Defaults
to true.
type: boolean
ephemeralContainers:
description: EphemeralContainers
items:
Expand Down
6 changes: 6 additions & 0 deletions pkg/resources/config/crd/bases/camel.apache.org_pipes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1843,6 +1843,12 @@ spec:
dnsPolicy:
description: DNSPolicy
type: string
enableServiceLinks:
description: EnableServiceLinks indicates whether information
about services should be injected into the Pod's environment
variables, matching the syntax of Docker links. Defaults
to true.
type: boolean
ephemeralContainers:
description: EphemeralContainers
items:
Expand Down
8 changes: 8 additions & 0 deletions pkg/trait/pod_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,14 @@ func TestAutomountServiceAccountToken(t *testing.T) {
assert.False(t, *templateSpec.Spec.AutomountServiceAccountToken)
}

func TestEnableServiceLinks(t *testing.T) {
templateString := `enableServiceLinks: false`
templateSpec := testPodTemplateSpec(t, templateString)

assert.NotNil(t, templateSpec.Spec.EnableServiceLinks)
assert.False(t, *templateSpec.Spec.EnableServiceLinks)
}

// nolint: unparam
func createPodTest(podSpecTemplate string) (*podTrait, *Environment, *appsv1.Deployment) {
trait, _ := newPodTrait().(*podTrait)
Expand Down
Loading