Skip to content

Commit

Permalink
Base cluster-update.sh to define needed link_multus_into_k3s
Browse files Browse the repository at this point in the history
The remaining contents of this file coming in another PR

Signed-off-by: Andrew Durbin <[email protected]>
  • Loading branch information
andrewd-zededa authored and eriknordmark committed Nov 28, 2024
1 parent 3896403 commit ac7d300
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 0 deletions.
2 changes: 2 additions & 0 deletions pkg/kube/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ COPY cluster-init.sh /usr/bin/
COPY cluster-utils.sh /usr/bin/
COPY cgconfig.conf /etc

COPY cluster-update.sh /usr/bin/

# k3s
COPY install-etcdctl.sh /usr/bin/
RUN mkdir -p /etc/rancher/k3s
Expand Down
2 changes: 2 additions & 0 deletions pkg/kube/cluster-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ CLUSTER_WAIT_FILE="/run/kube/cluster-change-wait-ongoing"
# Source the utility script, Dockerfile copies the script to /usr/bin
# shellcheck source=/dev/null
. /usr/bin/cluster-utils.sh
# shellcheck source=pkg/kube/cluster-update.sh
. /usr/bin/cluster-update.sh

# get cluster IP address from the cluster status file
get_cluster_node_ip() {
Expand Down
8 changes: 8 additions & 0 deletions pkg/kube/cluster-update.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/sh
#
# Copyright (c) 2024 Zededa, Inc.
# SPDX-License-Identifier: Apache-2.0

link_multus_into_k3s() {
ln -s /var/lib/cni/bin/multus /var/lib/rancher/k3s/data/current/bin/multus
}

0 comments on commit ac7d300

Please sign in to comment.