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

Update Tags #15

Merged
merged 1 commit into from
Nov 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,22 @@ spec:
pause:
description: Pause, if true, will inhibit reconciliation.
type: boolean
tags:
description: Tags are aribrary user data.
items:
description: Tag is an arbirary key/value.
properties:
name:
description: Name of the tag.
type: string
value:
description: Value of the tag.
type: string
required:
- name
- value
type: object
type: array
type: object
status:
properties:
Expand Down
21 changes: 12 additions & 9 deletions charts/application/templates/applications.yaml

Large diffs are not rendered by default.

13 changes: 12 additions & 1 deletion charts/application/templates/server/clusterrole.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,26 @@ rules:
- apiGroups:
- unikorn-cloud.org
resources:
- applications
- helmapplications
verbs:
- list
- watch
- apiGroups:
- application.unikorn-cloud.org
resources:
- applicationsets
verbs:
- list
- watch
- create
- update
- delete
# Find project namespaces
- apiGroups:
- ""
resources:
- namespaces
- secrets
verbs:
- list
- watch
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ require (
github.com/spf13/pflag v1.0.5
github.com/spjmurray/go-sat v0.3.1
github.com/stretchr/testify v1.9.0
github.com/unikorn-cloud/core v0.1.83
github.com/unikorn-cloud/identity v0.2.44
github.com/unikorn-cloud/kubernetes v0.2.47
github.com/unikorn-cloud/core v0.1.86
github.com/unikorn-cloud/identity v0.2.45
github.com/unikorn-cloud/kubernetes v0.2.51
go.opentelemetry.io/otel/sdk v1.31.0
k8s.io/api v0.31.1
k8s.io/apimachinery v0.31.1
Expand Down Expand Up @@ -63,7 +63,7 @@ require (
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.60.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/unikorn-cloud/region v0.1.45 // indirect
github.com/unikorn-cloud/region v0.1.46 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.opentelemetry.io/otel v1.31.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.31.0 // indirect
Expand Down
16 changes: 8 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -135,14 +135,14 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
github.com/unikorn-cloud/core v0.1.83 h1:cF6DKskXk3FSs1W4Y8hgWypm7D+iLRpV09a8mpcuW5s=
github.com/unikorn-cloud/core v0.1.83/go.mod h1:wEKzCwAnIyTbo27l++Wl+gK95TAxMsFS3y3jbFB03aw=
github.com/unikorn-cloud/identity v0.2.44 h1:tXV/qsJ77Dkx8ba8gnBFXHWUgBNsJ2oo/5TjnyhkH7U=
github.com/unikorn-cloud/identity v0.2.44/go.mod h1:JMbS6iTYzt0OVt5AkqZys3WVnpLabGvUl8kGWcxzFZI=
github.com/unikorn-cloud/kubernetes v0.2.47 h1:dc2V0RWabhZ6hUwrRkdWVMI48eNq5oZbgAGS3RC1r+I=
github.com/unikorn-cloud/kubernetes v0.2.47/go.mod h1:CsQpKzcNjB7QNTN/G71n4vtfg4FhsEdjiDngvbL4kRo=
github.com/unikorn-cloud/region v0.1.45 h1:qpUwB+s/SEZNHZqwHTYovtWUVdJB2AKEl06NbiIwnOw=
github.com/unikorn-cloud/region v0.1.45/go.mod h1:QqWLEfB8bNRIUAU7h5JjkQsjyJdTV+2ltDYksRjKMds=
github.com/unikorn-cloud/core v0.1.86 h1:U8+V5CcTgWT0tVqM6nxlOqLmLP+43Zu0og3OzSe84aI=
github.com/unikorn-cloud/core v0.1.86/go.mod h1:wEKzCwAnIyTbo27l++Wl+gK95TAxMsFS3y3jbFB03aw=
github.com/unikorn-cloud/identity v0.2.45 h1:YFmw3uunwdZMuYiimv4lfU6s7iTtYoc22xJqLTrlOVg=
github.com/unikorn-cloud/identity v0.2.45/go.mod h1:WzNNv05ReDMLfWsOtq53uzhX2GU2nXDw76Bdsf3BPnM=
github.com/unikorn-cloud/kubernetes v0.2.51 h1:qnAI0puMlZEDLVzmVxJkXXHaF+Yna+Wop6jAo0O59bQ=
github.com/unikorn-cloud/kubernetes v0.2.51/go.mod h1:MTIy3q/xie266nIGl46iMGYh/Vob7F4eRRc6dfzrlrU=
github.com/unikorn-cloud/region v0.1.46 h1:LzyrBRej40YeOMr54zL2emkrqY1ypgOyYG8hDledlCU=
github.com/unikorn-cloud/region v0.1.46/go.mod h1:cofPuJjseRKE95xAqNa23nSL7/+LDXOBxNIHwwODpys=
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/unikorn/v1alpha1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ type ApplicationSet struct {
type ApplicationSetSpec struct {
// Pause, if true, will inhibit reconciliation.
Pause bool `json:"pause,omitempty"`
// Tags are aribrary user data.
Tags unikornv1core.TagList `json:"tags,omitempty"`
// Applications is a list of user requested applications to install.
Applications []ApplicationSpec `json:"applications,omitempty"`
}
Expand Down
5 changes: 5 additions & 0 deletions pkg/apis/unikorn/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/openapi/client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 8 additions & 5 deletions pkg/openapi/router.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

125 changes: 62 additions & 63 deletions pkg/openapi/schema.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions pkg/openapi/server.spec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,6 @@ components:
type: array
items:
$ref: '#/components/schemas/applicationVersion'
applicationTags:
description: A set of tags for filtering applications.
type: array
items:
description: An application tag.
type: string
applicationDependency:
description: An application dependency.
type: object
Expand Down Expand Up @@ -120,8 +114,6 @@ components:
format: byte
versions:
$ref: '#/components/schemas/applicationVersions'
tags:
$ref: '#/components/schemas/applicationTags'
applicationRead:
type: object
required:
Expand Down
Loading