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

added include flags to include security context #1954

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

added include flags to include security context #1954

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
930caf4
added include flags to include security context
EraKin575 Jun 21, 2024
4f43783
added include flags to include security context
EraKin575 Jun 22, 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
44 changes: 34 additions & 10 deletions pkg/kn/commands/service/export.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const (
// NewServiceExportCommand returns a new command for exporting a service.
func NewServiceExportCommand(p *commands.KnParams) *cobra.Command {

// For machine readable output
// For machine-readable output
machineReadablePrintFlags := genericclioptions.NewPrintFlags("")

command := &cobra.Command{
Expand Down Expand Up @@ -127,40 +127,59 @@ func NewServiceExportCommand(p *commands.KnParams) *cobra.Command {
}
flags := command.Flags()
commands.AddNamespaceFlags(flags, false)
flags.StringArray("include", nil, "Include certain info")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer to keep the --with-* format of option flags. In this case --with-securit-context or a short form--with-sc.

flags.Bool("with-revisions", false, "Export all routed revisions (Beta)")
flags.String("mode", "", "Format for exporting all routed revisions. One of replay|export (Beta)")
flags.StringArray("include", nil, "Include certain info")
machineReadablePrintFlags.AddFlags(command)
return command
}
func isSecurityContextIncluded(cmd *cobra.Command) (bool, error) {
includes, err := cmd.Flags().GetStringArray("include")
if err != nil {
return false, err
}
for _, include := range includes {
if include == "securityContext" {
return true, nil
}
}
return false, nil
}

func exportService(cmd *cobra.Command, service *servingv1.Service, client clientservingv1.KnServingClient, printer printers.ResourcePrinter) error {
withRevisions, err := cmd.Flags().GetBool("with-revisions")
if err != nil {
return err
}

withSecurityContext, err := isSecurityContextIncluded(cmd)
if err != nil {
return err
}

mode, err := cmd.Flags().GetString("mode")
if err != nil {
return err
}

if mode == ModeReplay {
svcList, err := exportServiceListForReplay(cmd.Context(), service.DeepCopy(), client, withRevisions)
svcList, err := exportServiceListForReplay(cmd.Context(), service.DeepCopy(), client, withRevisions, withSecurityContext)
if err != nil {
return err
}
return printer.PrintObj(svcList, cmd.OutOrStdout())
}
// default is export mode
knExport, err := exportForKNImport(cmd.Context(), service.DeepCopy(), client, withRevisions)
knExport, err := exportForKNImport(cmd.Context(), service.DeepCopy(), client, withRevisions, withSecurityContext)
if err != nil {
return err
}
//print kn export
return printer.PrintObj(knExport, cmd.OutOrStdout())
}

func exportLatestService(latestSvc *servingv1.Service, withRoutes bool) *servingv1.Service {
func exportLatestService(latestSvc *servingv1.Service, withRoutes bool, withSecurityContext bool) *servingv1.Service {
exportedSvc := servingv1.Service{
ObjectMeta: metav1.ObjectMeta{
Name: latestSvc.ObjectMeta.Name,
Expand All @@ -178,6 +197,12 @@ func exportLatestService(latestSvc *servingv1.Service, withRoutes bool) *serving
if withRoutes {
exportedSvc.Spec.RouteSpec = latestSvc.Spec.RouteSpec
}
if withSecurityContext {
exportedSvc.Spec.Template.Spec.SecurityContext = nil
for i := range exportedSvc.Spec.Template.Spec.Containers {
exportedSvc.Spec.Template.Spec.Containers[i].SecurityContext = nil
}
}

stripIgnoredAnnotationsFromService(&exportedSvc)
stripIgnoredLabelsFromService(&exportedSvc)
Expand Down Expand Up @@ -225,9 +250,9 @@ func constructServiceFromRevision(latestSvc *servingv1.Service, revision *servin
return exportedSvc
}

func exportServiceListForReplay(ctx context.Context, latestSvc *servingv1.Service, client clientservingv1.KnServingClient, withRevisions bool) (runtime.Object, error) {
func exportServiceListForReplay(ctx context.Context, latestSvc *servingv1.Service, client clientservingv1.KnServingClient, withRevisions bool, withSecurityContext bool) (runtime.Object, error) {
if !withRevisions {
return exportLatestService(latestSvc, false), nil
return exportLatestService(latestSvc, false, withSecurityContext), nil
}
var exportedSvcItems []servingv1.Service

Expand All @@ -244,8 +269,7 @@ func exportServiceListForReplay(ctx context.Context, latestSvc *servingv1.Servic
}

//add latest service, add traffic if more than one revision exist
exportedSvcItems = append(exportedSvcItems, *(exportLatestService(latestSvc, len(revisionList.Items) > 1)))

exportedSvcItems = append(exportedSvcItems, *(exportLatestService(latestSvc, len(revisionList.Items) > 1, withSecurityContext)))
typeMeta := metav1.TypeMeta{
APIVersion: "v1",
Kind: "List",
Expand All @@ -258,7 +282,7 @@ func exportServiceListForReplay(ctx context.Context, latestSvc *servingv1.Servic
return exportedSvcList, nil
}

func exportForKNImport(ctx context.Context, latestSvc *servingv1.Service, client clientservingv1.KnServingClient, withRevisions bool) (*clientv1alpha1.Export, error) {
func exportForKNImport(ctx context.Context, latestSvc *servingv1.Service, client clientservingv1.KnServingClient, withRevisions bool, withSecurityContext bool) (*clientv1alpha1.Export, error) {
var exportedRevItems []servingv1.Revision
revisionHistoryCount := 0
if withRevisions {
Expand All @@ -283,7 +307,7 @@ func exportForKNImport(ctx context.Context, latestSvc *servingv1.Service, client
knExport := &clientv1alpha1.Export{
TypeMeta: typeMeta,
Spec: clientv1alpha1.ExportSpec{
Service: *(exportLatestService(latestSvc, revisionHistoryCount > 1)),
Service: *(exportLatestService(latestSvc, revisionHistoryCount > 1, withSecurityContext)),
Revisions: exportedRevItems,
},
}
Expand Down