diff --git a/cmd/argocd/commands/app.go b/cmd/argocd/commands/app.go index 4a6b0d098029b..e652b143fc80c 100644 --- a/cmd/argocd/commands/app.go +++ b/cmd/argocd/commands/app.go @@ -98,11 +98,11 @@ func NewApplicationCreateCommand(clientOpts *argocdclient.ClientOptions) *cobra. }, } } - if appOpts.destServer != "" || appOpts.destNamespace != "" { - app.Spec.Destination = &argoappv1.ApplicationDestination{ - Server: appOpts.destServer, - Namespace: appOpts.destNamespace, - } + if appOpts.destServer != "" { + app.Spec.Destination.Server = appOpts.destServer + } + if appOpts.destNamespace != "" { + app.Spec.Destination.Namespace = appOpts.destNamespace } setParameterOverrides(&app, appOpts.parameters) conn, appIf := argocdclient.NewClientOrDie(clientOpts).NewApplicationClientOrDie() @@ -200,14 +200,8 @@ func NewApplicationSetCommand(clientOpts *argocdclient.ClientOptions) *cobra.Com case "revision": app.Spec.Source.TargetRevision = appOpts.revision case "dest-server": - if app.Spec.Destination == nil { - app.Spec.Destination = &argoappv1.ApplicationDestination{} - } app.Spec.Destination.Server = appOpts.destServer case "dest-namespace": - if app.Spec.Destination == nil { - app.Spec.Destination = &argoappv1.ApplicationDestination{} - } app.Spec.Destination.Namespace = appOpts.destNamespace } }) diff --git a/controller/controller.go b/controller/controller.go index 28d0872497c55..cad8a9df97e3b 100644 --- a/controller/controller.go +++ b/controller/controller.go @@ -16,7 +16,6 @@ import ( "github.com/argoproj/argo-cd/server/cluster" apireposerver "github.com/argoproj/argo-cd/server/repository" "github.com/argoproj/argo-cd/util" - argoutil "github.com/argoproj/argo-cd/util/argo" "github.com/argoproj/argo-cd/util/kube" log "github.com/sirupsen/logrus" "k8s.io/api/apps/v1" @@ -288,7 +287,7 @@ func (ctrl *ApplicationController) tryRefreshAppStatus(app *appv1.Application) ( targetObjs[i] = &obj } - server, namespace := argoutil.ResolveServerNamespace(app.Spec.Destination, manifestInfo) + server, namespace := app.Spec.Destination.Server, app.Spec.Destination.Namespace comparisonResult, err := ctrl.appComparator.CompareAppState(server, namespace, targetObjs, app) if err != nil { return nil, nil, nil, err diff --git a/pkg/apis/application/v1alpha1/generated.pb.go b/pkg/apis/application/v1alpha1/generated.pb.go index f9298d77f4f91..e749d84b14a74 100644 --- a/pkg/apis/application/v1alpha1/generated.pb.go +++ b/pkg/apis/application/v1alpha1/generated.pb.go @@ -324,16 +324,14 @@ func (m *ApplicationSpec) MarshalTo(dAtA []byte) (int, error) { return 0, err } i += n5 - if m.Destination != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintGenerated(dAtA, i, uint64(m.Destination.Size())) - n6, err := m.Destination.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n6 + dAtA[i] = 0x12 + i++ + i = encodeVarintGenerated(dAtA, i, uint64(m.Destination.Size())) + n6, err := m.Destination.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err } + i += n6 dAtA[i] = 0x1a i++ i = encodeVarintGenerated(dAtA, i, uint64(len(m.SyncPolicy))) @@ -988,10 +986,8 @@ func (m *ApplicationSpec) Size() (n int) { _ = l l = m.Source.Size() n += 1 + l + sovGenerated(uint64(l)) - if m.Destination != nil { - l = m.Destination.Size() - n += 1 + l + sovGenerated(uint64(l)) - } + l = m.Destination.Size() + n += 1 + l + sovGenerated(uint64(l)) l = len(m.SyncPolicy) n += 1 + l + sovGenerated(uint64(l)) return n @@ -1288,7 +1284,7 @@ func (this *ApplicationSpec) String() string { } s := strings.Join([]string{`&ApplicationSpec{`, `Source:` + strings.Replace(strings.Replace(this.Source.String(), "ApplicationSource", "ApplicationSource", 1), `&`, ``, 1) + `,`, - `Destination:` + strings.Replace(fmt.Sprintf("%v", this.Destination), "ApplicationDestination", "ApplicationDestination", 1) + `,`, + `Destination:` + strings.Replace(strings.Replace(this.Destination.String(), "ApplicationDestination", "ApplicationDestination", 1), `&`, ``, 1) + `,`, `SyncPolicy:` + fmt.Sprintf("%v", this.SyncPolicy) + `,`, `}`, }, "") @@ -2119,9 +2115,6 @@ func (m *ApplicationSpec) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Destination == nil { - m.Destination = &ApplicationDestination{} - } if err := m.Destination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -4452,108 +4445,108 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 1640 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xdb, 0x6f, 0x1b, 0x45, - 0x17, 0xcf, 0xfa, 0x96, 0xe4, 0x38, 0xb7, 0xce, 0xa7, 0xf6, 0xf3, 0x97, 0x4a, 0x4e, 0xb4, 0xd5, - 0x07, 0x05, 0xd1, 0x35, 0x0d, 0x77, 0x90, 0x90, 0xba, 0x4e, 0x68, 0x43, 0xd2, 0x36, 0x4c, 0x5c, - 0x90, 0x10, 0x02, 0x36, 0xeb, 0xa9, 0xbd, 0x8d, 0xbd, 0xbb, 0xcc, 0x8c, 0x5d, 0xf9, 0x01, 0xa9, - 0x48, 0x3c, 0x02, 0x2a, 0xe2, 0xbf, 0xe0, 0x05, 0x09, 0xf1, 0xc4, 0x23, 0x12, 0xa2, 0x8f, 0x95, - 0xe0, 0xa1, 0x42, 0x28, 0xa2, 0xe9, 0x4b, 0xff, 0x86, 0x3e, 0xa1, 0x99, 0x9d, 0xdd, 0x1d, 0xdb, - 0x84, 0xa4, 0xb5, 0x5b, 0xf1, 0xe6, 0x3d, 0xe7, 0x37, 0xe7, 0x77, 0xf6, 0xcc, 0xb9, 0xad, 0x61, - 0xbd, 0xe1, 0xf1, 0x66, 0x67, 0xc7, 0x72, 0x83, 0x76, 0xc5, 0xa1, 0x8d, 0x20, 0xa4, 0xc1, 0x35, - 0xf9, 0xe3, 0x8c, 0x5b, 0xaf, 0x84, 0xbb, 0x8d, 0x8a, 0x13, 0x7a, 0xac, 0xe2, 0x84, 0x61, 0xcb, - 0x73, 0x1d, 0xee, 0x05, 0x7e, 0xa5, 0x7b, 0xd6, 0x69, 0x85, 0x4d, 0xe7, 0x6c, 0xa5, 0x41, 0x7c, - 0x42, 0x1d, 0x4e, 0xea, 0x56, 0x48, 0x03, 0x1e, 0xa0, 0xd7, 0x52, 0x53, 0x56, 0x6c, 0x4a, 0xfe, - 0xf8, 0xc8, 0xad, 0x5b, 0xe1, 0x6e, 0xc3, 0x12, 0xa6, 0x2c, 0xcd, 0x94, 0x15, 0x9b, 0x5a, 0x3c, - 0xa3, 0x79, 0xd1, 0x08, 0x1a, 0x41, 0x45, 0x5a, 0xdc, 0xe9, 0x5c, 0x95, 0x4f, 0xf2, 0x41, 0xfe, - 0x8a, 0x98, 0x16, 0x5f, 0xdc, 0x7d, 0x95, 0x59, 0x5e, 0x20, 0x7c, 0x6b, 0x3b, 0x6e, 0xd3, 0xf3, - 0x09, 0xed, 0xa5, 0xce, 0xb6, 0x09, 0x77, 0x2a, 0xdd, 0x21, 0xff, 0x16, 0x2b, 0x07, 0x9d, 0xa2, - 0x1d, 0x9f, 0x7b, 0x6d, 0x32, 0x74, 0xe0, 0xe5, 0xc3, 0x0e, 0x30, 0xb7, 0x49, 0xda, 0xce, 0xd0, - 0xb9, 0x17, 0x0e, 0x3a, 0xd7, 0xe1, 0x5e, 0xab, 0xe2, 0xf9, 0x9c, 0x71, 0x3a, 0x78, 0xc8, 0xfc, - 0x35, 0x03, 0xc5, 0x73, 0x69, 0x6c, 0xd0, 0xc7, 0x30, 0x25, 0x5e, 0xa4, 0xee, 0x70, 0xa7, 0x64, - 0x2c, 0x1b, 0xa7, 0x8b, 0x2b, 0xcf, 0x5b, 0x91, 0x5d, 0x4b, 0xb7, 0x9b, 0x06, 0x56, 0xa0, 0xad, - 0xee, 0x59, 0xeb, 0xf2, 0xce, 0x35, 0xe2, 0xf2, 0x8b, 0x84, 0x3b, 0x36, 0xba, 0xb5, 0xb7, 0x34, - 0xb1, 0xbf, 0xb7, 0x04, 0xa9, 0x0c, 0x27, 0x56, 0x51, 0x0b, 0x72, 0x2c, 0x24, 0x6e, 0x29, 0x23, - 0xad, 0xbf, 0x6d, 0x3d, 0xf2, 0xf5, 0x59, 0x9a, 0xdf, 0xdb, 0x21, 0x71, 0xed, 0x19, 0xc5, 0x9b, - 0x13, 0x4f, 0x58, 0xb2, 0x20, 0x0e, 0x05, 0xc6, 0x1d, 0xde, 0x61, 0xa5, 0xac, 0xe4, 0xdb, 0x1c, - 0x13, 0x9f, 0xb4, 0x69, 0xcf, 0x29, 0xc6, 0x42, 0xf4, 0x8c, 0x15, 0x97, 0xf9, 0x09, 0x9c, 0xd0, - 0xc0, 0xab, 0x84, 0x71, 0xcf, 0x8f, 0xe2, 0xfb, 0x14, 0x14, 0x18, 0xa1, 0x5d, 0x42, 0x65, 0x74, - 0xa7, 0x35, 0x0b, 0x52, 0x8a, 0x95, 0x16, 0x55, 0x60, 0xda, 0x77, 0xda, 0x84, 0x85, 0x8e, 0x4b, - 0x64, 0xa8, 0xa6, 0xed, 0x63, 0x0a, 0x3a, 0x7d, 0x29, 0x56, 0xe0, 0x14, 0x63, 0xfe, 0x61, 0xc0, - 0xbc, 0xc6, 0xb9, 0xe9, 0x31, 0x8e, 0x3e, 0x18, 0xba, 0x4c, 0xeb, 0x68, 0x97, 0x29, 0x4e, 0xcb, - 0xab, 0x5c, 0x50, 0x9c, 0x53, 0xb1, 0x44, 0xbb, 0xc8, 0x5d, 0xc8, 0x7b, 0x9c, 0xb4, 0x59, 0x29, - 0xb3, 0x9c, 0x3d, 0x5d, 0x5c, 0x79, 0x6b, 0x3c, 0x91, 0xb5, 0x67, 0x15, 0x65, 0x7e, 0x5d, 0x18, - 0xc7, 0x11, 0x87, 0xf9, 0x55, 0x16, 0x8e, 0xe9, 0xf1, 0x0f, 0x3a, 0xd4, 0x25, 0xe8, 0x19, 0x98, - 0xa4, 0x24, 0x0c, 0xae, 0xe0, 0x4d, 0x15, 0xce, 0x79, 0x75, 0x78, 0x12, 0x47, 0x62, 0x1c, 0xeb, - 0xd1, 0x32, 0xe4, 0x42, 0x87, 0x37, 0x55, 0x2c, 0x93, 0x54, 0xd9, 0x72, 0x78, 0x13, 0x4b, 0x0d, - 0x7a, 0x09, 0x8a, 0xc4, 0xef, 0x7a, 0x34, 0xf0, 0xdb, 0xc4, 0xe7, 0x32, 0x5f, 0xa6, 0xed, 0xff, - 0x28, 0x60, 0x71, 0x2d, 0x55, 0x61, 0x1d, 0x87, 0xde, 0x84, 0x39, 0xee, 0xd0, 0x06, 0xe1, 0x98, - 0x74, 0x3d, 0xe6, 0x05, 0x7e, 0x29, 0x27, 0x4f, 0x9e, 0x50, 0x27, 0xe7, 0x6a, 0x7d, 0x5a, 0x3c, - 0x80, 0x46, 0x3f, 0x18, 0x70, 0xd2, 0x0d, 0xda, 0x61, 0xe0, 0x13, 0x9f, 0x6f, 0x39, 0xd4, 0x69, - 0x13, 0x4e, 0xe8, 0xe5, 0x2e, 0xa1, 0xd4, 0xab, 0x13, 0x56, 0xca, 0xcb, 0xe8, 0x5e, 0x1c, 0x21, - 0xba, 0xd5, 0x21, 0xeb, 0xf6, 0x29, 0xe5, 0xdc, 0xc9, 0xea, 0xc1, 0xcc, 0xf8, 0x9f, 0xdc, 0x32, - 0x7f, 0xca, 0xf4, 0xe5, 0xdb, 0x76, 0x5c, 0x6c, 0xf2, 0x62, 0x54, 0xb6, 0x8d, 0xab, 0xd8, 0xa4, - 0x4d, 0xad, 0x54, 0xe4, 0x33, 0x56, 0x5c, 0xe8, 0x73, 0x03, 0x8a, 0xf5, 0xb4, 0xc4, 0x54, 0x63, - 0x79, 0x67, 0x3c, 0xdc, 0x5a, 0xed, 0xda, 0xf3, 0x22, 0x0f, 0x34, 0x01, 0xd6, 0x69, 0xd1, 0x0a, - 0x00, 0xeb, 0xf9, 0xee, 0x56, 0xd0, 0xf2, 0xdc, 0x9e, 0xca, 0x9e, 0xa4, 0x13, 0x6e, 0x27, 0x1a, - 0xac, 0xa1, 0xcc, 0xef, 0x72, 0xfd, 0x59, 0x2d, 0xbb, 0x07, 0xfa, 0xda, 0x80, 0x05, 0x11, 0x7a, - 0x87, 0x7a, 0x2c, 0xf0, 0x31, 0x61, 0x9d, 0x16, 0x57, 0x11, 0xdd, 0x18, 0x31, 0x0d, 0x74, 0x93, - 0x76, 0x49, 0x79, 0xb7, 0x30, 0xa8, 0xc1, 0x43, 0xf4, 0xe8, 0xa6, 0x01, 0x0b, 0x94, 0xb8, 0xc4, - 0xe7, 0xab, 0x24, 0x6c, 0x05, 0x3d, 0x59, 0x22, 0x51, 0xe1, 0xaf, 0x8f, 0xe0, 0x53, 0x6a, 0x6c, - 0xdd, 0xbf, 0x1a, 0xd8, 0xff, 0x53, 0x1e, 0x1d, 0xc3, 0x03, 0x54, 0x0c, 0x0f, 0xb1, 0xa3, 0xcf, - 0x0c, 0x80, 0x30, 0x4e, 0x4c, 0xd1, 0xdf, 0x1f, 0x43, 0x9d, 0x24, 0x17, 0x98, 0x88, 0x18, 0xd6, - 0x48, 0x51, 0x00, 0x85, 0x26, 0x71, 0x5a, 0xbc, 0x29, 0x8b, 0xbe, 0xb8, 0x72, 0x7e, 0x04, 0xfa, - 0x0b, 0xd2, 0xd0, 0xe0, 0x64, 0x89, 0xa4, 0x58, 0xd1, 0x98, 0xf7, 0x0c, 0x38, 0xae, 0x65, 0xcc, - 0x7b, 0x0e, 0x77, 0x9b, 0x6b, 0x5d, 0x11, 0x8e, 0x0d, 0xc8, 0xf1, 0x5e, 0x48, 0x54, 0x23, 0x7c, - 0x25, 0x6e, 0x70, 0xb5, 0x5e, 0x48, 0x1e, 0xec, 0x2d, 0x3d, 0x7d, 0xd0, 0x72, 0x70, 0x5d, 0x58, - 0xb0, 0xa4, 0x09, 0x01, 0xc5, 0xd2, 0x08, 0xfa, 0x14, 0x8a, 0x9a, 0x8f, 0xaa, 0xa4, 0xc6, 0xd5, - 0xe1, 0x93, 0x9e, 0xaa, 0x09, 0xb1, 0xce, 0x67, 0xfe, 0x6c, 0xc0, 0x64, 0xb5, 0xd5, 0x61, 0x9c, - 0xd0, 0x23, 0x4f, 0xcc, 0x65, 0xc8, 0x89, 0x69, 0x38, 0xd8, 0xe0, 0xc5, 0xb0, 0xc4, 0x52, 0x83, - 0x42, 0x28, 0xb8, 0x81, 0x7f, 0xd5, 0x6b, 0xa8, 0x5d, 0xe0, 0xc2, 0x28, 0xb9, 0x12, 0x79, 0x57, - 0x95, 0xf6, 0x52, 0x9f, 0xa2, 0x67, 0xac, 0x78, 0xcc, 0xef, 0x33, 0x30, 0xdb, 0x87, 0x44, 0xcf, - 0xc1, 0x54, 0x87, 0x11, 0x2a, 0x3d, 0x8d, 0xde, 0x27, 0x19, 0xb1, 0x57, 0x94, 0x1c, 0x27, 0x08, - 0x81, 0x0e, 0x1d, 0xc6, 0xae, 0x07, 0xb4, 0xae, 0xde, 0x2b, 0x41, 0x6f, 0x29, 0x39, 0x4e, 0x10, - 0x62, 0x80, 0xed, 0x10, 0x87, 0x12, 0x5a, 0x0b, 0x76, 0x89, 0x3f, 0x38, 0xc0, 0xec, 0x54, 0x85, - 0x75, 0x1c, 0xfa, 0xd2, 0x80, 0x79, 0xde, 0x62, 0xd5, 0x96, 0x47, 0x7c, 0x1e, 0xb9, 0xa9, 0xb2, - 0x79, 0x94, 0xe5, 0xac, 0xb6, 0xb9, 0xad, 0x5b, 0xb4, 0xff, 0xab, 0xfc, 0x98, 0x1f, 0x50, 0xe0, - 0x41, 0x6e, 0xf3, 0x37, 0x03, 0x8a, 0x2a, 0x68, 0x4f, 0x60, 0x8b, 0x69, 0xf4, 0x6f, 0x31, 0xf6, - 0xe8, 0x39, 0x71, 0xc0, 0x06, 0xf3, 0x6d, 0x0e, 0x86, 0x1a, 0x2d, 0xfa, 0x10, 0x20, 0x6a, 0xb5, - 0xa4, 0x7e, 0x2e, 0xee, 0xf1, 0xcf, 0x1e, 0xed, 0xed, 0x6a, 0x5e, 0x9b, 0xa4, 0xfd, 0xa9, 0x9a, - 0x58, 0xc1, 0x9a, 0x45, 0x74, 0xc3, 0x48, 0x09, 0x6a, 0x81, 0xaa, 0xe3, 0xf1, 0x8e, 0xe5, 0x21, - 0x17, 0x6a, 0x01, 0xd6, 0x38, 0xb5, 0xfa, 0xcd, 0x1e, 0x7d, 0xe3, 0xcd, 0x1d, 0xbe, 0xf1, 0xa2, - 0xd7, 0x93, 0xd5, 0x3e, 0x2f, 0xd1, 0x66, 0xff, 0x32, 0xfe, 0xa0, 0x6f, 0xb0, 0xf5, 0x2f, 0xe8, - 0xa8, 0x07, 0xd3, 0x94, 0x44, 0xfb, 0x03, 0x2b, 0x15, 0xe4, 0xcd, 0x8f, 0xd2, 0x0d, 0xb0, 0xb2, - 0x25, 0x58, 0x48, 0xea, 0x76, 0x2c, 0x66, 0x38, 0x65, 0x43, 0xa7, 0x20, 0x4f, 0x28, 0x0d, 0x68, - 0x69, 0x52, 0x7a, 0x9d, 0x24, 0xcb, 0x9a, 0x10, 0xe2, 0x48, 0x67, 0x7e, 0x61, 0x00, 0x1a, 0x1e, - 0x47, 0x22, 0x46, 0xc9, 0x4e, 0xa6, 0xda, 0x47, 0x42, 0x96, 0xc0, 0x71, 0x8a, 0x39, 0x42, 0x53, - 0x3c, 0x05, 0xf9, 0xae, 0xd3, 0xea, 0x10, 0x75, 0x3b, 0x89, 0x3b, 0xef, 0x0a, 0x21, 0x8e, 0x74, - 0xe6, 0xfd, 0x2c, 0xcc, 0xf5, 0x8f, 0x6a, 0xd4, 0x81, 0x82, 0x9c, 0x83, 0xac, 0x64, 0x3c, 0x8e, - 0xc1, 0x9b, 0x64, 0x89, 0x14, 0x31, 0xac, 0xc8, 0x44, 0x47, 0xa4, 0xf1, 0x9e, 0x3d, 0xd0, 0x11, - 0x93, 0x0d, 0x3b, 0x41, 0x1c, 0xba, 0x5b, 0x67, 0xff, 0x95, 0xbb, 0xb5, 0xe8, 0x0a, 0x75, 0x19, - 0x6d, 0xd9, 0x15, 0x72, 0x8f, 0xde, 0x15, 0x56, 0x13, 0x2b, 0x58, 0xb3, 0x88, 0x16, 0x21, 0xe3, - 0xd5, 0x65, 0xd5, 0x64, 0x6d, 0x50, 0xd8, 0xcc, 0xfa, 0x2a, 0xce, 0x78, 0x75, 0x93, 0xc1, 0x8c, - 0xbe, 0x88, 0xc8, 0xf2, 0x8d, 0xaa, 0x6c, 0x70, 0xfc, 0xf6, 0x57, 0xd4, 0x1b, 0x30, 0x1b, 0xfd, - 0x5a, 0x25, 0xdc, 0xf1, 0x5a, 0x4c, 0xdd, 0xce, 0x71, 0x05, 0x9f, 0xdd, 0xd6, 0x95, 0xb8, 0x1f, - 0x6b, 0xfe, 0x62, 0x00, 0x88, 0x2f, 0x36, 0xe6, 0xf1, 0x80, 0xf6, 0x44, 0xd6, 0x8a, 0xcf, 0x36, - 0xc5, 0x98, 0x64, 0xad, 0x40, 0x60, 0xa9, 0xe9, 0x1b, 0xa3, 0x99, 0x87, 0x1a, 0xa3, 0xd9, 0x43, - 0xc7, 0xa8, 0x78, 0x13, 0xd6, 0xdc, 0xa2, 0x5e, 0xd7, 0xe1, 0x64, 0x83, 0xf4, 0x54, 0x33, 0x4a, - 0xdf, 0x64, 0xfb, 0x42, 0xaa, 0xc4, 0xfd, 0x58, 0xf3, 0x77, 0x03, 0xe6, 0xd2, 0x37, 0x79, 0x02, - 0xf3, 0xeb, 0x5a, 0xff, 0xfc, 0x5a, 0x1b, 0xa9, 0x8b, 0xc5, 0x7e, 0x1f, 0x34, 0xc2, 0x0c, 0x98, - 0x89, 0x7b, 0xda, 0xa5, 0xa0, 0x2e, 0x9b, 0x87, 0xb8, 0xc8, 0x78, 0x95, 0x49, 0x4e, 0xc9, 0x3e, - 0x88, 0x23, 0x1d, 0xea, 0xc0, 0x94, 0xdb, 0xf4, 0x5a, 0x75, 0x4a, 0x7c, 0xe5, 0xe4, 0xf9, 0x31, - 0xb4, 0x5a, 0xc1, 0x9f, 0x06, 0xa6, 0xaa, 0x08, 0x70, 0x42, 0x65, 0xfe, 0x98, 0x85, 0xd9, 0xbe, - 0xbe, 0x2c, 0xf6, 0xa3, 0xe8, 0xdb, 0x7b, 0x5b, 0xf3, 0x39, 0xd9, 0x8f, 0x6a, 0xa9, 0x0a, 0xeb, - 0x38, 0xd1, 0x74, 0x5b, 0x5e, 0x37, 0xb2, 0x31, 0xf8, 0x57, 0xcc, 0x66, 0xac, 0xc0, 0x29, 0x46, - 0x1b, 0x4c, 0xd9, 0x87, 0x1e, 0x4c, 0xdf, 0x18, 0x80, 0xe4, 0x2b, 0x08, 0xcb, 0xc9, 0xfc, 0x28, - 0xe5, 0xc6, 0x1b, 0xb7, 0x45, 0xe5, 0x11, 0xaa, 0x0e, 0x51, 0xe1, 0xbf, 0xa1, 0xd7, 0x3e, 0x73, - 0xf2, 0x4f, 0xe6, 0x33, 0xe7, 0xbe, 0x01, 0x83, 0x8b, 0xa2, 0xa8, 0x62, 0xcf, 0x67, 0xc4, 0xed, - 0xd0, 0xe8, 0xee, 0xa6, 0xd2, 0xeb, 0x5f, 0x57, 0x72, 0x9c, 0x20, 0xe4, 0xe7, 0xb8, 0x5c, 0x2c, - 0x2e, 0xa5, 0x3d, 0x22, 0xfd, 0x1c, 0x4f, 0x34, 0x58, 0x43, 0xa1, 0xd3, 0x30, 0xe5, 0x12, 0xca, - 0x57, 0x45, 0xa5, 0x8a, 0xab, 0x9b, 0xb1, 0x67, 0x64, 0x72, 0x29, 0x19, 0x4e, 0xb4, 0xe8, 0xff, - 0x30, 0xb9, 0x4b, 0x7a, 0x12, 0x98, 0x93, 0xc0, 0xe2, 0xfe, 0xde, 0xd2, 0xe4, 0x46, 0x24, 0xc2, - 0xb1, 0x0e, 0x99, 0x50, 0x70, 0x1d, 0x89, 0xca, 0x4b, 0x14, 0xc8, 0x6f, 0x84, 0x73, 0x12, 0xa4, - 0x34, 0xb6, 0x75, 0xeb, 0x6e, 0x79, 0xe2, 0xf6, 0xdd, 0xf2, 0xc4, 0x9d, 0xbb, 0xe5, 0x89, 0x1b, - 0xfb, 0x65, 0xe3, 0xd6, 0x7e, 0xd9, 0xb8, 0xbd, 0x5f, 0x36, 0xee, 0xec, 0x97, 0x8d, 0x3f, 0xf7, - 0xcb, 0xc6, 0xcd, 0x7b, 0xe5, 0x89, 0xf7, 0xa7, 0xe2, 0xf8, 0xfd, 0x15, 0x00, 0x00, 0xff, 0xff, - 0x1c, 0x79, 0x05, 0x37, 0x3b, 0x17, 0x00, 0x00, + // 1638 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcd, 0x6f, 0x1b, 0x45, + 0x1b, 0xcf, 0xfa, 0x2b, 0xc9, 0xe3, 0x7c, 0x75, 0x5e, 0xb5, 0xaf, 0xdf, 0x54, 0x72, 0xa2, 0xad, + 0x5e, 0x28, 0x88, 0xae, 0x69, 0xf8, 0x06, 0x09, 0xa9, 0x76, 0x42, 0x1b, 0x92, 0xb6, 0x61, 0xe2, + 0x82, 0x84, 0x10, 0xb0, 0x59, 0x4f, 0xed, 0x6d, 0xec, 0xdd, 0x65, 0x66, 0xec, 0xca, 0x07, 0xa4, + 0x72, 0xe3, 0x00, 0xa8, 0x88, 0xff, 0x82, 0x0b, 0x12, 0xe2, 0xc4, 0x1d, 0xe8, 0xb1, 0x12, 0x1c, + 0x2a, 0x84, 0x22, 0x9a, 0x5e, 0xfa, 0x37, 0xf4, 0x84, 0x66, 0x76, 0x76, 0x77, 0xd6, 0x26, 0x24, + 0xad, 0xdd, 0x8a, 0x9b, 0xf7, 0x79, 0x7e, 0xf3, 0xfc, 0x9e, 0x7d, 0xe6, 0xf9, 0x5a, 0xc3, 0x7a, + 0xd3, 0xe5, 0xad, 0xee, 0x8e, 0xe5, 0xf8, 0x9d, 0x8a, 0x4d, 0x9b, 0x7e, 0x40, 0xfd, 0x6b, 0xf2, + 0xc7, 0x19, 0xa7, 0x51, 0x09, 0x76, 0x9b, 0x15, 0x3b, 0x70, 0x59, 0xc5, 0x0e, 0x82, 0xb6, 0xeb, + 0xd8, 0xdc, 0xf5, 0xbd, 0x4a, 0xef, 0xac, 0xdd, 0x0e, 0x5a, 0xf6, 0xd9, 0x4a, 0x93, 0x78, 0x84, + 0xda, 0x9c, 0x34, 0xac, 0x80, 0xfa, 0xdc, 0x47, 0xaf, 0x25, 0xa6, 0xac, 0xc8, 0x94, 0xfc, 0xf1, + 0x91, 0xd3, 0xb0, 0x82, 0xdd, 0xa6, 0x25, 0x4c, 0x59, 0x9a, 0x29, 0x2b, 0x32, 0xb5, 0x78, 0x46, + 0xf3, 0xa2, 0xe9, 0x37, 0xfd, 0x8a, 0xb4, 0xb8, 0xd3, 0xbd, 0x2a, 0x9f, 0xe4, 0x83, 0xfc, 0x15, + 0x32, 0x2d, 0xbe, 0xb8, 0xfb, 0x2a, 0xb3, 0x5c, 0x5f, 0xf8, 0xd6, 0xb1, 0x9d, 0x96, 0xeb, 0x11, + 0xda, 0x4f, 0x9c, 0xed, 0x10, 0x6e, 0x57, 0x7a, 0x43, 0xfe, 0x2d, 0x56, 0x0e, 0x3a, 0x45, 0xbb, + 0x1e, 0x77, 0x3b, 0x64, 0xe8, 0xc0, 0xcb, 0x87, 0x1d, 0x60, 0x4e, 0x8b, 0x74, 0xec, 0xa1, 0x73, + 0x2f, 0x1c, 0x74, 0xae, 0xcb, 0xdd, 0x76, 0xc5, 0xf5, 0x38, 0xe3, 0x74, 0xf0, 0x90, 0xf9, 0x6b, + 0x06, 0x8a, 0xe7, 0x92, 0xd8, 0xa0, 0x8f, 0x61, 0x4a, 0xbc, 0x48, 0xc3, 0xe6, 0x76, 0xc9, 0x58, + 0x36, 0x4e, 0x17, 0x57, 0x9e, 0xb7, 0x42, 0xbb, 0x96, 0x6e, 0x37, 0x09, 0xac, 0x40, 0x5b, 0xbd, + 0xb3, 0xd6, 0xe5, 0x9d, 0x6b, 0xc4, 0xe1, 0x17, 0x09, 0xb7, 0xab, 0xe8, 0xd6, 0xde, 0xd2, 0xc4, + 0xfe, 0xde, 0x12, 0x24, 0x32, 0x1c, 0x5b, 0x45, 0x6d, 0xc8, 0xb1, 0x80, 0x38, 0xa5, 0x8c, 0xb4, + 0xfe, 0xb6, 0xf5, 0xc8, 0xd7, 0x67, 0x69, 0x7e, 0x6f, 0x07, 0xc4, 0xa9, 0xce, 0x28, 0xde, 0x9c, + 0x78, 0xc2, 0x92, 0x05, 0x71, 0x28, 0x30, 0x6e, 0xf3, 0x2e, 0x2b, 0x65, 0x25, 0xdf, 0xe6, 0x98, + 0xf8, 0xa4, 0xcd, 0xea, 0x9c, 0x62, 0x2c, 0x84, 0xcf, 0x58, 0x71, 0x99, 0x9f, 0xc0, 0x09, 0x0d, + 0xbc, 0x4a, 0x18, 0x77, 0xbd, 0x30, 0xbe, 0x4f, 0x41, 0x81, 0x11, 0xda, 0x23, 0x54, 0x46, 0x77, + 0x5a, 0xb3, 0x20, 0xa5, 0x58, 0x69, 0x51, 0x05, 0xa6, 0x3d, 0xbb, 0x43, 0x58, 0x60, 0x3b, 0x44, + 0x86, 0x6a, 0xba, 0x7a, 0x4c, 0x41, 0xa7, 0x2f, 0x45, 0x0a, 0x9c, 0x60, 0xcc, 0x3f, 0x0c, 0x98, + 0xd7, 0x38, 0x37, 0x5d, 0xc6, 0xd1, 0x07, 0x43, 0x97, 0x69, 0x1d, 0xed, 0x32, 0xc5, 0x69, 0x79, + 0x95, 0x0b, 0x8a, 0x73, 0x2a, 0x92, 0x68, 0x17, 0xb9, 0x0b, 0x79, 0x97, 0x93, 0x0e, 0x2b, 0x65, + 0x96, 0xb3, 0xa7, 0x8b, 0x2b, 0x6f, 0x8d, 0x27, 0xb2, 0xd5, 0x59, 0x45, 0x99, 0x5f, 0x17, 0xc6, + 0x71, 0xc8, 0x61, 0x7e, 0x95, 0x85, 0x63, 0x7a, 0xfc, 0xfd, 0x2e, 0x75, 0x08, 0x7a, 0x06, 0x26, + 0x29, 0x09, 0xfc, 0x2b, 0x78, 0x53, 0x85, 0x73, 0x5e, 0x1d, 0x9e, 0xc4, 0xa1, 0x18, 0x47, 0x7a, + 0xb4, 0x0c, 0xb9, 0xc0, 0xe6, 0x2d, 0x15, 0xcb, 0x38, 0x55, 0xb6, 0x6c, 0xde, 0xc2, 0x52, 0x83, + 0x5e, 0x82, 0x22, 0xf1, 0x7a, 0x2e, 0xf5, 0xbd, 0x0e, 0xf1, 0xb8, 0xcc, 0x97, 0xe9, 0xea, 0x7f, + 0x14, 0xb0, 0xb8, 0x96, 0xa8, 0xb0, 0x8e, 0x43, 0x6f, 0xc2, 0x1c, 0xb7, 0x69, 0x93, 0x70, 0x4c, + 0x7a, 0x2e, 0x73, 0x7d, 0xaf, 0x94, 0x93, 0x27, 0x4f, 0xa8, 0x93, 0x73, 0xf5, 0x94, 0x16, 0x0f, + 0xa0, 0xd1, 0x0f, 0x06, 0x9c, 0x74, 0xfc, 0x4e, 0xe0, 0x7b, 0xc4, 0xe3, 0x5b, 0x36, 0xb5, 0x3b, + 0x84, 0x13, 0x7a, 0xb9, 0x47, 0x28, 0x75, 0x1b, 0x84, 0x95, 0xf2, 0x32, 0xba, 0x17, 0x47, 0x88, + 0x6e, 0x6d, 0xc8, 0x7a, 0xf5, 0x94, 0x72, 0xee, 0x64, 0xed, 0x60, 0x66, 0xfc, 0x4f, 0x6e, 0x99, + 0x3f, 0x67, 0x52, 0xf9, 0xb6, 0x1d, 0x15, 0x9b, 0xbc, 0x18, 0x95, 0x6d, 0xe3, 0x2a, 0x36, 0x69, + 0x53, 0x2b, 0x15, 0xf9, 0x8c, 0x15, 0x17, 0xfa, 0xdc, 0x80, 0x62, 0x23, 0x29, 0x31, 0xd5, 0x58, + 0xde, 0x19, 0x0f, 0xb7, 0x56, 0xbb, 0x49, 0x2e, 0x68, 0x42, 0xac, 0x53, 0xa3, 0x15, 0x00, 0xd6, + 0xf7, 0x9c, 0x2d, 0xbf, 0xed, 0x3a, 0x7d, 0x95, 0x41, 0x71, 0x37, 0xdc, 0x8e, 0x35, 0x58, 0x43, + 0x99, 0xdf, 0xe5, 0xd2, 0x99, 0x2d, 0x3b, 0x08, 0xfa, 0xda, 0x80, 0x05, 0x11, 0x7e, 0x9b, 0xba, + 0xcc, 0xf7, 0x30, 0x61, 0xdd, 0x36, 0x57, 0x51, 0xdd, 0x18, 0x31, 0x15, 0x74, 0x93, 0xd5, 0x92, + 0xf2, 0x6e, 0x61, 0x50, 0x83, 0x87, 0xe8, 0xd1, 0x4d, 0x03, 0x16, 0x28, 0x71, 0x88, 0xc7, 0x57, + 0x49, 0xd0, 0xf6, 0xfb, 0xb2, 0x4c, 0xc2, 0xe2, 0x5f, 0x1f, 0xc1, 0xa7, 0xc4, 0xd8, 0xba, 0x77, + 0xd5, 0xaf, 0xfe, 0x4f, 0x79, 0x74, 0x0c, 0x0f, 0x50, 0x31, 0x3c, 0xc4, 0x8e, 0x3e, 0x33, 0x00, + 0x82, 0x28, 0x39, 0x45, 0x8f, 0x7f, 0x0c, 0xb5, 0x12, 0x5f, 0x60, 0x2c, 0x62, 0x58, 0x23, 0x45, + 0x3e, 0x14, 0x5a, 0xc4, 0x6e, 0xf3, 0x96, 0x2c, 0xfc, 0xe2, 0xca, 0xf9, 0x11, 0xe8, 0x2f, 0x48, + 0x43, 0x83, 0xd3, 0x25, 0x94, 0x62, 0x45, 0x63, 0xde, 0x33, 0xe0, 0xb8, 0x96, 0x31, 0xef, 0xd9, + 0xdc, 0x69, 0xad, 0xf5, 0x44, 0x38, 0x36, 0x20, 0xc7, 0xfb, 0x01, 0x51, 0xcd, 0xf0, 0x95, 0xa8, + 0xc9, 0xd5, 0xfb, 0x01, 0x79, 0xb0, 0xb7, 0xf4, 0xf4, 0x41, 0x0b, 0xc2, 0x75, 0x61, 0xc1, 0x92, + 0x26, 0x04, 0x14, 0x4b, 0x23, 0xe8, 0x53, 0x28, 0x6a, 0x3e, 0xaa, 0xb2, 0x1a, 0x57, 0x97, 0x8f, + 0x6b, 0x49, 0x13, 0x62, 0x9d, 0xcf, 0xfc, 0xc9, 0x80, 0xc9, 0x5a, 0xbb, 0xcb, 0x38, 0xa1, 0x47, + 0x9e, 0x9a, 0xcb, 0x90, 0x13, 0x13, 0x71, 0xb0, 0xc9, 0x8b, 0x81, 0x89, 0xa5, 0x06, 0x05, 0x50, + 0x70, 0x7c, 0xef, 0xaa, 0xdb, 0x54, 0xfb, 0xc0, 0x85, 0x51, 0x72, 0x25, 0xf4, 0xae, 0x26, 0xed, + 0x25, 0x3e, 0x85, 0xcf, 0x58, 0xf1, 0x98, 0xdf, 0x67, 0x60, 0x36, 0x85, 0x44, 0xcf, 0xc1, 0x54, + 0x97, 0x11, 0x2a, 0x3d, 0x0d, 0xdf, 0x27, 0x1e, 0xb3, 0x57, 0x94, 0x1c, 0xc7, 0x08, 0x81, 0x0e, + 0x6c, 0xc6, 0xae, 0xfb, 0xb4, 0xa1, 0xde, 0x2b, 0x46, 0x6f, 0x29, 0x39, 0x8e, 0x11, 0x62, 0x88, + 0xed, 0x10, 0x9b, 0x12, 0x5a, 0xf7, 0x77, 0x89, 0x37, 0x38, 0xc4, 0xaa, 0x89, 0x0a, 0xeb, 0x38, + 0xf4, 0xa5, 0x01, 0xf3, 0xbc, 0xcd, 0x6a, 0x6d, 0x97, 0x78, 0x3c, 0x74, 0x53, 0x65, 0xf3, 0x28, + 0x0b, 0x5a, 0x7d, 0x73, 0x5b, 0xb7, 0x58, 0xfd, 0xaf, 0xf2, 0x63, 0x7e, 0x40, 0x81, 0x07, 0xb9, + 0xcd, 0xdf, 0x0c, 0x28, 0xaa, 0xa0, 0x3d, 0x81, 0x4d, 0xa6, 0x99, 0xde, 0x64, 0xaa, 0xa3, 0xe7, + 0xc4, 0x01, 0x5b, 0xcc, 0xb7, 0x39, 0x18, 0x6a, 0xb4, 0xe8, 0x43, 0x80, 0xb0, 0xd5, 0x92, 0xc6, + 0xb9, 0xa8, 0xc7, 0x3f, 0x7b, 0xb4, 0xb7, 0xab, 0xbb, 0x1d, 0x92, 0xf4, 0xa7, 0x5a, 0x6c, 0x05, + 0x6b, 0x16, 0xd1, 0x0d, 0x23, 0x21, 0xa8, 0xfb, 0xaa, 0x8e, 0xc7, 0x3b, 0x9a, 0x87, 0x5c, 0xa8, + 0xfb, 0x58, 0xe3, 0xd4, 0xea, 0x37, 0x7b, 0xf4, 0xad, 0x37, 0x77, 0xf8, 0xd6, 0x8b, 0x5e, 0x8f, + 0xd7, 0xfb, 0xbc, 0x44, 0x9b, 0xe9, 0x85, 0xfc, 0x41, 0x6a, 0xb0, 0xa5, 0x97, 0x74, 0xd4, 0x87, + 0x69, 0x4a, 0xc2, 0x1d, 0x82, 0x95, 0x0a, 0xf2, 0xe6, 0x47, 0xe9, 0x06, 0x58, 0xd9, 0x12, 0x2c, + 0x24, 0x71, 0x3b, 0x12, 0x33, 0x9c, 0xb0, 0xa1, 0x53, 0x90, 0x27, 0x94, 0xfa, 0xb4, 0x34, 0x29, + 0xbd, 0x8e, 0x93, 0x65, 0x4d, 0x08, 0x71, 0xa8, 0x33, 0xbf, 0x30, 0x00, 0x0d, 0x8f, 0x23, 0x11, + 0xa3, 0x78, 0x2f, 0x53, 0xed, 0x23, 0x26, 0x8b, 0xe1, 0x38, 0xc1, 0x1c, 0xa1, 0x29, 0x9e, 0x82, + 0x7c, 0xcf, 0x6e, 0x77, 0x89, 0xba, 0x9d, 0xd8, 0x9d, 0x77, 0x85, 0x10, 0x87, 0x3a, 0xf3, 0x7e, + 0x16, 0xe6, 0xd2, 0xa3, 0x1a, 0x75, 0xa1, 0x20, 0xe7, 0x20, 0x2b, 0x19, 0x8f, 0x63, 0xf0, 0xc6, + 0x59, 0x22, 0x45, 0x0c, 0x2b, 0x32, 0xd1, 0x11, 0x69, 0xb4, 0x6b, 0x0f, 0x74, 0xc4, 0x78, 0xcb, + 0x8e, 0x11, 0x87, 0xee, 0xd7, 0xd9, 0x7f, 0xe5, 0x7e, 0x2d, 0xba, 0x42, 0x43, 0x46, 0x5b, 0x76, + 0x85, 0xdc, 0xa3, 0x77, 0x85, 0xd5, 0xd8, 0x0a, 0xd6, 0x2c, 0xa2, 0x45, 0xc8, 0xb8, 0x0d, 0x59, + 0x35, 0xd9, 0x2a, 0x28, 0x6c, 0x66, 0x7d, 0x15, 0x67, 0xdc, 0x86, 0xc9, 0x60, 0x46, 0x5f, 0x44, + 0x64, 0xf9, 0x86, 0x55, 0x36, 0x38, 0x7e, 0xd3, 0x15, 0xf5, 0x06, 0xcc, 0x86, 0xbf, 0x56, 0x09, + 0xb7, 0xdd, 0x36, 0x53, 0xb7, 0x73, 0x5c, 0xc1, 0x67, 0xb7, 0x75, 0x25, 0x4e, 0x63, 0xcd, 0x5f, + 0x0c, 0x00, 0xf1, 0xd5, 0xc6, 0x5c, 0xee, 0xd3, 0xbe, 0xc8, 0x5a, 0xf1, 0xe9, 0xa6, 0x18, 0xe3, + 0xac, 0x15, 0x08, 0x2c, 0x35, 0xa9, 0x31, 0x9a, 0x79, 0xa8, 0x31, 0x9a, 0x3d, 0x74, 0x8c, 0x8a, + 0x37, 0x61, 0xad, 0x2d, 0xea, 0xf6, 0x6c, 0x4e, 0x36, 0x48, 0x5f, 0x35, 0xa3, 0xe4, 0x4d, 0xb6, + 0x2f, 0x24, 0x4a, 0x9c, 0xc6, 0x9a, 0xbf, 0x1b, 0x30, 0x97, 0xbc, 0xc9, 0x13, 0x98, 0x5f, 0xd7, + 0xd2, 0xf3, 0x6b, 0x6d, 0xa4, 0x2e, 0x16, 0xf9, 0x7d, 0xd0, 0x08, 0x33, 0x60, 0x26, 0xea, 0x69, + 0x97, 0xfc, 0x86, 0x6c, 0x1e, 0xe2, 0x22, 0xa3, 0x55, 0x26, 0x3e, 0x25, 0xfb, 0x20, 0x0e, 0x75, + 0xa8, 0x0b, 0x53, 0x4e, 0xcb, 0x6d, 0x37, 0x28, 0xf1, 0x94, 0x93, 0xe7, 0xc7, 0xd0, 0x6a, 0x05, + 0x7f, 0x12, 0x98, 0x9a, 0x22, 0xc0, 0x31, 0x95, 0xf9, 0x63, 0x16, 0x66, 0x53, 0x7d, 0x59, 0xec, + 0x47, 0xe1, 0xf7, 0xf7, 0xb6, 0xe6, 0x73, 0xbc, 0x1f, 0xd5, 0x13, 0x15, 0xd6, 0x71, 0xa2, 0xe9, + 0xb6, 0xdd, 0x5e, 0x68, 0x63, 0xf0, 0xef, 0x98, 0xcd, 0x48, 0x81, 0x13, 0x8c, 0x36, 0x98, 0xb2, + 0x0f, 0x3d, 0x98, 0xbe, 0x31, 0x00, 0xc9, 0x57, 0x10, 0x96, 0xe3, 0xf9, 0x51, 0xca, 0x8d, 0x37, + 0x6e, 0x8b, 0xca, 0x23, 0x54, 0x1b, 0xa2, 0xc2, 0x7f, 0x43, 0xaf, 0x7d, 0xe6, 0xe4, 0x9f, 0xcc, + 0x67, 0xce, 0x7d, 0x03, 0x06, 0x17, 0x45, 0x51, 0xc5, 0xae, 0xc7, 0x88, 0xd3, 0xa5, 0xe1, 0xdd, + 0x4d, 0x25, 0xd7, 0xbf, 0xae, 0xe4, 0x38, 0x46, 0xc8, 0xcf, 0x71, 0xb9, 0x58, 0x5c, 0x4a, 0x7a, + 0x44, 0xf2, 0x39, 0x1e, 0x6b, 0xb0, 0x86, 0x42, 0xa7, 0x61, 0xca, 0x21, 0x94, 0xaf, 0x8a, 0x4a, + 0x15, 0x57, 0x37, 0x53, 0x9d, 0x91, 0xc9, 0xa5, 0x64, 0x38, 0xd6, 0xa2, 0xff, 0xc3, 0xe4, 0x2e, + 0xe9, 0x4b, 0x60, 0x4e, 0x02, 0x8b, 0xfb, 0x7b, 0x4b, 0x93, 0x1b, 0xa1, 0x08, 0x47, 0x3a, 0x64, + 0x42, 0xc1, 0xb1, 0x25, 0x2a, 0x2f, 0x51, 0x20, 0xbf, 0x11, 0xce, 0x49, 0x90, 0xd2, 0x54, 0xad, + 0x5b, 0x77, 0xcb, 0x13, 0xb7, 0xef, 0x96, 0x27, 0xee, 0xdc, 0x2d, 0x4f, 0xdc, 0xd8, 0x2f, 0x1b, + 0xb7, 0xf6, 0xcb, 0xc6, 0xed, 0xfd, 0xb2, 0x71, 0x67, 0xbf, 0x6c, 0xfc, 0xb9, 0x5f, 0x36, 0x6e, + 0xde, 0x2b, 0x4f, 0xbc, 0x3f, 0x15, 0xc5, 0xef, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x71, 0x60, + 0x5d, 0xea, 0x3f, 0x17, 0x00, 0x00, } diff --git a/pkg/apis/application/v1alpha1/generated.proto b/pkg/apis/application/v1alpha1/generated.proto index d290f089ec8c9..a4dfa2f44d034 100644 --- a/pkg/apis/application/v1alpha1/generated.proto +++ b/pkg/apis/application/v1alpha1/generated.proto @@ -67,7 +67,6 @@ message ApplicationSpec { optional ApplicationSource source = 1; // Destination overrides the kubernetes server and namespace defined in the environment ksonnet app.yaml - // This field is optional. If omitted, uses the server and namespace defined in the environment optional ApplicationDestination destination = 2; // SyncPolicy dictates whether we auto-sync based on the delta between the tracked branch and live state diff --git a/pkg/apis/application/v1alpha1/types.go b/pkg/apis/application/v1alpha1/types.go index b738ac9e1fe0d..91b036bb17d4e 100644 --- a/pkg/apis/application/v1alpha1/types.go +++ b/pkg/apis/application/v1alpha1/types.go @@ -56,8 +56,7 @@ type ApplicationSpec struct { // Source is a reference to the location ksonnet application definition Source ApplicationSource `json:"source" protobuf:"bytes,1,opt,name=source"` // Destination overrides the kubernetes server and namespace defined in the environment ksonnet app.yaml - // This field is optional. If omitted, uses the server and namespace defined in the environment - Destination *ApplicationDestination `json:"destination,omitempty" protobuf:"bytes,2,opt,name=destination"` + Destination ApplicationDestination `json:"destination" protobuf:"bytes,2,name=destination"` // SyncPolicy dictates whether we auto-sync based on the delta between the tracked branch and live state SyncPolicy string `json:"syncPolicy,omitempty" protobuf:"bytes,3,opt,name=syncPolicy"` } diff --git a/pkg/apis/application/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/application/v1alpha1/zz_generated.deepcopy.go index 4f3803ca2743a..a3682e4b984cb 100644 --- a/pkg/apis/application/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/application/v1alpha1/zz_generated.deepcopy.go @@ -110,15 +110,7 @@ func (in *ApplicationSource) DeepCopy() *ApplicationSource { func (in *ApplicationSpec) DeepCopyInto(out *ApplicationSpec) { *out = *in in.Source.DeepCopyInto(&out.Source) - if in.Destination != nil { - in, out := &in.Destination, &out.Destination - if *in == nil { - *out = nil - } else { - *out = new(ApplicationDestination) - **out = **in - } - } + out.Destination = in.Destination return } diff --git a/server/application/application.go b/server/application/application.go index da78287637e3d..f86dc12547bc1 100644 --- a/server/application/application.go +++ b/server/application/application.go @@ -18,7 +18,6 @@ import ( "github.com/argoproj/argo-cd/server/cluster" apirepository "github.com/argoproj/argo-cd/server/repository" "github.com/argoproj/argo-cd/util" - argoutil "github.com/argoproj/argo-cd/util/argo" "github.com/argoproj/argo-cd/util/git" "github.com/argoproj/argo-cd/util/kube" "github.com/ghodss/yaml" @@ -247,7 +246,7 @@ func (s *Server) validateApp(ctx context.Context, spec *appv1.ApplicationSpec) e // Ensure the k8s cluster the app is referencing, is configured in ArgoCD // NOTE: need to check if it was overridden in the destination spec clusterURL := envSpec.Destination.Server - if spec.Destination != nil && spec.Destination.Server != "" { + if spec.Destination.Server != "" { clusterURL = spec.Destination.Server } _, err = s.clusterService.Get(ctx, &cluster.ClusterQuery{Server: clusterURL}) @@ -485,26 +484,9 @@ func (s *Server) getApplicationDestination(ctx context.Context, name string) (st app, err := s.appclientset.ArgoprojV1alpha1().Applications(s.ns).Get(name, metav1.GetOptions{}) if err != nil { return "", "", err - } else { - repo := s.getRepo(ctx, app.Spec.Source.RepoURL) - conn, repoClient, err := s.repoClientset.NewRepositoryClient() - if err != nil { - return "", "", err - } - defer util.Close(conn) - manifestInfo, err := repoClient.GenerateManifest(ctx, &repository.ManifestRequest{ - Repo: repo, - Environment: app.Spec.Source.Environment, - Path: app.Spec.Source.Path, - Revision: app.Spec.Source.TargetRevision, - AppLabel: app.Name, - }) - if err != nil { - return "", "", err - } - server, namespace := argoutil.ResolveServerNamespace(app.Spec.Destination, manifestInfo) - return server, namespace, nil } + server, namespace := app.Spec.Destination.Server, app.Spec.Destination.Namespace + return server, namespace, nil } func (s *Server) getRepo(ctx context.Context, repoURL string) *appv1.Repository { @@ -557,7 +539,7 @@ func (s *Server) deploy( targetObjs[i] = obj } - server, namespace := argoutil.ResolveServerNamespace(app.Spec.Destination, manifestInfo) + server, namespace := app.Spec.Destination.Server, app.Spec.Destination.Namespace comparison, err := s.appComparator.CompareAppState(server, namespace, targetObjs, app) if err != nil { diff --git a/util/argo/argo.go b/util/argo/argo.go index 02c7b884f468e..18e7da039381a 100644 --- a/util/argo/argo.go +++ b/util/argo/argo.go @@ -5,32 +5,13 @@ import ( "time" "github.com/argoproj/argo-cd/common" - appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" argoappv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/typed/application/v1alpha1" - "github.com/argoproj/argo-cd/reposerver/repository" log "github.com/sirupsen/logrus" apierr "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" ) -// ResolveServerNamespace resolves server and namespace to use given an application spec, -// and a manifest response. It looks to explicit server/namespace overridden in the app CRD spec -// and falls back to the server/namespace defined in the ksonnet environment -func ResolveServerNamespace(destination *appv1.ApplicationDestination, manifestInfo *repository.ManifestResponse) (string, string) { - server := manifestInfo.Server - namespace := manifestInfo.Namespace - if destination != nil { - if destination.Server != "" { - server = destination.Server - } - if destination.Namespace != "" { - namespace = destination.Namespace - } - } - return server, namespace -} - // RefreshApp updates the refresh annotation of an application to coerce the controller to process it func RefreshApp(appIf v1alpha1.ApplicationInterface, name string) (*argoappv1.Application, error) { refreshString := time.Now().UTC().Format(time.RFC3339)