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.

Sign up for GitHub

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

Jump to bottom

Add in Ephemeral SSH Support #53

Merged
merged 1 commit into from
Aug 30, 2024
Merged

Add in Ephemeral SSH Support #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ FLAGS=-trimpath -ldflags '-X $(MODULE)/pkg/constants.Version=$(VERSION) -X $(MOD
LINT_VERSION=v1.59.1

# Defines the version of the CRD generation tools to use.
CONTROLLER_TOOLS_VERSION=v0.14.0
CONTROLLER_TOOLS_VERSION=v0.16.1

# Defines the version of code generator tools to use.
# This should be kept in sync with the Kubenetes library versions defined in go.mod.
Expand Down
2 changes: 1 addition & 1 deletion charts/region/crds/region.unikorn-cloud.org_identities.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.1
name: identities.region.unikorn-cloud.org
spec:
group: region.unikorn-cloud.org
Expand Down
10 changes: 9 additions & 1 deletion charts/region/crds/region.unikorn-cloud.org_openstackidentities.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.1
name: openstackidentities.region.unikorn-cloud.org
spec:
group: region.unikorn-cloud.org
Expand Down Expand Up @@ -73,6 +73,14 @@ spec:
description: ServerGroupID is the ID of the server group created for
the identity.
type: string
sshKeyName:
description: SSHKeyName is the ssh key that may be injected into clusters
by consuming services.
type: string
sshPrivateKey:
description: SSHPrivateKey is a PEM encoded private key.
format: byte
type: string
userID:
description: UserID is the ID of the user created for the identity.
type: string
Expand Down
2 changes: 1 addition & 1 deletion charts/region/crds/region.unikorn-cloud.org_openstackphysicalnetworks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.1
name: openstackphysicalnetworks.region.unikorn-cloud.org
spec:
group: region.unikorn-cloud.org
Expand Down
2 changes: 1 addition & 1 deletion charts/region/crds/region.unikorn-cloud.org_physicalnetworks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.1
name: physicalnetworks.region.unikorn-cloud.org
spec:
group: region.unikorn-cloud.org
Expand Down
2 changes: 1 addition & 1 deletion charts/region/crds/region.unikorn-cloud.org_regions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.1
name: regions.region.unikorn-cloud.org
spec:
group: region.unikorn-cloud.org
Expand Down
2 changes: 1 addition & 1 deletion charts/region/crds/region.unikorn-cloud.org_vlanallocations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.1
name: vlanallocations.region.unikorn-cloud.org
spec:
group: region.unikorn-cloud.org
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ require (
go.opentelemetry.io/otel v1.29.0
go.opentelemetry.io/otel/sdk v1.29.0
go.opentelemetry.io/otel/trace v1.29.0
golang.org/x/crypto v0.26.0
k8s.io/api v0.31.0
k8s.io/apimachinery v0.31.0
sigs.k8s.io/controller-runtime v0.19.0
Expand Down Expand Up @@ -73,7 +74,6 @@ require (
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/oauth2 v0.22.0 // indirect
Expand Down
4 changes: 4 additions & 0 deletions pkg/apis/unikorn/v1alpha1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,10 @@ type OpenstackIdentitySpec struct {
ApplicationCredentialSecret *string `json:"applicationCredentialSecret,omitempty"`
// ServerGroupID is the ID of the server group created for the identity.
ServerGroupID *string `json:"serverGroupID,omitempty"`
// SSHKeyName is the ssh key that may be injected into clusters by consuming services.
SSHKeyName *string `json:"sshKeyName,omitempty"`
// SSHPrivateKey is a PEM encoded private key.
SSHPrivateKey []byte `json:"sshPrivateKey,omitempty"`
}

type OpenstackIdentityStatus struct{}
Expand Down
10 changes: 10 additions & 0 deletions pkg/apis/unikorn/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

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

1 change: 1 addition & 0 deletions pkg/handler/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ func (h *Handler) convertIdentity(ctx context.Context, in *unikornv1.Identity) *
UserId: openstackIdentity.Spec.UserID,
ProjectId: openstackIdentity.Spec.ProjectID,
ServerGroupId: openstackIdentity.Spec.ServerGroupID,
SshKeyName: openstackIdentity.Spec.SSHKeyName,
}

if openstackIdentity.Spec.CloudConfig != nil {
Expand Down
Loading
Loading