Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support cancelling restores #250

Draft
wants to merge 23 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
12e74a1
feat: support for services v2
shreddedbacon Jan 5, 2024
f1317d0
chore: remove pendingmessage functionality
shreddedbacon Jan 5, 2024
c5c260a
feat: support for passing new env service info to api
shreddedbacon Jan 9, 2024
b32c8eb
refactor: move v1beta1 related functions into their own api or contro…
shreddedbacon Jan 9, 2024
e7e1823
feat: add v1beta2 api
shreddedbacon Jan 9, 2024
f7e12fd
refactor: remove resources after theyve completed reconciling
shreddedbacon Jan 24, 2024
b273daa
refactor: tidy up fmt and make metrics more available
shreddedbacon Mar 15, 2024
812c208
Merge branch 'main' into v1beta2-api
shreddedbacon Apr 5, 2024
9dfae27
chore: port #249 into v1beta2 controller
shreddedbacon Apr 5, 2024
acf3e74
chore: bump dependencies
shreddedbacon Apr 8, 2024
a786ef6
chore: merge branch 'main' into v1beta2-api
shreddedbacon May 1, 2024
0edaad6
Merge pull request #247 from uselagoon/v1beta2-api
shreddedbacon May 2, 2024
8c201c5
chore: merge v1beta2 and merge conflict fixes
shreddedbacon May 2, 2024
5de8e7b
chore: minor formatting fixes
shreddedbacon May 2, 2024
d1b45f2
fix: v1beta1 crd changes
shreddedbacon May 2, 2024
48f4ee4
test: add main-v1beta2
shreddedbacon May 2, 2024
710e627
Merge pull request #246 from uselagoon/remove-pendingmessages-feature
shreddedbacon May 2, 2024
71190f6
chore: merge main-v1beta2 fix initial conflicts
shreddedbacon May 2, 2024
7d5190e
fix: add environment services changes to v1beta2 controller and other…
shreddedbacon May 2, 2024
099d915
Merge pull request #248 from uselagoon/environment-services
shreddedbacon May 2, 2024
dbc3f2f
chore: merge main fix conflicts
shreddedbacon Jul 28, 2024
3b81a92
chore: merge branch 'main' into main-v1beta2
shreddedbacon Jul 29, 2024
02507f7
feat: support cancelling restores
shreddedbacon Feb 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: v1beta1 crd changes
shreddedbacon committed May 2, 2024

Verified

This commit was signed with the committer’s verified signature.
shreddedbacon Ben Jackson
commit d1b45f2e367c41eb36da5f77db8474f4845be4cb
371 changes: 371 additions & 0 deletions config/crd/bases/crd.lagoon.sh_lagoonbuilds.yaml
Original file line number Diff line number Diff line change
@@ -203,6 +203,377 @@ spec:
format: byte
type: string
type: object
statusMessages:
description: LagoonStatusMessages is where unsent messages are stored
for re-sending.
properties:
buildLogMessage:
description: LagoonLog is used to sendToLagoonLogs messaging queue
this is general logging information
properties:
event:
type: string
message:
type: string
meta:
description: LagoonLogMeta is the metadata that is used by logging
in Lagoon.
properties:
advancedData:
type: string
branchName:
type: string
buildName:
type: string
buildPhase:
type: string
buildStatus:
type: string
buildStep:
type: string
clusterName:
type: string
endTime:
type: string
environment:
type: string
environmentId:
type: integer
jobName:
type: string
jobStatus:
type: string
jobStep:
type: string
key:
type: string
logLink:
type: string
project:
type: string
projectId:
type: integer
projectName:
type: string
remoteId:
type: string
route:
type: string
routes:
items:
type: string
type: array
services:
items:
type: string
type: array
startTime:
type: string
task:
description: LagoonTaskInfo defines what a task can use to
communicate with Lagoon via SSH/API.
properties:
apiHost:
type: string
command:
type: string
id:
type: string
name:
type: string
service:
type: string
sshHost:
type: string
sshPort:
type: string
taskName:
type: string
required:
- id
type: object
type: object
project:
type: string
severity:
type: string
uuid:
type: string
type: object
environmentMessage:
description: LagoonMessage is used for sending build info back to
Lagoon messaging queue to update the environment or deployment
properties:
meta:
description: LagoonLogMeta is the metadata that is used by logging
in Lagoon.
properties:
advancedData:
type: string
branchName:
type: string
buildName:
type: string
buildPhase:
type: string
buildStatus:
type: string
buildStep:
type: string
clusterName:
type: string
endTime:
type: string
environment:
type: string
environmentId:
type: integer
jobName:
type: string
jobStatus:
type: string
jobStep:
type: string
key:
type: string
logLink:
type: string
project:
type: string
projectId:
type: integer
projectName:
type: string
remoteId:
type: string
route:
type: string
routes:
items:
type: string
type: array
services:
items:
type: string
type: array
startTime:
type: string
task:
description: LagoonTaskInfo defines what a task can use to
communicate with Lagoon via SSH/API.
properties:
apiHost:
type: string
command:
type: string
id:
type: string
name:
type: string
service:
type: string
sshHost:
type: string
sshPort:
type: string
taskName:
type: string
required:
- id
type: object
type: object
namespace:
type: string
type:
type: string
type: object
statusMessage:
description: LagoonLog is used to sendToLagoonLogs messaging queue
this is general logging information
properties:
event:
type: string
message:
type: string
meta:
description: LagoonLogMeta is the metadata that is used by logging
in Lagoon.
properties:
advancedData:
type: string
branchName:
type: string
buildName:
type: string
buildPhase:
type: string
buildStatus:
type: string
buildStep:
type: string
clusterName:
type: string
endTime:
type: string
environment:
type: string
environmentId:
type: integer
jobName:
type: string
jobStatus:
type: string
jobStep:
type: string
key:
type: string
logLink:
type: string
project:
type: string
projectId:
type: integer
projectName:
type: string
remoteId:
type: string
route:
type: string
routes:
items:
type: string
type: array
services:
items:
type: string
type: array
startTime:
type: string
task:
description: LagoonTaskInfo defines what a task can use to
communicate with Lagoon via SSH/API.
properties:
apiHost:
type: string
command:
type: string
id:
type: string
name:
type: string
service:
type: string
sshHost:
type: string
sshPort:
type: string
taskName:
type: string
required:
- id
type: object
type: object
project:
type: string
severity:
type: string
uuid:
type: string
type: object
taskLogMessage:
description: LagoonLog is used to sendToLagoonLogs messaging queue
this is general logging information
properties:
event:
type: string
message:
type: string
meta:
description: LagoonLogMeta is the metadata that is used by logging
in Lagoon.
properties:
advancedData:
type: string
branchName:
type: string
buildName:
type: string
buildPhase:
type: string
buildStatus:
type: string
buildStep:
type: string
clusterName:
type: string
endTime:
type: string
environment:
type: string
environmentId:
type: integer
jobName:
type: string
jobStatus:
type: string
jobStep:
type: string
key:
type: string
logLink:
type: string
project:
type: string
projectId:
type: integer
projectName:
type: string
remoteId:
type: string
route:
type: string
routes:
items:
type: string
type: array
services:
items:
type: string
type: array
startTime:
type: string
task:
description: LagoonTaskInfo defines what a task can use to
communicate with Lagoon via SSH/API.
properties:
apiHost:
type: string
command:
type: string
id:
type: string
name:
type: string
service:
type: string
sshHost:
type: string
sshPort:
type: string
taskName:
type: string
required:
- id
type: object
type: object
project:
type: string
severity:
type: string
uuid:
type: string
type: object
type: object
type: object
served: true
storage: false
371 changes: 371 additions & 0 deletions config/crd/bases/crd.lagoon.sh_lagoontasks.yaml
Original file line number Diff line number Diff line change
@@ -185,6 +185,377 @@ spec:
format: byte
type: string
type: object
statusMessages:
description: LagoonStatusMessages is where unsent messages are stored
for re-sending.
properties:
buildLogMessage:
description: LagoonLog is used to sendToLagoonLogs messaging queue
this is general logging information
properties:
event:
type: string
message:
type: string
meta:
description: LagoonLogMeta is the metadata that is used by logging
in Lagoon.
properties:
advancedData:
type: string
branchName:
type: string
buildName:
type: string
buildPhase:
type: string
buildStatus:
type: string
buildStep:
type: string
clusterName:
type: string
endTime:
type: string
environment:
type: string
environmentId:
type: integer
jobName:
type: string
jobStatus:
type: string
jobStep:
type: string
key:
type: string
logLink:
type: string
project:
type: string
projectId:
type: integer
projectName:
type: string
remoteId:
type: string
route:
type: string
routes:
items:
type: string
type: array
services:
items:
type: string
type: array
startTime:
type: string
task:
description: LagoonTaskInfo defines what a task can use to
communicate with Lagoon via SSH/API.
properties:
apiHost:
type: string
command:
type: string
id:
type: string
name:
type: string
service:
type: string
sshHost:
type: string
sshPort:
type: string
taskName:
type: string
required:
- id
type: object
type: object
project:
type: string
severity:
type: string
uuid:
type: string
type: object
environmentMessage:
description: LagoonMessage is used for sending build info back to
Lagoon messaging queue to update the environment or deployment
properties:
meta:
description: LagoonLogMeta is the metadata that is used by logging
in Lagoon.
properties:
advancedData:
type: string
branchName:
type: string
buildName:
type: string
buildPhase:
type: string
buildStatus:
type: string
buildStep:
type: string
clusterName:
type: string
endTime:
type: string
environment:
type: string
environmentId:
type: integer
jobName:
type: string
jobStatus:
type: string
jobStep:
type: string
key:
type: string
logLink:
type: string
project:
type: string
projectId:
type: integer
projectName:
type: string
remoteId:
type: string
route:
type: string
routes:
items:
type: string
type: array
services:
items:
type: string
type: array
startTime:
type: string
task:
description: LagoonTaskInfo defines what a task can use to
communicate with Lagoon via SSH/API.
properties:
apiHost:
type: string
command:
type: string
id:
type: string
name:
type: string
service:
type: string
sshHost:
type: string
sshPort:
type: string
taskName:
type: string
required:
- id
type: object
type: object
namespace:
type: string
type:
type: string
type: object
statusMessage:
description: LagoonLog is used to sendToLagoonLogs messaging queue
this is general logging information
properties:
event:
type: string
message:
type: string
meta:
description: LagoonLogMeta is the metadata that is used by logging
in Lagoon.
properties:
advancedData:
type: string
branchName:
type: string
buildName:
type: string
buildPhase:
type: string
buildStatus:
type: string
buildStep:
type: string
clusterName:
type: string
endTime:
type: string
environment:
type: string
environmentId:
type: integer
jobName:
type: string
jobStatus:
type: string
jobStep:
type: string
key:
type: string
logLink:
type: string
project:
type: string
projectId:
type: integer
projectName:
type: string
remoteId:
type: string
route:
type: string
routes:
items:
type: string
type: array
services:
items:
type: string
type: array
startTime:
type: string
task:
description: LagoonTaskInfo defines what a task can use to
communicate with Lagoon via SSH/API.
properties:
apiHost:
type: string
command:
type: string
id:
type: string
name:
type: string
service:
type: string
sshHost:
type: string
sshPort:
type: string
taskName:
type: string
required:
- id
type: object
type: object
project:
type: string
severity:
type: string
uuid:
type: string
type: object
taskLogMessage:
description: LagoonLog is used to sendToLagoonLogs messaging queue
this is general logging information
properties:
event:
type: string
message:
type: string
meta:
description: LagoonLogMeta is the metadata that is used by logging
in Lagoon.
properties:
advancedData:
type: string
branchName:
type: string
buildName:
type: string
buildPhase:
type: string
buildStatus:
type: string
buildStep:
type: string
clusterName:
type: string
endTime:
type: string
environment:
type: string
environmentId:
type: integer
jobName:
type: string
jobStatus:
type: string
jobStep:
type: string
key:
type: string
logLink:
type: string
project:
type: string
projectId:
type: integer
projectName:
type: string
remoteId:
type: string
route:
type: string
routes:
items:
type: string
type: array
services:
items:
type: string
type: array
startTime:
type: string
task:
description: LagoonTaskInfo defines what a task can use to
communicate with Lagoon via SSH/API.
properties:
apiHost:
type: string
command:
type: string
id:
type: string
name:
type: string
service:
type: string
sshHost:
type: string
sshPort:
type: string
taskName:
type: string
required:
- id
type: object
type: object
project:
type: string
severity:
type: string
uuid:
type: string
type: object
type: object
type: object
served: true
storage: false