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

[PLT-1309] Update docker images requirements documentation #644

Merged
merged 24 commits into from
Dec 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
8f5e503
[PLT-1309] Update docker images requirements documentation
unai-ttxu Dec 17, 2024
a0a3650
[PLT-1309] Update docker images requirements documentation
unai-ttxu Dec 17, 2024
1d53f13
[PLT-1309] Update docker images requirements documentation
unai-ttxu Dec 17, 2024
0687111
[PLT-1309] Update docker images requirements documentation
unai-ttxu Dec 18, 2024
5167904
[PLT-1309] Update docker images requirements documentation
unai-ttxu Dec 18, 2024
da193d4
[PLT-1309] Update docker images requirements documentation
unai-ttxu Dec 18, 2024
7154df9
[PLT-1309] Update docker images requirements documentation
unai-ttxu Dec 19, 2024
51edb0b
[PLT-1309] Update docker images requirements documentation
unai-ttxu Dec 19, 2024
3649403
[PLT-1309] Update docker images requirements documentation
unai-ttxu Dec 20, 2024
078262a
Merge branch 'branch-0.17.0-0.5' into task/PLT-1309
unai-ttxu Dec 20, 2024
809892b
[PLT-1309] Add stratio-capi-image image build to CICD flow
unai-ttxu Dec 26, 2024
1805d7e
[PLT-1309] Add stratio-capi-image image build to CICD flow
unai-ttxu Dec 26, 2024
ba791c7
Merge remote-tracking branch 'upstream/branch-0.17.0-0.5' into task/P…
unai-ttxu Dec 26, 2024
14ab6e9
[PLT-1309] Add stratio-capi-image to requirements
unai-ttxu Dec 26, 2024
85618ec
Fix cve-2023-38545
iamjanr Dec 26, 2024
c6cd5a1
More detailed information for change
iamjanr Dec 26, 2024
7ee9a61
Update pkg/cluster/internal/providers/docker/stratio/Dockerfile
iamjanr Dec 26, 2024
27a04b6
Merge pull request #1 from iamjanr/Fix-cve-2023-38545
unai-ttxu Dec 26, 2024
9f39673
[PLT-1309] Refactor Dockerfile dependencies management
unai-ttxu Dec 26, 2024
4f357d9
[PLT-1309] Refactor Dockerfile dependencies management
unai-ttxu Dec 26, 2024
c884289
[PLT-1309] Fix vulnerabilities
unai-ttxu Dec 27, 2024
d8d4da1
[PLT-1309] Fix vulnerabilities
unai-ttxu Dec 27, 2024
a06b738
Force PR build
unai-ttxu Dec 27, 2024
513ed12
Revert "[PLT-1309] Fix vulnerabilities"
unai-ttxu Dec 27, 2024
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
156 changes: 103 additions & 53 deletions DEPENDENCIES
Original file line number Diff line number Diff line change
@@ -1,63 +1,113 @@
core:
kind:
clusterctl: v1.5.3
cluster-api: v1.5.3
capi-kubeadm-bootstrap-system: v1.5.3
capi-kubeadm-control-plane-system: v1.5.3
cluster-operator:
cluster-operator-chart: v0.2.0-SNAPSHOT
cluster-operator: v0.2.0-SNAPSHOT
kube-rbac-proxy: v0.15.0
calico:
calicoctl: v3.26.1
tigera-operator: v1.30.5
cluster-autoscaler-chart: v9.29.1
cluster-autoscaler: v1.27.2
pause: v3.9
binaries:
clusterctl: v1.5.3
helm: v3.13.1
images:
calico:
cni: v3.26.1
csi: v3.26.1
ctl: v3.26.1
kube-controllers: v3.26.1
node-driver-registrar: v3.26.1
node: v3.26.1
pod2daemon-flexvol: v3.26.1
typha: v3.26.1
capi:
kubeadm-bootstrap-controller: v1.5.3
kubeadm-control-plane-controller: v1.5.3
cluster-api-controller: v1.5.3
cert-manager:
cert-manager-acmesolver: v1.12.3
cert-manager-cainjector: v1.12.3
cert-manager-controller: v1.12.3
cert-manager-ctl: v1.12.3
cert-manager-webhook: v1.12.3
cluster-autoscaler: v1.27.2
cluster-operator:
cluster-operator: 0.3.6
kube-rbac-proxy: v0.15.0
kind:
kindnetd: v20221004-44d545d1
node: v1.27.0
unai-ttxu marked this conversation as resolved.
Show resolved Hide resolved
stratio-capi-image: v1.27.0
tigera:
operator: v1.30.5
pause: v3.9
charts:
cert-manager: v1.12.3
cluster-autoscaler: v9.29.1
cluster-operator: 0.3.6
aws:
clusterawsadm: v2.2.1
cluster-api-aws: v2.2.1
cluster-api-aws-templates: v2.2.1
capa:
binaries:
clusterawsadm: v2.2.1
images:
cluster-api-aws-controller: v2.2.1
manifests:
metadata.yaml: v2.2.1
infrastructure-components.yaml: v2.2.1
managed:
aws-load-balancer-controller:1.6.2
eks-addons:
addons:
aws-ebs-csi-driver: v1.29.1-eksbuild.1
coredns: v1.10.1-eksbuild.7
kube-proxy: v1.24.15-eksbuild.2 # k8s 1.24-1.25
kube-proxy: v1.26.7-eksbuild.2 # k8s 1.26-...
kube-proxy: v1.24.15-eksbuild.2
kube-proxy: v1.26.7-eksbuild.2
vpc-cni: v1.27.10-eksbuild.2
charts:
aws-load-balancer-controller: v2.6.2
images:
aws-load-balancer-controller: v2.6.2
unmanaged:
aws-ebs-csi-driver-chart: v2.20.0
aws-ebs-csi-driver: v2.20.0
external-attacher: v4.3.0-eks-1-27-3
external-provisioner: v3.5.0-eks-1-27-3
external-resizer: v1.8.0-eks-1-27-3
csi-snapshotter: v6.2.1-eks-1-27-3
livenessprobe: v2.10.0-eks-1-27-3
node-driver-registrar: v2.8.0-eks-1-27-3
volume-modifier-for-k8s: v0.1.0
charts:
aws-ebs-csi-driver: v2.20.0
images:
aws-ebs-csi-driver: v1.20.0
csi-snapshotter: v6.2.1-eks-1-27-3
external-attacher: v4.3.0-eks-1-27-3
external-provisioner: v3.5.0-eks-1-27-3
external-resizer: v1.8.0-eks-1-27-3
livenessprobe: v2.10.0-eks-1-27-3
node-driver-registrar: v2.8.0-eks-1-27-3
volume-modifier-for-k8s: v0.1.0
azure:
cluster-api-azure: v1.11.4
cluster-api-azure-templates: v1.11.4
capz:
images:
azureserviceoperator: v2.3.0
cluster-api-azure-controller: v1.11.4
kube-rbac-proxy: v0.13.1
nmi: v1.8.14
manifests:
metadata.yaml: v1.11.4
infrastructure-components.yaml: v1.11.4
unmanaged:
cloud-provider-azure-chart: v1.28.5
azure-cloud-controller-manager: v1.24.18
azure-cloud-node-manager: v1.24.18
azuredisk-csi-driver-chart: v1.28.7
azuredisk-csi-driver: v1.28.7
azurefile-csi-driver-chart: v1.28.7
azurefile-csi-driver: v1.28.7
csi-provisioner: v3.3.0
csi-attacher: v4.0.0
csi-snapshotter: v5.0.1
csi-resizer: v1.6.0
livenessprobe: v2.8.0
charts:
azuredisk-csi-driver: v1.28.7
azurefile-csi-driver: v1.28.7
cloud-provider-azure: v1.28.5
images:
azure-cloud-controller-manager: v1.28.1
azure-cloud-node-manager: v1.28.1
azuredisk-csi: v1.28.7
azurefile-csi: v1.28.7
csi-attacher: v4.3.0
csi-node-driver-registrar: v2.8.0
csi-provisioner: v3.5.0
csi-resizer: v1.8.0
csi-snapshotter: v6.2.1
livenessprobe: v2.10.0
snapshot-controller: v6.2.1
gcp:
cluster-api-gcp: v1.6.1
cluster-api-gcp-templates: v1.6.1
gcp-compute-persistent-disk-csi-driver: v1.10.1
csi-node-driver-registrar: v2.7.0
csi-snapshotter: v6.1.0
csi-resizer: v1.7.0
csi-attacher: v4.2.0
csi-provisioner: v3.4.0
capg:
images:
cluster-api-gcp-controller: 1.6.1-0.2.1
manifests:
metadata.yaml: 1.6.1-0.2.1
infrastructure-components.yaml: 1.6.1-0.2.1
managed:
images:
csi-attacher: v4.2.0
csi-node-driver-registrar: v2.7.0
csi-provisioner: v3.4.0
csi-resizer: v1.7.0
csi-snapshotter: v6.1.0
gcp-compute-persistent-disk-csi-driver: v1.10.1
1 change: 1 addition & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ hose {
doPackage(conf: config, parameters: "GOCACHE=/tmp")
doDeploy(conf: config)
doCustomStage(conf:config, buildToolOverride: [CUSTOM_COMMAND: 'mkdir -p CTS/resources; tar zxvf bin/cloud-provisioner.tar.gz -C CTS/resources/; chmod -R 0700 CTS/resources/bin/cloud-provisioner'], stageName: "Extract binary")
doDocker(conf: config, image:"stratio-capi-image", dockerfile: "pkg/cluster/internal/providers/docker/stratio/Dockerfile")
doGrypeScan(conf: config, artifactsList: [[path: 'CTS/resources/bin/cloud-provisioner', name: 'cloud-provisioner']])
doAT(conf: config, buildToolOverride: ['BUILDTOOL_IMAGE': 'stratio/cloud-testing-suite:0.1.0-SNAPSHOT', 'BUILDTOOL_PRIVILEGED': true, 'BUILDTOOL_RUNASUSER': "0"], configFiles: [[fileId: "clouds-credentials.yaml", variable: "credentials"]], runOnPR: true)
}
Expand Down
1 change: 1 addition & 0 deletions bin/images/aws/imagenes-aws-load-balancer-controller.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
public.ecr.aws/eks/aws-load-balancer-controller:v2.6.2
7 changes: 7 additions & 0 deletions bin/images/aws/imagenes-ebs-csi-driver.txt
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.20.0
public.ecr.aws/ebs-csi-driver/volume-modifier-for-k8s:v0.1.0
public.ecr.aws/eks-distro/kubernetes-csi/external-attacher:v4.3.0-eks-1-27-3
public.ecr.aws/eks-distro/kubernetes-csi/external-provisioner:v3.5.0-eks-1-27-3
public.ecr.aws/eks-distro/kubernetes-csi/external-resizer:v1.8.0-eks-1-27-3
public.ecr.aws/eks-distro/kubernetes-csi/external-snapshotter/csi-snapshotter:v6.2.1-eks-1-27-3
public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe:v2.10.0-eks-1-27-3
public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar:v2.8.0-eks-1-27-3
6 changes: 0 additions & 6 deletions bin/images/aws/imagenes-eks-distro.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.28.3
mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.28.3
mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.10.0
mcr.microsoft.com/oss/kubernetes-csi/csi-resizer:v1.8.0
mcr.microsoft.com/oss/kubernetes-csi/csi-snapshotter:v6.2.1
mcr.microsoft.com/oss/kubernetes-csi/csi-snapshotter:v6.2.2
mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:v1.28.7
mcr.microsoft.com/oss/kubernetes-csi/csi-attacher:v4.3.0
mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.8.0
mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v3.5.0
mcr.microsoft.com/oss/kubernetes-csi/csi-resizer:v1.8.0
mcr.microsoft.com/oss/kubernetes-csi/csi-snapshotter:v6.2.1
mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.10.0
mcr.microsoft.com/oss/kubernetes-csi/snapshot-controller:v6.2.1
8 changes: 8 additions & 0 deletions bin/images/azure/imagenes-azurefile-csi-driver.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:v1.28.7
mcr.microsoft.com/oss/kubernetes-csi/csi-attacher:v4.3.0
mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.8.0
mcr.microsoft.com/oss/kubernetes-csi/csi-provisioner:v3.5.0
mcr.microsoft.com/oss/kubernetes-csi/csi-resizer:v1.8.0
mcr.microsoft.com/oss/kubernetes-csi/csi-snapshotter:v6.2.1
mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:v2.10.0
mcr.microsoft.com/oss/kubernetes-csi/snapshot-controller:v6.2.1
5 changes: 3 additions & 2 deletions bin/images/azure/imagenes-capz.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
mcr.microsoft.com/oss/azure/aad-pod-identity/nmi:v1.8.14
registry.k8s.io/cluster-api-azure/cluster-api-azure-controller:v1.11.4
gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1
mcr.microsoft.com/k8s/azureserviceoperator:v2.3.0
mcr.microsoft.com/oss/azure/aad-pod-identity/nmi:v1.8.14
registry.k8s.io/cluster-api-azure/cluster-api-azure-controller:v1.11.4
2 changes: 0 additions & 2 deletions bin/images/azure/imagenes-cloud-controller.txt

This file was deleted.

2 changes: 0 additions & 2 deletions bin/images/azure/imagenes-cloud-node.txt

This file was deleted.

2 changes: 2 additions & 0 deletions bin/images/azure/imagenes-cloud-provider-azure.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
mcr.microsoft.com/oss/kubernetes/azure-cloud-controller-manager:v1.28.1
mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:v1.28.1
3 changes: 0 additions & 3 deletions bin/images/azure/imagenes-csi-azuredisk-node.txt

This file was deleted.

3 changes: 0 additions & 3 deletions bin/images/azure/imagenes-csi-azurefile-node.txt

This file was deleted.

16 changes: 8 additions & 8 deletions bin/images/commons/imagenes-calico.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
docker.io/calico/kube-controllers:v3.26.1
docker.io/calico/typha:v3.26.1
docker.io/calico/node:v3.26.1
docker.io/calico/csi:v3.26.1
docker.io/calico/node-driver-registrar:v3.26.1
docker.io/calico/ctl:v3.26.1
docker.io/calico/cni:v3.26.1
docker.io/calico/pod2daemon-flexvol:v3.26.1
quay.io/calico/cni:v3.26.1
quay.io/calico/csi:v3.26.1
quay.io/calico/ctl:v3.26.1
quay.io/calico/kube-controllers:v3.26.1
quay.io/calico/node-driver-registrar:v3.26.1
quay.io/calico/node:v3.26.1
quay.io/calico/pod2daemon-flexvol:v3.26.1
quay.io/calico/typha:v3.26.1
11 changes: 3 additions & 8 deletions bin/images/commons/imagenes-cert-manager.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
quay.io/jetstack/cert-manager-controller:v1.12.3
quay.io/jetstack/cert-manager-cainjector:v1.12.3
quay.io/jetstack/cert-manager-webhook:v1.12.3
quay.io/jetstack/cert-manager-acmesolver:v1.12.3
quay.io/jetstack/cert-manager-cainjector:v1.12.3
quay.io/jetstack/cert-manager-controller:v1.12.3
quay.io/jetstack/cert-manager-ctl:v1.12.3
quay.io/jetstack/cert-manager-controller:v1.13.1
quay.io/jetstack/cert-manager-cainjector:v1.13.1
quay.io/jetstack/cert-manager-webhook:v1.13.1
quay.io/jetstack/cert-manager-acmesolver:v1.13.1
quay.io/jetstack/cert-manager-ctl:v1.13.1
quay.io/jetstack/cert-manager-webhook:v1.12.3
2 changes: 2 additions & 0 deletions bin/images/commons/imagenes-cluster-operator.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
gcr.io/kubebuilder/kube-rbac-proxy:v0.15.0
stratio-releases.repo.stratio.com/stratio/cluster-operator:0.3.6
2 changes: 0 additions & 2 deletions bin/images/commons/imagenes-commons.txt

This file was deleted.

2 changes: 2 additions & 0 deletions bin/images/commons/imagenes-kind.txt
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
docker.io/kindest/kindnetd:v20221004-44d545d1
docker.io/kindest/node:v1.27.0
stratio-releases.repo.stratio.com/stratio/stratio-capi-image:0.17.0-0.5.8
2 changes: 1 addition & 1 deletion bin/images/gcp/imagenes-capg.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
registry.k8s.io/cluster-api-gcp/cluster-api-gcp-controller:v1.4.0@sha256:742ebf999137f4ab83c83b408793e2c97a1311adebe3b0c0e7e7317a122f26df
stratio-releases.repo.stratio.com/stratio/cluster-api-gcp-controller:1.6.1-0.2.1
2 changes: 0 additions & 2 deletions bin/images/gcp/imagenes-csi-node.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.7.0
registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.10.1
registry.k8s.io/sig-storage/csi-provisioner:v3.4.0
registry.k8s.io/sig-storage/csi-attacher:v4.2.0
registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.7.0
registry.k8s.io/sig-storage/csi-provisioner:v3.4.0
registry.k8s.io/sig-storage/csi-resizer:v1.7.0
registry.k8s.io/sig-storage/csi-snapshotter:v6.1.0
registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver:v1.10.1
4 changes: 2 additions & 2 deletions docs/GCP/GKE Bastion.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,11 @@ sudo gsutil cp gs://gke-vm-base-bastion/resources/autoscaler-trigger-deployment.
gcloud auth configure-docker europe-docker.pkg.dev

# Pull images
sudo docker pull europe-docker.pkg.dev/clusterapi-369611/keos/stratio-capi-image:v1.27.0
sudo docker pull stratio-releases.repo.stratio.com/stratio/stratio-capi-image:0.17.0-0.5.8


# Tag image to stratio-capi-image:v1.27.0
sudo docker tag europe-docker.pkg.dev/clusterapi-369611/keos/stratio-capi-image:v1.27.0 stratio-capi-image:v1.27.0
sudo docker tag stratio-releases.repo.stratio.com/stratio/stratio-capi-image:0.17.0-0.5.8 stratio-capi-image:v1.27.0

# Add CLOUDSDK_PYTHON_SITEPACKAGES=1 to .bashrc and .profile (avoid numpy issues)
echo 'export CLOUDSDK_PYTHON_SITEPACKAGES=1' >> ~/.bashrc
Expand Down
17 changes: 11 additions & 6 deletions pkg/cluster/internal/providers/docker/stratio/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
ARG DOCKER_REG=docker.io
ARG IMAGE_VERSION=v1.27.0
FROM ${DOCKER_REG}/kindest/node:${IMAGE_VERSION}
FROM kindest/node:${IMAGE_VERSION}

# Init feature gates
ENV CLUSTER_TOPOLOGY=true
Expand Down Expand Up @@ -31,10 +30,16 @@ ENV CAPG=v1.6.1
ENV CAPZ=v1.11.4
ENV CAPG_FORK_URL="https://github.com/Stratio/cluster-api-provider-gcp/releases/download/1.6.1-0.2.1/"

# Install vim
RUN apt-get update && apt-get install -y \
vim python3-pip git \
&& rm -rf /var/lib/apt/lists/*
# Install and update dependencies
RUN apt-get update \
&& apt-get install -y curl \
git \
libc-bin \
libnghttp2-14 \
python3-pip \
vim \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

# Add aliases
RUN echo 'alias k="kubectl"' >> ~/.bash_aliases \
Expand Down