Skip to content

Commit

Permalink
fix lint issue in docker file and usage of metal instead of ironcore …
Browse files Browse the repository at this point in the history
…in error and comments
  • Loading branch information
ushabelgur committed Sep 13, 2024
1 parent d551467 commit b1aceb7
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.23.1 as builder
FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder

ARG GOARCH=''

Expand Down Expand Up @@ -28,7 +28,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \

# Use distroless as minimal base image to package the manager binary
# Refer to https://github.com/GoogleContainerTools/distroless for more details
FROM gcr.io/distroless/static:nonroot as populator
FROM gcr.io/distroless/static:nonroot
WORKDIR /
COPY --from=builder /workspace/machine-controller .
USER 65532:65532
Expand Down
6 changes: 3 additions & 3 deletions kubernetes/secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: test-secret # Name of the secret
namespace: default # Namespace of the secret
data:
userData: "encoded-cloud-config" # IronCore cloud config file (base64 encoded)
kubeconfig: "abcdef123456" # IronCore api kubeconfig
namespace: "default" # IronCore namespace where resources should be created
userData: "encoded-cloud-config" # Metal cloud config file (base64 encoded)
kubeconfig: "abcdef123456" # Metal api kubeconfig
namespace: "default" # Metal namespace where resources should be created
type: Opaque
6 changes: 3 additions & 3 deletions pkg/metal/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ type metalDriver struct {
}

func (d *metalDriver) InitializeMachine(ctx context.Context, request *driver.InitializeMachineRequest) (*driver.InitializeMachineResponse, error) {
return nil, status.Error(codes.Unimplemented, "IronCore Provider does not yet implement InitializeMachine")
return nil, status.Error(codes.Unimplemented, "Metal Provider does not yet implement InitializeMachine")
}

func (d *metalDriver) GetVolumeIDs(_ context.Context, req *driver.GetVolumeIDsRequest) (*driver.GetVolumeIDsResponse, error) {
return nil, status.Error(codes.Unimplemented, "IronCore Provider does not yet implement GetVolumeIDs")
return nil, status.Error(codes.Unimplemented, "Metal Provider does not yet implement GetVolumeIDs")
}

// NewDriver returns a new Gardener ironcore driver object
// NewDriver returns a new Gardener metal driver object
func NewDriver(c client.Client, namespace, csiDriverName string) driver.Driver {
return &metalDriver{
metalClient: c,
Expand Down
2 changes: 1 addition & 1 deletion pkg/metal/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ func SetupTest() (*corev1.Namespace, *corev1.Secret, *driver.Driver) {
Expect(k8sClient.Create(ctx, ns)).To(Succeed(), "failed to create test namespace")
DeferCleanup(k8sClient.Delete, ns)

// create kubeconfig which we will use as the provider secret to create our ironcore machine
// create kubeconfig which we will use as the provider secret to create our metal machine
user, err := testEnv.AddUser(envtest.User{
Name: "dummy",
Groups: []string{"system:authenticated", "system:masters"},
Expand Down

0 comments on commit b1aceb7

Please sign in to comment.