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.

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

chore: bump 3.3.10 -> 3.4.16 #21

Merged
merged 2 commits into from
Jun 5, 2024
Merged
Changes from all commits
Commits
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
40 changes: 9 additions & 31 deletions argoexec/rockcraft.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
#!/usr/bin/env python3
# Copyright 2023 Canonical Ltd.
# See LICENSE file for licensing details.

# Based on: https://github.com/argoproj/argo-workflows/blob/v3.4.16/Dockerfile
name: argoexec
summary: An image for Argo Workflows executor.
description: |
This image is used as part of the Charmed Kubeflow product. An Argo workflow executor is a process that conforms to a specific interface that allows Argo to perform certain actions like monitoring pod logs, collecting artifacts, managing container lifecycles, etc.
license: Apache-2.0
base: [email protected]
version: "3.3.10"
version: "3.4.16"
run-user: _daemon_
services:
argoexec:
Expand All @@ -35,60 +34,39 @@ parts:
- netbase
- tzdata

base-snaps:
plugin: nil
stage-snaps:
- docker
- kubectl/1.24/stable
organize:
docker: bin/docker
kubectl: bin/kubectl
stage:
- bin/docker
- bin/kubectl

builder:
plugin: make
after: [base-deps]
source: https://github.com/argoproj/argo-workflows
source-type: git
source-tag: v3.3.10
source-tag: v3.4.16
build-snaps:
- go/1.17/stable
- go/1.20/stable
build-packages:
- git
misohu marked this conversation as resolved.
Show resolved Hide resolved
- make
- ca-certificates
- wget
- curl
- gcc
- make
- mailcap
- procps
- tar
- libcap2-bin
- libcap2-dev
- jq
- zip
stage-packages:
- git
- libcap2
- jq
- tar
- gzip
override-build: |
# builder stage https://github.com/argoproj/argo-workflows/blob/v3.3.10/Dockerfile#L36
# builder stage https://github.com/argoproj/argo-workflows/blob/v3.4.16/Dockerfile#L21
go mod download

# reset LDFLAGS because Go has different format, i.e. '-L' is undefined in Go
LDFLAGS=""

# argoexec-build stage https://github.com/argoproj/argo-workflows/blob/v3.3.10/Dockerfile#L82
cat .dockerignore >> .gitignore
git status --porcelain | cut -c4- | xargs git update-index --skip-worktree
# argoexec-build stage https://github.com/argoproj/argo-workflows/blob/v3.4.16/Dockerfile#L46
make dist/argoexec
setcap CAP_SYS_PTRACE,CAP_SYS_CHROOT+ei dist/argoexec
DnPlas marked this conversation as resolved.
Show resolved Hide resolved

# argoexec stage https://github.com/argoproj/argo-workflows/blob/v3.3.10/Dockerfile#L132
# argoexec stage https://github.com/argoproj/argo-workflows/blob/v3.4.16/Dockerfile#L79
install -DT "./dist/argoexec" "$CRAFT_PART_INSTALL/bin/argoexec"
install -DT "/etc/mime.types" "$CRAFT_PART_INSTALL/etc/mime.types"

Expand All @@ -98,7 +76,7 @@ parts:
source: https://github.com/argoproj/argo-workflows
source-type: git
source-subdir: hack
source-tag: v3.3.10
source-tag: v3.4.16
organize:
ssh_known_hosts: etc/ssh/ssh_known_hosts
nsswitch.conf: etc/ssh/nsswitch.conf
Expand Down
Loading