Skip to content
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

Jump to bottom

support: nodeselector in apiserversource #7584

Merged
merged 9 commits into from
Jan 24, 2024
Merged

support: nodeselector in apiserversource #7584

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
85d1b91
support: nodeselector in apiserversource
sadath-12 Jan 16, 2024
7ea4605
fix
sadath-12 Jan 16, 2024
0f8e255
minorfix
sadath-12 Jan 16, 2024
7ca2076
multiple values check
sadath-12 Jan 17, 2024
1aecd2b
test: nodeselector reconcile
sadath-12 Jan 17, 2024
7e4edc6
undo format
sadath-12 Jan 18, 2024
b83c4de
lintfix
sadath-12 Jan 22, 2024
3173443
newline config-features
sadath-12 Jan 23, 2024
93369b5
correct space
sadath-12 Jan 23, 2024
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
21 changes: 21 additions & 0 deletions pkg/apis/feature/features.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,25 @@ func (e Flags) String() string {
return fmt.Sprintf("%+v", map[string]Flag(e))
}

func (e Flags) NodeSelector() map[string]string {
// Check if NodeSelector is not nil
if e == nil {
return map[string]string{}
}

nodeSelectorMap := make(map[string]string)

for k, v := range e {
if strings.Contains(k, NodeSelectorLabel) {
key := strings.TrimPrefix(k, NodeSelectorLabel)
value := strings.TrimSpace(string(v))
nodeSelectorMap[key] = value
}
}

return nodeSelectorMap
}

// NewFlagsConfigFromMap creates a Flags from the supplied Map
func NewFlagsConfigFromMap(data map[string]string) (Flags, error) {
flags := newDefaults()
Expand All @@ -122,6 +141,8 @@ func NewFlagsConfigFromMap(data map[string]string) (Flags, error) {
flags[sanitizedKey] = Permissive
} else if k == TransportEncryption && strings.EqualFold(v, string(Strict)) {
flags[sanitizedKey] = Strict
} else if strings.Contains(k, NodeSelectorLabel) {
flags[sanitizedKey] = Flag(v)
} else {
return flags, fmt.Errorf("cannot parse the feature flag '%s' = '%s'", k, v)
}
Expand Down
5 changes: 4 additions & 1 deletion pkg/apis/feature/features_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,13 @@ func TestGetFlags(t *testing.T) {
require.True(t, flags.IsAllowed("my-enabled-flag"))
require.True(t, flags.IsAllowed("my-allowed-flag"))
require.False(t, flags.IsAllowed("non-disabled-flag"))

nodeSelector := flags.NodeSelector()
expectedNodeSelector := map[string]string{"testkey": "testvalue", "testkey1": "testvalue1", "testkey2": "testvalue2"}
require.Equal(t, expectedNodeSelector, nodeSelector)
}

func TestShouldNotOverrideDefaults(t *testing.T) {

f, err := NewFlagsConfigFromMap(map[string]string{})
require.Nil(t, err)
require.NotNil(t, f)
Expand Down
1 change: 1 addition & 0 deletions pkg/apis/feature/flag_names.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,5 @@ const (
TransportEncryption = "transport-encryption"
EvenTypeAutoCreate = "eventtype-auto-create"
OIDCAuthentication = "authentication-oidc"
NodeSelectorLabel = "apiserversources.nodeselector."
)
4 changes: 4 additions & 0 deletions pkg/apis/feature/testdata/config-features.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,7 @@
my-enabled-flag: "enabled"
my-disabled-flag: "disabled"
my-allowed-flag: "allowed"
apiserversources.nodeselector.testkey: testvalue
apiserversources.nodeselector.testkey1: testvalue1
apiserversources.nodeselector.testkey2: testvalue2

Check failure on line 31 in pkg/apis/feature/testdata/config-features.yaml

View workflow job for this annotation

GitHub Actions / style / Golang / Lint 

[trailing whitespace] reported by reviewdog 🐶
  

Raw Output:
pkg/apis/feature/testdata/config-features.yaml:31:
9 changes: 4 additions & 5 deletions pkg/reconciler/apiserversource/apiserversource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, source *v1.ApiServerSour
// no Namespace defined in dest.Ref, we will use the Namespace of the source
// as the Namespace of dest.Ref.
if dest.Ref.Namespace == "" {
//TODO how does this work with deprecated fields
// TODO how does this work with deprecated fields
dest.Ref.Namespace = source.GetNamespace()
}
}
Expand All @@ -118,7 +118,6 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, source *v1.ApiServerSour
if featureFlags.IsOIDCAuthentication() {
// Create the role
err := r.createOIDCRole(ctx, source)

if err != nil {
logging.FromContext(ctx).Errorw("Failed when creating the OIDC Role for ApiServerSource", zap.Error(err))
return err
Expand Down Expand Up @@ -225,6 +224,8 @@ func (r *Reconciler) createReceiveAdapter(ctx context.Context, src *v1.ApiServer
// return nil, err
// }

featureFlags := feature.FromContext(ctx)

adapterArgs := resources.ReceiveAdapterArgs{
Image: r.receiveAdapterImage,
Source: src,
Expand All @@ -235,6 +236,7 @@ func (r *Reconciler) createReceiveAdapter(ctx context.Context, src *v1.ApiServer
Configs: r.configs,
Namespaces: namespaces,
AllNamespaces: allNamespaces,
NodeSelector: featureFlags.NodeSelector(),
}

expected, err := resources.MakeReceiveAdapter(&adapterArgs)
Expand Down Expand Up @@ -357,7 +359,6 @@ func (r *Reconciler) runAccessCheck(ctx context.Context, src *v1.ApiServerSource

src.Status.MarkNoSufficientPermissions(lastReason, "User %s cannot %s", user, missing)
return fmt.Errorf("insufficient permissions: User %s cannot %s", user, missing)

}

func (r *Reconciler) createCloudEventAttributes(src *v1.ApiServerSource) ([]duckv1.CloudEventAttributes, error) {
Expand Down Expand Up @@ -385,7 +386,6 @@ func (r *Reconciler) createOIDCRole(ctx context.Context, source *v1.ApiServerSou
roleName := resources.GetOIDCTokenRoleName(source.Name)

expected, err := resources.MakeOIDCRole(source)

if err != nil {
return fmt.Errorf("Cannot create OIDC role for ApiServerSource %s/%s: %w", source.GetName(), source.GetNamespace(), err)
}
Expand Down Expand Up @@ -417,7 +417,6 @@ func (r *Reconciler) createOIDCRole(ctx context.Context, source *v1.ApiServerSou
}

return nil

}

// createOIDCRoleBinding: this function will call resources package to get the rolebinding object
Expand Down
45 changes: 24 additions & 21 deletions pkg/reconciler/apiserversource/resources/receive_adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ type ReceiveAdapterArgs struct {
Configs reconcilersource.ConfigAccessor
Namespaces []string
AllNamespaces bool
NodeSelector map[string]string
}

// MakeReceiveAdapter generates (but does not insert into K8s) the Receive Adapter Deployment for
Expand Down Expand Up @@ -82,6 +83,7 @@ func MakeReceiveAdapter(args *ReceiveAdapterArgs) (*appsv1.Deployment, error) {
Labels: args.Labels,
},
Spec: corev1.PodSpec{
NodeSelector: args.NodeSelector,
ServiceAccountName: args.Source.Spec.ServiceAccountName,
EnableServiceLinks: ptr.Bool(false),
Containers: []corev1.Container{
Expand Down Expand Up @@ -149,29 +151,30 @@ func makeEnv(args *ReceiveAdapterArgs) ([]corev1.EnvVar, error) {
config = string(b)
}

envs := []corev1.EnvVar{{
Name: adapter.EnvConfigSink,
Value: args.SinkURI,
}, {
Name: "K_SOURCE_CONFIG",
Value: config,
}, {
Name: "SYSTEM_NAMESPACE",
Value: system.Namespace(),
}, {
Name: adapter.EnvConfigNamespace,
ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{
FieldPath: "metadata.namespace",
envs := []corev1.EnvVar{
{
Name: adapter.EnvConfigSink,
Value: args.SinkURI,
}, {
Name: "K_SOURCE_CONFIG",
Value: config,
}, {
Name: "SYSTEM_NAMESPACE",
Value: system.Namespace(),
}, {
Name: adapter.EnvConfigNamespace,
ValueFrom: &corev1.EnvVarSource{
FieldRef: &corev1.ObjectFieldSelector{
FieldPath: "metadata.namespace",
},
},
}, {
Name: adapter.EnvConfigName,
Value: args.Source.Name,
}, {
Name: "METRICS_DOMAIN",
Value: "knative.dev/eventing",
},
}, {
Name: adapter.EnvConfigName,
Value: args.Source.Name,
}, {
Name: "METRICS_DOMAIN",
Value: "knative.dev/eventing",
},
}

if args.CACerts != nil {
Expand Down
Loading