Skip to content

discontinue support of OCI hook #92

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

Open
enp0s3 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

discontinue support of OCI hook #92

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
1 change: 0 additions & 1 deletion Containerfile.wasp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ FROM fedora:38

# Copy the binary from the builder stage to the final image
COPY --from=builder /workdir/app/wasp /app/wasp
COPY OCI-hook /app/OCI-hook

# Set the working directory to /app
WORKDIR /app
Expand Down
14 changes: 0 additions & 14 deletions OCI-hook/hook.sh
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions OCI-hook/swap-for-burstable.json
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions pkg/wasp/application.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ func Execute() {
flag.Parse()

setCrioSocketSymLink()
setOCIHook()

var app = WaspApp{}
swapUtilizationThresholdFactorStr := os.Getenv("SWAP_UTILIZATION_THRESHOLD_FACTOR")
Expand Down Expand Up @@ -201,18 +200,6 @@ func setCrioSocketSymLink() {
}
}

func setOCIHook() {
err := moveFile("/app/OCI-hook/hook.sh", "/host/opt/oci-hook-swap.sh")
if err != nil {
klog.Warningf(err.Error())
return
}
err = moveFile("/app/OCI-hook/swap-for-burstable.json", "/host/run/containers/oci/hooks.d/swap-for-burstable.json")
if err != nil {
klog.Warningf(err.Error())
}
}

func moveFile(sourcePath, destPath string) error {
inputFile, err := os.Open(sourcePath)
if err != nil {
Expand Down