Skip to content

Commit

Permalink
Merge release v0.1.2
Browse files Browse the repository at this point in the history
Release v0.1.2
  • Loading branch information
bdevcich committed Jul 16, 2024
2 parents a165eb0 + 97e3d88 commit b94a464
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 6 deletions.
22 changes: 20 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
#
# Copyright 2021-2024 Hewlett Packard Enterprise Development LP
# Other additional copyright holders may be indicated within.
#
# The entirety of this work is licensed under the Apache License,
# Version 2.0 (the "License"); you may not use this file except
# in compliance with the License.
#
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# Builder stage for compiling go source code
FROM golang:1.19 as builder
FROM golang:1.21 as builder

WORKDIR /workspace

Expand Down Expand Up @@ -31,4 +49,4 @@ COPY --from=builder /workspace/lustre-csi-driver .
# See mount.lustre description in sbin/README.md
COPY sbin/mount.lustre-cray /sbin/mount.lustre

ENTRYPOINT ["/lustre-csi-driver"]
ENTRYPOINT ["/lustre-csi-driver"]
2 changes: 1 addition & 1 deletion charts/lustre-csi-driver/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

deployment:
image: "ghcr.io/hewlettpackard/lustre-csi-driver"
tag: "0.1.1"
tag: "0.1.2"
2 changes: 1 addition & 1 deletion deploy/kubernetes/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ resources:
images:
- name: controller
newName: ghcr.io/hewlettpackard/lustre-csi-driver
newTag: 0.1.1
newTag: 0.1.2
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/HewlettPackard/lustre-csi-driver

go 1.19
go 1.21

require (
github.com/container-storage-interface/spec v1.5.0
Expand Down
36 changes: 35 additions & 1 deletion hack/make-kustomization.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

# Copyright 2023 Hewlett Packard Enterprise Development LP
# Copyright 2023-2024 Hewlett Packard Enterprise Development LP
# Other additional copyright holders may be indicated within.
#
# The entirety of this work is licensed under the Apache License,
Expand Down Expand Up @@ -29,10 +29,44 @@ then
mkdir "$OVERLAY_DIR"
fi

COMPONENT_LABELS="
- op: add
path: /metadata/labels/app.kubernetes.io~1version
value: "$TAG"
- op: add
path: /metadata/labels/app.kubernetes.io~1component
value: lustre-csi-driver
"

NNF_VER_LABELS=""
if [[ -n $NNF_VERSION ]]
then
NNF_VER_LABELS="
- op: add
path: /metadata/labels/app.kubernetes.io~1nnf-version
value: "$NNF_VERSION"
- op: add
path: /metadata/labels/app.kubernetes.io~1part-of
value: nnf
"
fi

cat <<EOF > "$OVERLAY_DIR"/kustomization.yaml
resources:
- ../$OVERLAY
patches:
- target:
kind: Deployment
patch: |-
$COMPONENT_LABELS
$NNF_VER_LABELS
- target:
kind: DaemonSet
patch: |-
$COMPONENT_LABELS
$NNF_VER_LABELS
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
Expand Down

0 comments on commit b94a464

Please sign in to comment.