Skip to content
This repository has been archived by the owner on Feb 9, 2023. It is now read-only.

Commit

Permalink
Merge pull request #144 from puppetlabs/update/latest
Browse files Browse the repository at this point in the history 
Update to latest Relay Core dependencies
  • Loading branch information
@rick-a-lane-ii
rick-a-lane-ii authored Apr 27, 2022
2 parents ce48754 + 5fa0ff9 commit eba7693
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 39 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ require (
github.com/puppetlabs/leg/workdir v0.1.0
github.com/puppetlabs/relay-client-go/client v0.4.5
github.com/puppetlabs/relay-client-go/models v1.0.7
github.com/puppetlabs/relay-core v0.0.0-20220415223448-6c6d3bec719c
github.com/puppetlabs/relay-core v0.0.0-20220427044955-8331790d54ab
github.com/rancher/helm-controller v0.6.3
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
github.com/spf13/cobra v1.4.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2011,8 +2011,8 @@ github.com/puppetlabs/relay-client-go/client v0.4.5/go.mod h1:96UPPGfyCXTLt6zalS
github.com/puppetlabs/relay-client-go/models v1.0.7 h1:RhIurCzOCEOyBLKUjxV7AoBHlLuULFGXmzctyH9MO9I=
github.com/puppetlabs/relay-client-go/models v1.0.7/go.mod h1:aQJfo2Wo8aPFXWNjVGAy9dq6Xz5EcgET2tR7GPOijYA=
github.com/puppetlabs/relay-core v0.0.0-20211101184602-cf3519db2e61/go.mod h1:tOTpLLbsrnOPQ8sn7i1Zq6etYky6GZoB6zzNGlUQ64w=
github.com/puppetlabs/relay-core v0.0.0-20220415223448-6c6d3bec719c h1:EBzm4SJzcrwPY1+HL1fpqoIK5BHaSJQDHe5ySiz/qUE=
github.com/puppetlabs/relay-core v0.0.0-20220415223448-6c6d3bec719c/go.mod h1:MLj8qxHQ68gCUMJkz0mRnCRee1yu/aoRgh/rBCqiruQ=
github.com/puppetlabs/relay-core v0.0.0-20220427044955-8331790d54ab h1:TVUiUIYoORH8OQSFbdnOkyI1QUSINY+fE1zd3F3coIs=
github.com/puppetlabs/relay-core v0.0.0-20220427044955-8331790d54ab/go.mod h1:MLj8qxHQ68gCUMJkz0mRnCRee1yu/aoRgh/rBCqiruQ=
github.com/puppetlabs/relay-pls v0.0.0-20201125074651-13575df50b51 h1:NwccjCOhZOi0l4w68vPJOV99ctreO/YlrY+RNiz7Llc=
github.com/puppetlabs/relay-pls v0.0.0-20201125074651-13575df50b51/go.mod h1:xtYyc7gvvVZtfAn5kM89ihJj6v5zdBjNjMfp+a6z+8o=
github.com/qri-io/starlib v0.4.2-0.20200213133954-ff2e8cd5ef8d/go.mod h1:7DPO4domFU579Ga6E61sB9VFNaniPVwJP5C4bBCu3wA=
Expand Down
92 changes: 58 additions & 34 deletions pkg/dev/manifests/data/relay/install.relay.sh_relaycores.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,22 +43,6 @@ spec:
description: Environment is the environment this instance is running
in.
type: string
jwtSigningKeys:
description: JWTSigningKeys is the secret and keys that hold a JWT
signing key pair for the workflow run key signing operations with
vault. This secret must have 2 fields for a public and private key
pair. If this field is not set, then signings key will be generated
automatically.
properties:
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
privateKeyRef:
type: string
publicKeyRef:
type: string
type: object
logService:
description: LogService is the configuration for the log service.
properties:
Expand Down Expand Up @@ -2133,8 +2117,6 @@ spec:
description: Operator is the configuration for the workflow run operator.
properties:
admissionWebhookServer:
default:
certificateControllerImagePullPolicy: IfNotPresent
description: AdmissionWebhookServer is the configuration for the
admissionregistration webhook server.
properties:
Expand Down Expand Up @@ -3253,17 +3235,16 @@ spec:
when configuring engine mounts and policies for relay-core
components.
properties:
token:
description: Value provides vault server authentication
data.
value:
description: Value allows data to be provided directly.
type: string
tokenFrom:
description: ValueFrom allows vault server auth data to
be provided by another source such as a Secret.
valueFrom:
description: ValueFrom allows data to be provided by another
source such as a Secret.
properties:
secretKeyRef:
description: SecretKeyRef selects an API token by
looking up the value in a secret.
description: SecretKeyRef selects data by looking
up the value in a secret.
properties:
key:
description: The key of the secret to select from. Must
Expand All @@ -3289,17 +3270,16 @@ spec:
This Job only supports a singular unseal key, so servers
that require multiple keys will not be unsealed.
properties:
token:
description: Value provides vault server authentication
data.
value:
description: Value allows data to be provided directly.
type: string
tokenFrom:
description: ValueFrom allows vault server auth data to
be provided by another source such as a Secret.
valueFrom:
description: ValueFrom allows data to be provided by another
source such as a Secret.
properties:
secretKeyRef:
description: SecretKeyRef selects an API token by
looking up the value in a secret.
description: SecretKeyRef selects data by looking
up the value in a secret.
properties:
key:
description: The key of the secret to select from. Must
Expand Down Expand Up @@ -3351,6 +3331,50 @@ spec:
pull a container image
type: string
type: object
jwtSigningKeys:
description: JWTSigningKeys provides the JWT signing keys used
for operations with vault. If this field is not set, signing
keys will be generated automatically.
properties:
privateKeyRef:
description: PrivateKeyRef is a reference to a secret containing
the private key.
properties:
key:
description: The key of the secret to select from. Must
be a valid secret key.
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
optional:
description: Specify whether the Secret or its key must
be defined
type: boolean
required:
- key
type: object
publicKeyRef:
description: PublicKeyRef is a reference to a secret containing
the public key.
properties:
key:
description: The key of the secret to select from. Must
be a valid secret key.
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
optional:
description: Specify whether the Secret or its key must
be defined
type: boolean
required:
- key
type: object
type: object
server:
description: Server provides the configuration for the vault server.
properties:
Expand Down
4 changes: 2 additions & 2 deletions pkg/dev/manifests/generate_assets.go
View file

Large diffs are not rendered by default.

0 comments on commit eba7693

Please sign in to comment.