Skip to content

Commit 55651a4

Browse files
bump app-proxy (#490)
* bump app-proxy * initial commit * fix * push codegen
1 parent 5b04928 commit 55651a4

File tree

11 files changed

+55
-29
lines changed

11 files changed

+55
-29
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION=v0.0.436
1+
VERSION=v0.0.437
22

33
OUT_DIR=dist
44
YEAR?=$(shell date +"%Y")

cmd/commands/runtime.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -810,6 +810,9 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
810810
store.Get().LabelKeyCFType: fmt.Sprintf("{{ labels.%s }}", util.EscapeAppsetFieldName(store.Get().LabelKeyCFType)),
811811
store.Get().LabelKeyCFInternal: fmt.Sprintf("{{ labels.%s }}", util.EscapeAppsetFieldName(store.Get().LabelKeyCFInternal)),
812812
},
813+
Annotations: map[string]string{
814+
store.Get().AnnotationKeySyncWave: fmt.Sprintf("{{ annotations.%s }}", util.EscapeAppsetFieldName(store.Get().AnnotationKeySyncWave)),
815+
},
813816
})
814817
}
815818
handleCliStep(reporter.InstallStepCreateProject, "Creating Project", err, false, true)
@@ -1057,7 +1060,7 @@ func createGitIntegration(ctx context.Context, opts *RuntimeInstallOptions) erro
10571060
return nil
10581061
}
10591062

1060-
func intervalCheckIsGitIntegrationCreated(ctx context.Context, opts *RuntimeInstallOptions) error{
1063+
func intervalCheckIsGitIntegrationCreated(ctx context.Context, opts *RuntimeInstallOptions) error {
10611064
maxRetries := 6 // up to a minute
10621065
ticker := time.NewTicker(time.Second * 10)
10631066
defer ticker.Stop()

docs/commands/cli-v2_git-source_edit.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ cli-v2 git-source edit RUNTIME_NAME GITSOURCE_NAME [flags]
2020
--exclude string files to exclude. can be either filenames or a glob
2121
--git-src-git-token string Your git provider api token [GIT_SRC_GIT_TOKEN]
2222
--git-src-git-user string Your git provider user name [GIT_SRC_GIT_USER] (not required in GitHub)
23-
--git-src-provider string The git provider, one of: azure|gitea|github|gitlab
23+
--git-src-provider string The git provider, one of: azure|bitbucket-server|gitea|github|gitlab
2424
--git-src-repo string Repository URL [GIT_SRC_GIT_REPO]
2525
-t, --git-token string Your git provider api token [GIT_TOKEN]
2626
-u, --git-user string Your git provider user name [GIT_USER] (not required in GitHub)
2727
-h, --help help for edit
2828
--include string files to include. can be either filenames or a glob
29-
--provider string The git provider, one of: azure|gitea|github|gitlab
29+
--provider string The git provider, one of: azure|bitbucket-server|gitea|github|gitlab
3030
--repo string Repository URL [GIT_REPO]
3131
-b, --upsert-branch If true will try to checkout the specified branch and create it if it doesn't exist
3232
```

docs/commands/cli-v2_runtime_install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ cli-v2 runtime install [runtime_name] [flags]
4545
-n, --namespace string If present, the namespace scope for this CLI request
4646
--namespace-labels stringToString Optional labels that will be set on the namespace resource. (e.g. "key1=value1,key2=value2" (default [])
4747
--personal-git-token string The Personal git token for your user
48-
--provider string The git provider, one of: azure|gitea|github|gitlab
48+
--provider string The git provider, one of: azure|bitbucket-server|gitea|github|gitlab
4949
--provider-api-url string Git provider API url
5050
--repo string Repository URL [GIT_REPO]
5151
--set-default-resources If true, will set default requests and limits on all of the runtime components

docs/releases/release_notes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ cf version
2323

2424
```bash
2525
# download and extract the binary
26-
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.436/cf-linux-amd64.tar.gz | tar zx
26+
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.437/cf-linux-amd64.tar.gz | tar zx
2727

2828
# move the binary to your $PATH
2929
mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -36,7 +36,7 @@ cf version
3636

3737
```bash
3838
# download and extract the binary
39-
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.436/cf-darwin-amd64.tar.gz | tar zx
39+
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.437/cf-darwin-amd64.tar.gz | tar zx
4040

4141
# move the binary to your $PATH
4242
mv ./cf-darwin-amd64 /usr/local/bin/cf

go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ go 1.18
44

55
require (
66
github.com/Masterminds/semver/v3 v3.1.1
7-
github.com/argoproj-labs/argocd-autopilot v0.3.9
7+
github.com/argoproj-labs/argocd-autopilot v0.4.1
88
github.com/argoproj/applicationset v0.4.1
9-
github.com/argoproj/argo-cd/v2 v2.4.1
9+
github.com/argoproj/argo-cd/v2 v2.4.6
1010
github.com/argoproj/argo-events v0.17.1-0.20220327045437-70eaafe9afec
1111
github.com/argoproj/argo-workflows/v3 v3.3.1
1212
github.com/briandowns/spinner v1.18.1
@@ -26,7 +26,7 @@ require (
2626
github.com/spf13/cobra v1.4.0
2727
github.com/spf13/pflag v1.0.5
2828
github.com/spf13/viper v1.10.1
29-
github.com/stretchr/testify v1.7.1
29+
github.com/stretchr/testify v1.7.2
3030
golang.org/x/text v0.3.7
3131
gopkg.in/segmentio/analytics-go.v3 v3.1.0
3232
k8s.io/api v0.23.3
@@ -213,10 +213,10 @@ require (
213213
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
214214
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
215215
golang.org/x/exp v0.0.0-20210901193431-a062eea981d2 // indirect
216-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
217-
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect
216+
golang.org/x/net v0.0.0-20220621193019-9d032be2e588 // indirect
217+
golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb // indirect
218218
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
219-
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 // indirect
219+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
220220
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
221221
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
222222
gomodules.xyz/envconfig v1.3.1-0.20190308184047-426f31af0d45 // indirect
@@ -233,7 +233,7 @@ require (
233233
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
234234
gopkg.in/warnings.v0 v0.1.2 // indirect
235235
gopkg.in/yaml.v2 v2.4.0 // indirect
236-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
236+
gopkg.in/yaml.v3 v3.0.1 // indirect
237237
k8s.io/apiextensions-apiserver v0.23.3 // indirect
238238
k8s.io/apiserver v0.23.1 // indirect
239239
k8s.io/cli-runtime v0.23.1 // indirect

go.sum

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,12 @@ github.com/antonmedv/expr v1.9.0/go.mod h1:5qsM3oLGDND7sDmQGDXHkYfkjYMUX14qsgqmH
154154
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
155155
github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
156156
github.com/appscode/go v0.0.0-20190808133642-1d4ef1f1c1e0/go.mod h1:iy07dV61Z7QQdCKJCIvUoDL21u6AIceRhZzyleh2ymc=
157-
github.com/argoproj-labs/argocd-autopilot v0.3.9 h1:8MH7LxagzIGxBiqWOnGQLPvyOPgBW2NgcbJeNCn4o6E=
158-
github.com/argoproj-labs/argocd-autopilot v0.3.9/go.mod h1:NCiEJDL2uwcrqkmr2pTMvlBag4WlpIWnEgS7NimaFzs=
157+
github.com/argoproj-labs/argocd-autopilot v0.4.1 h1:/PnPpxzDdcGhjPzkhq6z2R2BgKc0vVZB2OuET0PE3hM=
158+
github.com/argoproj-labs/argocd-autopilot v0.4.1/go.mod h1:FV6AIgKWXubDwGAZfPzwWpQLNOneVS78qWdDRJUnAII=
159159
github.com/argoproj/applicationset v0.4.1 h1:PzTn77TK7XQB3CdpCDPbwU4pQgip0x4qvuJQ8XiBk5E=
160160
github.com/argoproj/applicationset v0.4.1/go.mod h1:cJZ7CWG80kBII4QNalyAvSr8eVifo8jKkyXoVl9qXaA=
161-
github.com/argoproj/argo-cd/v2 v2.4.1 h1:wR+t9wG2BMQbU9e6jSEKsTBYjyDvKB/XdFsXNJhbLuQ=
162-
github.com/argoproj/argo-cd/v2 v2.4.1/go.mod h1:v/qJlqOYdszqe7WtNSKOppNy3AhRKa9cHSGFw6Pg7lg=
161+
github.com/argoproj/argo-cd/v2 v2.4.6 h1:n3Y0UaAUVbdd8tBpSzwpH3iuLtzAbK1hmGXyk7ueKT4=
162+
github.com/argoproj/argo-cd/v2 v2.4.6/go.mod h1:CnD0D1JGTSFxkALblVZiSm8sVgEKH1oaFQoMtpC7EaE=
163163
github.com/argoproj/argo-events v0.17.1-0.20220327045437-70eaafe9afec h1:95S2LPUUdPO2jYxuR5z1uk1GL2m/u+ud2iFAr5gK6VI=
164164
github.com/argoproj/argo-events v0.17.1-0.20220327045437-70eaafe9afec/go.mod h1:dF9hehH+HaEqz+OvQb0iXG8ynj4sQlISIQoettdl05Y=
165165
github.com/argoproj/argo-workflows/v3 v3.3.1 h1:cNhY6JRlMvwu0qhfCWtS/XmQ8nm2OjR7CBZ3K6zbcKI=
@@ -1240,8 +1240,9 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
12401240
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
12411241
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
12421242
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
1243-
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
12441243
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
1244+
github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s=
1245+
github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
12451246
github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
12461247
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
12471248
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
@@ -1511,8 +1512,8 @@ golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qx
15111512
golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
15121513
golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
15131514
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
1514-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc=
1515-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
1515+
golang.org/x/net v0.0.0-20220621193019-9d032be2e588 h1:9ubFuySsnAJYGyJrZ3koiEv8FyqofCBdz3G9Mbf2YFc=
1516+
golang.org/x/net v0.0.0-20220621193019-9d032be2e588/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
15161517
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
15171518
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
15181519
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1532,8 +1533,8 @@ golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ
15321533
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
15331534
golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
15341535
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
1535-
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a h1:qfl7ob3DIEs3Ml9oLuPwY2N04gymzAW04WsUQHIClgM=
1536-
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
1536+
golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb h1:8tDJ3aechhddbdPAxpycgXHJRMLpk/Ab+aa4OgdN5/g=
1537+
golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE=
15371538
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
15381539
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
15391540
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -1667,8 +1668,8 @@ golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBc
16671668
golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
16681669
golang.org/x/sys v0.0.0-20220222200937-f2425489ef4c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
16691670
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1670-
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 h1:y/woIyUBFbpQGKS0u1aHF/40WUDnek3fPOyD08H5Vng=
1671-
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1671+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
1672+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
16721673
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
16731674
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
16741675
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -2011,8 +2012,9 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
20112012
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
20122013
gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
20132014
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
2014-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
20152015
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
2016+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
2017+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
20162018
gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
20172019
gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0=
20182020
gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=

manifests/argo-cd/kustomization.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,15 @@ patches:
4141
- op: add
4242
path: /spec/ports/0/appProtocol
4343
value: tcp
44+
45+
- target:
46+
version: v1
47+
group: apps
48+
kind: Deployment
49+
name: argocd-server
50+
patch: |
51+
- op: add
52+
path: /spec/template/spec/containers/0/env/-
53+
value:
54+
name: ARGOCD_SYNC_WAVE_DELAY
55+
value: "10"

manifests/runtime.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
namespace: "{{ namespace }}"
66
spec:
77
defVersion: 1.0.1
8-
version: 0.0.436
8+
version: 0.0.437
99
bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
1010
components:
1111
- name: events
@@ -21,6 +21,7 @@ spec:
2121
- name: app-proxy
2222
type: kustomize
2323
url: github.com/codefresh-io/cli-v2/manifests/app-proxy
24+
syncWave: 9
2425
- name: sealed-secrets
2526
type: kustomize
2627
url: github.com/codefresh-io/cli-v2/manifests/sealed-secrets

pkg/runtime/runtime.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ type (
7373
Name string `json:"name"`
7474
Type string `json:"type"`
7575
URL string `json:"url"`
76+
SyncWave int `json:"syncWave"`
7677
Wait bool `json:"wait"`
7778
IsInternal bool `json:"isInternal"`
7879
}
@@ -270,7 +271,7 @@ func (a *AppDef) CreateApp(ctx context.Context, f kube.Factory, cloneOpts *git.C
270271
timeout = store.Get().WaitTimeout
271272
}
272273

273-
return apcmd.RunAppCreate(ctx, &apcmd.AppCreateOptions{
274+
appCreateOpts := &apcmd.AppCreateOptions{
274275
CloneOpts: cloneOpts,
275276
AppsCloneOpts: &git.CloneOptions{},
276277
ProjectName: projectName,
@@ -283,12 +284,17 @@ func (a *AppDef) CreateApp(ctx context.Context, f kube.Factory, cloneOpts *git.C
283284
util.EscapeAppsetFieldName(store.Get().LabelKeyCFType): cfType,
284285
util.EscapeAppsetFieldName(store.Get().LabelKeyCFInternal): strconv.FormatBool(a.IsInternal),
285286
},
287+
Annotations: map[string]string{
288+
util.EscapeAppsetFieldName(store.Get().AnnotationKeySyncWave): strconv.Itoa(a.SyncWave),
289+
},
286290
Exclude: exclude,
287291
Include: include,
288292
},
289293
KubeFactory: f,
290294
Timeout: timeout,
291-
})
295+
}
296+
297+
return apcmd.RunAppCreate(ctx, appCreateOpts)
292298
}
293299

294300
func (a *AppDef) delete(fs fs.FS) error {

0 commit comments

Comments
 (0)