Skip to content

Commit

Permalink
feat: Support security token for OSS artifact driver (#5491)
Browse files Browse the repository at this point in the history 
Signed-off-by: terrytangyuan <terrytangyuan@gmail.com>
  • Loading branch information
@terrytangyuan
terrytangyuan authored Apr 6, 2021
1 parent 5f51e6d commit 4f3bbdc
Show file tree
Hide file tree
Showing 14 changed files with 706 additions and 502 deletions.
4 changes: 4 additions & 0 deletions api/jsonschema/schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4152,6 +4152,10 @@
"secretKeySecret": {
"$ref": "#/definitions/io.k8s.api.core.v1.SecretKeySelector",
"description": "SecretKeySecret is the secret selector to the bucket's secret key"
},
"securityToken": {
"description": "SecurityToken is the user's temporary security token. For more details, check out: https://www.alibabacloud.com/help/doc-detail/100624.htm",
"type": "string"
}
},
"required": [
Expand Down
4 changes: 4 additions & 0 deletions api/openapi-spec/swagger.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7570,6 +7570,10 @@
"secretKeySecret": {
"description": "SecretKeySecret is the secret selector to the bucket's secret key",
"$ref": "#/definitions/io.k8s.api.core.v1.SecretKeySelector"
},
"securityToken": {
"description": "SecurityToken is the user's temporary security token. For more details, check out: https://www.alibabacloud.com/help/doc-detail/100624.htm",
"type": "string"
}
}
},
Expand Down
1 change: 1 addition & 0 deletions docs/fields.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3419,6 +3419,7 @@ OSSArtifact is the location of an Alibaba Cloud OSS artifact
|`endpoint`|`string`|Endpoint is the hostname of the bucket endpoint|
|`key`|`string`|Key is the path in the bucket where the artifact resides|
|`secretKeySecret`|[`SecretKeySelector`](#secretkeyselector)|SecretKeySecret is the secret selector to the bucket's secret key|
|`securityToken`|`string`|SecurityToken is the user's temporary security token. For more details, check out: https://www.alibabacloud.com/help/doc-detail/100624.htm|

## RawArtifact

Expand Down
22 changes: 22 additions & 0 deletions manifests/base/crds/full/argoproj.io_clusterworkflowtemplates.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,8 @@ spec:
required:
- key
type: object
securityToken:
type: string
required:
- key
type: object
Expand Down Expand Up @@ -1442,6 +1444,8 @@ spec:
required:
- key
type: object
securityToken:
type: string
required:
- key
type: object
Expand Down Expand Up @@ -2867,6 +2871,8 @@ spec:
required:
- key
type: object
securityToken:
type: string
required:
- key
type: object
Expand Down Expand Up @@ -3272,6 +3278,8 @@ spec:
required:
- key
type: object
securityToken:
type: string
required:
- key
type: object
Expand Down Expand Up @@ -4153,6 +4161,8 @@ spec:
required:
- key
type: object
securityToken:
type: string
required:
- key
type: object
Expand Down Expand Up @@ -4598,6 +4608,8 @@ spec:
required:
- key
type: object
securityToken:
type: string
required:
- key
type: object
Expand Down Expand Up @@ -7125,6 +7137,8 @@ spec:
required:
- key
type: object
securityToken:
type: string
required:
- key
type: object
Expand Down Expand Up @@ -8550,6 +8564,8 @@ spec:
required:
- key
type: object
securityToken:
type: string
required:
- key
type: object
Expand Down Expand Up @@ -8955,6 +8971,8 @@ spec:
required:
- key
type: object
securityToken:
type: string
required:
- key
type: object
Expand Down Expand Up @@ -9836,6 +9854,8 @@ spec:
required:
- key
type: object
securityToken:
type: string
required:
- key
type: object
Expand Down Expand Up @@ -10281,6 +10301,8 @@ spec:
required:
- key
type: object
securityToken:
type: string
required:
- key
type: object
Expand Down
22 changes: 22 additions & 0 deletions manifests/base/crds/full/argoproj.io_cronworkflows.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,8 @@ spec:
required:
- key
type: object
securityToken:
type: string
required:
- key
type: object
Expand Down Expand Up @@ -1463,6 +1465,8 @@ spec:
required:
- key
type: object
securityToken:
type: string
required:
- key
type: object
Expand Down Expand Up @@ -2888,6 +2892,8 @@ spec:
required:
- key
type: object
securityToken:
type: string
required:
- key
type: object
Expand Down Expand Up @@ -3293,6 +3299,8 @@ spec:
required:
- key
type: object
securityToken:
type: string
required:
- key
type: object
Expand Down Expand Up @@ -4174,6 +4182,8 @@ spec:
required:
- key
type: object
securityToken:
type: string
required:
- key
type: object
Expand Down Expand Up @@ -4619,6 +4629,8 @@ spec:
required:
- key
type: object
securityToken:
type: string
required:
- key
type: object
Expand Down Expand Up @@ -7146,6 +7158,8 @@ spec:
required:
- key
type: object
securityToken:
type: string
required:
- key
type: object
Expand Down Expand Up @@ -8571,6 +8585,8 @@ spec:
required:
- key
type: object
securityToken:
type: string
required:
- key
type: object
Expand Down Expand Up @@ -8976,6 +8992,8 @@ spec:
required:
- key
type: object
securityToken:
type: string
required:
- key
type: object
Expand Down Expand Up @@ -9857,6 +9875,8 @@ spec:
required:
- key
type: object
securityToken:
type: string
required:
- key
type: object
Expand Down Expand Up @@ -10302,6 +10322,8 @@ spec:
required:
- key
type: object
securityToken:
type: string
required:
- key
type: object
Expand Down
2 changes: 2 additions & 0 deletions manifests/base/crds/full/argoproj.io_workfloweventbindings.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,8 @@ spec:
required:
- key
type: object
securityToken:
type: string
required:
- key
type: object
Expand Down
Loading

0 comments on commit 4f3bbdc

Please sign in to comment.