diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 03beab016a..c074ed120f 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -17,6 +17,10 @@ |=== | | Description | PR +| 🎁 +| Adding --tls option to domain create command +| https://github.com/knative/client/pull/1419[#1419] + | 🎁 | Add an `client.knative.dev/updateTimestamp` annotation to trigger a new revision when required | https://github.com/knative/client/pull/1364[#1364] diff --git a/pkg/kn/commands/domain/create.go b/pkg/kn/commands/domain/create.go index d240847e7d..ff6b5562b0 100644 --- a/pkg/kn/commands/domain/create.go +++ b/pkg/kn/commands/domain/create.go @@ -20,6 +20,7 @@ import ( "github.com/spf13/cobra" + "k8s.io/apimachinery/pkg/util/validation" knerrors "knative.dev/client/pkg/errors" "knative.dev/client/pkg/kn/commands" clientv1alpha1 "knative.dev/client/pkg/serving/v1alpha1" @@ -53,9 +54,14 @@ func NewDomainMappingCreateCommand(p *commands.KnParams) *cobra.Command { return err } + errs := validation.IsDNS1123Subdomain(refFlags.tls) + if refFlags.tls != "" && len(errs) != 0 { + return fmt.Errorf("invalid secret name %q: %s", refFlags.tls, errs[0]) + } builder := clientv1alpha1.NewDomainMappingBuilder(name). Namespace(namespace). - Reference(*reference) + Reference(*reference). + TLS(refFlags.tls) client, err := p.NewServingV1alpha1Client(namespace) if err != nil { diff --git a/pkg/kn/commands/domain/create_test.go b/pkg/kn/commands/domain/create_test.go index 95e13dc010..6283ac5af8 100644 --- a/pkg/kn/commands/domain/create_test.go +++ b/pkg/kn/commands/domain/create_test.go @@ -29,13 +29,21 @@ func TestDomainMappingCreate(t *testing.T) { dynamicClient := dynamicfake.CreateFakeKnDynamicClient(client.Namespace(), createService("foo")) servingRecorder := client.Recorder() - servingRecorder.CreateDomainMapping(createDomainMapping("foo.bar", createServiceRef("foo", "default")), nil) + servingRecorder.CreateDomainMapping(createDomainMapping("foo.bar", createServiceRef("foo", "default"), ""), nil) out, err := executeDomainCommand(client, dynamicClient, "create", "foo.bar", "--ref", "foo") assert.NilError(t, err, "Domain mapping should be created") assert.Assert(t, util.ContainsAll(out, "Domain", "mapping", "foo.bar", "created", "namespace", "default")) servingRecorder.Validate() + + servingRecorder.CreateDomainMapping(createDomainMapping("foo.bar", createServiceRef("foo", "default"), "my-tls-secret"), nil) + + out, err = executeDomainCommand(client, dynamicClient, "create", "foo.bar", "--ref", "foo", "--tls", "my-tls-secret") + assert.NilError(t, err, "Domain mapping should be created") + assert.Assert(t, util.ContainsAll(out, "Domain", "mapping", "foo.bar", "created", "namespace", "default")) + + servingRecorder.Validate() } func TestDomainMappingCreateWithError(t *testing.T) { client := v1alpha1.NewMockKnServiceClient(t) @@ -56,5 +64,9 @@ func TestDomainMappingCreateWithError(t *testing.T) { assert.ErrorContains(t, err, "not found") assert.Assert(t, util.ContainsAll(err.Error(), "services", "\"bar\"", "not", "found")) + _, err = executeDomainCommand(client, dynamicClient, "create", "foo.bar", "--ref", "foo", "--tls", "my-TLS-secret") + assert.ErrorContains(t, err, "invalid") + assert.Assert(t, util.ContainsAll(err.Error(), "invalid", "name", "RFC 1123 subdomain")) + servingRecorder.Validate() } diff --git a/pkg/kn/commands/domain/describe_test.go b/pkg/kn/commands/domain/describe_test.go index 6bce321aa9..00015efa70 100644 --- a/pkg/kn/commands/domain/describe_test.go +++ b/pkg/kn/commands/domain/describe_test.go @@ -95,7 +95,7 @@ func TestDomainMappingDescribeYAML(t *testing.T) { } func getDomainMapping() *servingv1alpha1.DomainMapping { - dm := createDomainMapping("foo.bar", createServiceRef("foo", "default")) + dm := createDomainMapping("foo.bar", createServiceRef("foo", "default"), "") dm.TypeMeta = v1.TypeMeta{ Kind: "DomainMapping", APIVersion: "serving.knative.dev/v1alpha1", diff --git a/pkg/kn/commands/domain/domain.go b/pkg/kn/commands/domain/domain.go index da8aba7d82..8a0f2f0b5d 100644 --- a/pkg/kn/commands/domain/domain.go +++ b/pkg/kn/commands/domain/domain.go @@ -44,6 +44,7 @@ func NewDomainCommand(p *commands.KnParams) *cobra.Command { type RefFlags struct { reference string + tls string } var refMappings = map[string]schema.GroupVersionResource{ @@ -60,6 +61,7 @@ var refMappings = map[string]schema.GroupVersionResource{ } func (f *RefFlags) Add(cmd *cobra.Command) { + cmd.Flags().StringVar(&f.tls, "tls", "", "TLS secret name.") cmd.Flags().StringVar(&f.reference, "ref", "", "") cmd.Flag("ref").Usage = "Addressable target reference for Domain Mapping. " + "You can specify a Knative service, a Knative route. " + diff --git a/pkg/kn/commands/domain/domain_test.go b/pkg/kn/commands/domain/domain_test.go index a72f844e1a..5b0feaa241 100644 --- a/pkg/kn/commands/domain/domain_test.go +++ b/pkg/kn/commands/domain/domain_test.go @@ -130,7 +130,7 @@ func TestResolve(t *testing.T) { } dynamicClient := dynamicfake.CreateFakeKnDynamicClient("default", myksvc, mykroute, myksvcInOther, mykrouteInOther) for _, c := range cases { - i := &RefFlags{c.ref} + i := &RefFlags{reference: c.ref} result, err := i.Resolve(context.Background(), dynamicClient, "default") if c.destination != nil { assert.DeepEqual(t, result, c.destination) @@ -178,8 +178,8 @@ func createService(name string) *servingv1.Service { } } -func createDomainMapping(name string, ref duckv1.KReference) *servingv1alpha1.DomainMapping { - return clientservingv1alpha1.NewDomainMappingBuilder(name).Namespace("default").Reference(ref).Build() +func createDomainMapping(name string, ref duckv1.KReference, tls string) *servingv1alpha1.DomainMapping { + return clientservingv1alpha1.NewDomainMappingBuilder(name).Namespace("default").Reference(ref).TLS(tls).Build() } func createServiceRef(service, namespace string) duckv1.KReference { diff --git a/pkg/kn/commands/domain/list_test.go b/pkg/kn/commands/domain/list_test.go index dbff683409..5f5f6bdd34 100644 --- a/pkg/kn/commands/domain/list_test.go +++ b/pkg/kn/commands/domain/list_test.go @@ -29,8 +29,8 @@ import ( func TestDomainMappingList(t *testing.T) { client := v1alpha1.NewMockKnServiceClient(t) - dm1 := createDomainMapping("foo1", createServiceRef("foo1", "default")) - dm2 := createDomainMapping("foo2", createServiceRef("foo2", "default")) + dm1 := createDomainMapping("foo1", createServiceRef("foo1", "default"), "") + dm2 := createDomainMapping("foo2", createServiceRef("foo2", "default"), "") servingRecorder := client.Recorder() servingRecorder.ListDomainMappings(&servingv1alpha1.DomainMappingList{Items: []servingv1alpha1.DomainMapping{*dm1, *dm2}}, nil) diff --git a/pkg/kn/commands/domain/update_test.go b/pkg/kn/commands/domain/update_test.go index f54749a3fe..527db13306 100644 --- a/pkg/kn/commands/domain/update_test.go +++ b/pkg/kn/commands/domain/update_test.go @@ -33,8 +33,8 @@ func TestDomainMappingUpdate(t *testing.T) { dynamicClient := dynamicfake.CreateFakeKnDynamicClient(client.Namespace(), createService("foo"), createService("bar")) servingRecorder := client.Recorder() - servingRecorder.GetDomainMapping("foo.bar", createDomainMapping("foo.bar", createServiceRef("foo", "default")), nil) - servingRecorder.UpdateDomainMapping(createDomainMapping("foo.bar", createServiceRef("bar", "default")), nil) + servingRecorder.GetDomainMapping("foo.bar", createDomainMapping("foo.bar", createServiceRef("foo", "default"), ""), nil) + servingRecorder.UpdateDomainMapping(createDomainMapping("foo.bar", createServiceRef("bar", "default"), ""), nil) out, err := executeDomainCommand(client, dynamicClient, "update", "foo.bar", "--ref", "bar") assert.NilError(t, err, "Domain mapping should be updated") @@ -59,7 +59,7 @@ func TestDomainMappingUpdateNotFound(t *testing.T) { func TestDomainMappingUpdateDeletingError(t *testing.T) { client := v1alpha1.NewMockKnServiceClient(t) - deletingDM := createDomainMapping("foo.bar", createServiceRef("foo", "default")) + deletingDM := createDomainMapping("foo.bar", createServiceRef("foo", "default"), "") deletingDM.DeletionTimestamp = &v1.Time{Time: time.Now()} servingRecorder := client.Recorder() diff --git a/pkg/serving/v1alpha1/client.go b/pkg/serving/v1alpha1/client.go index 262e9b056a..f3a07ad72a 100644 --- a/pkg/serving/v1alpha1/client.go +++ b/pkg/serving/v1alpha1/client.go @@ -160,6 +160,15 @@ func (b *DomainMappingBuilder) Reference(reference duckv1.KReference) *DomainMap return b } +// TLS for domainMapping builder +func (b *DomainMappingBuilder) TLS(tls string) *DomainMappingBuilder { + if tls == "" { + return b + } + b.domainMapping.Spec.TLS = &servingv1alpha1.SecretTLS{SecretName: tls} + return b +} + // Build to return an instance of domainMapping object func (b *DomainMappingBuilder) Build() *servingv1alpha1.DomainMapping { return b.domainMapping