Skip to content

build: update dependencies #1241

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

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion .github/workflows/podman-aws-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
aws-region: us-west-2

- name: Download GoReleaser
run: go install github.com/goreleaser/goreleaser/v2@v2.2.0
run: go install github.com/goreleaser/goreleaser/v2@v2.5.0

- name: Build snapshot
run: |-
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-kib.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
cache: true

- name: Download GoReleaser
run: go install github.com/goreleaser/goreleaser/v2@v2.2.0
run: go install github.com/goreleaser/goreleaser/v2@v2.5.0

- name: Docker Login
uses: docker/login-action@v3
Expand Down
10 changes: 7 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FROM ${BASE} as devkit

ARG TARGETPLATFORM
# hadolint ignore=DL3029
FROM --platform=${TARGETPLATFORM} alpine:3.17.5
FROM --platform=${TARGETPLATFORM} alpine:3.19.4

ENV ANSIBLE_PATH=/usr
ENV PYTHON_PATH=/usr
Expand All @@ -23,8 +23,12 @@ RUN apk add --no-cache \
py3-cryptography \
py3-pip \
py3-wheel \
xorriso \
&& pip3 install --no-cache-dir --requirement /tmp/requirements.txt \
xorriso
# Use --break-system-packages as we do want install these packages into the system Python
RUN pip3 install \
--break-system-packages \
--no-cache-dir \
--requirement /tmp/requirements.txt \
&& rm -rf /root/.cache

ARG BUILDARCH
Expand Down
37 changes: 20 additions & 17 deletions Dockerfile.devkit
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
FROM --platform=linux/amd64 mesosphere/packer:1.9.5-nkp.1 as packer-amd64
# hadolint ignore=DL3029
FROM --platform=linux/arm64 mesosphere/packer:1.9.5-nkp.1 as packer-arm64
FROM golangci/golangci-lint:v1.56.2-alpine as golangci-lint
FROM goreleaser/goreleaser:v1.24.0 as goreleaser
FROM docker:27.1 as docker
FROM vmware/govc:v0.36.0 as govc
FROM golangci/golangci-lint:v1.62.2-alpine as golangci-lint
FROM goreleaser/goreleaser:v2.5.0 as goreleaser
FROM docker:27.4 as docker
FROM vmware/govc:v0.46.3 as govc

FROM golang:1.19.13-alpine3.18 as builder
FROM golang:1.22.10-alpine3.20 as builder

# NOTE(jkoelker) since this is a multistage build we
# can have an explosion at the layer
Expand All @@ -24,10 +24,8 @@ RUN apk add --no-cache \
ARG BUILDARCH

# NOTE(jkoelker) From here we care about layers
FROM golang:1.19.13-alpine3.18
FROM golang:1.22.10-alpine3.19

ARG ANSIBLE_VERSION=6.3.0
ARG DOCKER_PY_VERSION=5.0.3
ENV ANSIBLE_PATH=/usr
ENV PYTHON_PATH=/usr

Expand All @@ -53,22 +51,27 @@ RUN apk add --no-cache \
python3-dev \
gettext \
py3-pynacl \
py3-pip \
&& pip3 install --no-cache-dir --upgrade pip wheel \
&& pip3 install --no-cache-dir \
py3-pip
# Use --break-system-packages as we do want install these packages into the system Python
RUN pip3 install \
--break-system-packages \
--no-cache-dir \
--upgrade pip wheel \
&& pip3 install \
--break-system-packages \
--no-cache-dir \
--requirement /tmp/requirements.txt \
--requirement /tmp/requirements-devkit.txt \
&& rm -rf \
/root/.cache
&& rm -rf /root/.cache

# Managing the below ansible dependencies is covered in docs/dev/ansible-modules.md
RUN mkdir -p /usr/share/ansible/collections \
&& ansible-galaxy \
collection install \
community.general:==6.4.0 \
ansible.netcommon:==5.0.0 \
ansible.posix:==1.5.1 \
ansible.utils:==2.9.0 \
community.general:==10.1.0 \
ansible.netcommon:==7.1.0 \
ansible.posix:==1.6.2 \
ansible.utils:==5.1.2 \
-p /usr/share/ansible/collections

# hadolint ignore=DL4006
Expand Down
2 changes: 1 addition & 1 deletion ansible/molecule/ec2/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
sysprep: false

- name: "Include Provision"
include: ../../provision.yaml
include_tasks: ../../provision.yaml
2 changes: 1 addition & 1 deletion ansible/molecule/ec2_full/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@
- nvidia

- name: "Include Provision"
include: ../../provision.yaml
include_tasks: ../../provision.yaml
2 changes: 1 addition & 1 deletion ansible/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ molecule-ec2
ansible-lint
boto
boto3
ansible-core==2.13.7
ansible-core==2.18.1
yamllint
pytest-testinfra
10 changes: 5 additions & 5 deletions ansible/roles/containerd/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@
mode: 0644
when: http_proxy is defined or https_proxy is defined or no_proxy is defined

- include: redhat.yaml
- include_tasks: redhat.yaml
when: ansible_os_family == "RedHat"

- include: suse.yaml
- include_tasks: suse.yaml
when: ansible_os_family == "Suse"

- include: debian.yaml
- include_tasks: debian.yaml
when: ansible_os_family == "Debian"

- include: install.yaml
- include_tasks: install.yaml
when: ansible_os_family != "Flatcar"

- include: install-flatcar.yaml
- include_tasks: install-flatcar.yaml
when: ansible_os_family == "Flatcar"

- name: enable containerd
Expand Down
8 changes: 4 additions & 4 deletions ansible/roles/kubeadm/tasks/main.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
---
- include: redhat.yaml
- include_tasks: redhat.yaml
when: ansible_os_family == "RedHat"

- include: suse.yaml
- include_tasks: suse.yaml
when: ansible_os_family == "Suse"

- include: flatcar.yaml
- include_tasks: flatcar.yaml
when: ansible_os_family == "Flatcar"

- include: debian.yaml
- include_tasks: debian.yaml
when: ansible_os_family == "Debian"

- name: remove swapfile
Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/packages/tasks/flatcar.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
state: directory
mode: 0755

- include: url.yaml
- include_tasks: url.yaml

- name: Get crictl version
command: crictl --version
Expand All @@ -16,7 +16,7 @@
system_crictl_version: "{{ system_crictl_version_cmd.stdout | regex_replace('^crictl version v(?P<version>.*)$', '\\g<version>', multiline=True) }}"
# must include crictl-url.yml after installing containerd,
# as the cri-containerd tarball also includes crictl.
- include: crictl-url.yaml
- include_tasks: crictl-url.yaml
when: crictl_version != system_crictl_version

- name: create kubelet systemd directory
Expand Down
10 changes: 5 additions & 5 deletions ansible/roles/packages/tasks/main.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
---
- include: redhat.yaml
- include_tasks: redhat.yaml
when: ansible_os_family == "RedHat"

- include: suse.yaml
- include_tasks: suse.yaml
when: ansible_os_family == "Suse"

- include: flatcar.yaml
- include_tasks: flatcar.yaml
when: ansible_os_family == "Flatcar"

- include: debian.yaml
- include_tasks: debian.yaml
when: ansible_os_family == "Debian"

- include: config.yaml
- include_tasks: config.yaml
10 changes: 5 additions & 5 deletions ansible/roles/repo/tasks/main.yaml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
---
- include: redhat.yaml
- include_tasks: redhat.yaml
when:
- ansible_facts['os_family'] == "RedHat"
- not offline_mode_enabled

- include: redhat-offline.yaml
- include_tasks: redhat-offline.yaml
when:
- ansible_facts['os_family'] == "RedHat"
- offline_mode_enabled

- include: suse.yaml
- include_tasks: suse.yaml
when: ansible_facts['os_family'] == "Suse"

- include: debian.yaml
- include_tasks: debian.yaml
when:
- ansible_facts['os_family'] == "Debian"
- not offline_mode_enabled

- include: debian-offline.yaml
- include_tasks: debian-offline.yaml
when:
- ansible_facts['os_family'] == "Debian"
- offline_mode_enabled
2 changes: 1 addition & 1 deletion ansible/roles/rhck_kernel/tasks/main.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
---
- include: oracle.yaml
- include_tasks: oracle.yaml
when: ansible_distribution == "OracleLinux"
4 changes: 2 additions & 2 deletions ansible/roles/setup_versionlock/tasks/main.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
- include: redhat.yaml
- include_tasks: redhat.yaml
when: ansible_os_family == "RedHat"

- include: suse.yaml
- include_tasks: suse.yaml
when: ansible_os_family == "Suse"
34 changes: 16 additions & 18 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ module github.com/mesosphere/konvoy-image-builder

go 1.22

toolchain go1.22.5
toolchain go1.22.10

require (
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute v1.0.0
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.1.1
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0
github.com/blang/semver v3.5.1+incompatible
github.com/brianvoe/gofakeit/v6 v6.28.0
github.com/coreos/go-semver v0.3.1
Expand All @@ -18,38 +18,36 @@ require (
github.com/mitchellh/pointerstructure v1.2.1
github.com/onrik/logrus v0.11.0
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.30.0
github.com/onsi/gomega v1.36.1
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.8.0
github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.9.0
golang.org/x/term v0.18.0
golang.org/x/term v0.27.0
gopkg.in/yaml.v2 v2.4.0
)

require (
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/uuid v1.5.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/kr/pretty v0.2.0 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading
Loading