Skip to content

Commit

Permalink
Update minio
Browse files Browse the repository at this point in the history
  • Loading branch information
divolgin committed Jul 29, 2021
1 parent 3524616 commit a6c1a7a
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 11 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/build-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@ jobs:
steps:
- name: push minio for e2e
run: |
docker pull minio/minio:RELEASE.2021-07-08T19-43-25Z
docker tag minio/minio:RELEASE.2021-07-08T19-43-25Z ttl.sh/automated-${{ github.run_id }}/minio:2h
docker pull minio/minio:RELEASE.2021-07-27T02-40-15Z
docker tag minio/minio:RELEASE.2021-07-27T02-40-15Z ttl.sh/automated-${{ github.run_id }}/minio:2h
docker push ttl.sh/automated-${{ github.run_id }}/minio:2h
- name: Scan minio for vulnerabilities
uses: aquasecurity/trivy-action@master
Expand Down Expand Up @@ -229,7 +229,7 @@ jobs:
strategy:
fail-fast: false
matrix:
k8s_version: [v1.18.18-k3s1,v1.19.10-k3s1,v1.20.6-k3s1]
k8s_version: [v1.18.19-k3s1,v1.19.11-k3s1,v1.20.7-k3s1]
steps:
- uses: debianmaster/actions-k3s@v1.0.3
id: k3s
Expand Down Expand Up @@ -358,7 +358,7 @@ jobs:
strategy:
fail-fast: false
matrix:
k8s_version: [v1.18.18-k3s1,v1.19.10-k3s1,v1.20.6-k3s1]
k8s_version: [v1.18.19-k3s1,v1.19.11-k3s1,v1.20.7-k3s1]
steps:
- uses: debianmaster/actions-k3s@v1.0.3
id: k3s
Expand Down Expand Up @@ -426,7 +426,7 @@ jobs:
strategy:
fail-fast: false
matrix:
k8s_version: [v1.18.18-k3s1,v1.19.10-k3s1,v1.20.6-k3s1]
k8s_version: [v1.18.19-k3s1,v1.19.11-k3s1,v1.20.7-k3s1]
steps:
- uses: debianmaster/actions-k3s@v1.0.3
id: k3s
Expand Down Expand Up @@ -503,7 +503,7 @@ jobs:
strategy:
fail-fast: false
matrix:
k8s_version: [v1.18.18-k3s1,v1.19.10-k3s1,v1.20.6-k3s1]
k8s_version: [v1.18.19-k3s1,v1.19.11-k3s1,v1.20.7-k3s1]
steps:
- uses: debianmaster/actions-k3s@v1.0.3
id: k3s
Expand Down Expand Up @@ -581,7 +581,7 @@ jobs:
strategy:
fail-fast: false
matrix:
k8s_version: [v1.18.18-k3s1,v1.19.10-k3s1,v1.20.6-k3s1]
k8s_version: [v1.18.19-k3s1,v1.19.11-k3s1,v1.20.7-k3s1]
steps:
- uses: debianmaster/actions-k3s@v1.0.3
id: k3s
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/kotsadm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ jobs:
id: scan
uses: anchore/scan-action@v2
with:
image: "minio/minio:RELEASE.2021-07-08T19-43-25Z"
image: "minio/minio:RELEASE.2021-07-27T02-40-15Z"
fail-build: false
acs-report-enable: true
severity-cutoff: high
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
include Makefile.build
CURRENT_USER := $(shell id -u -n)
MINIO_VERSION := RELEASE.2021-07-08T19-43-25Z
MINIO_VERSION := RELEASE.2021-07-27T02-40-15Z
POSTGRES_VERSION := 10.17-alpine

BUILDFLAGS = -tags='netgo containers_image_ostree_stub exclude_graphdriver_devicemapper exclude_graphdriver_btrfs containers_image_openpgp' -installsuffix netgo
Expand Down
1 change: 1 addition & 0 deletions hack/dependabot/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
FROM postgres:9.5
2 changes: 1 addition & 1 deletion pkg/kotsadm/objects/images.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ func GetAdminConsoleImage(deployOptions types.DeployOptions, imageKey string) st
}

func GetAdminConsoleImages(deployOptions types.DeployOptions) map[string]string {
minioTag := "RELEASE.2021-07-08T19-43-25Z"
minioTag := "RELEASE.2021-07-27T02-40-15Z"
postgresTag := getPostgresTag(deployOptions)

if deployOptions.KotsadmOptions.OverrideVersion != "" {
Expand Down
2 changes: 1 addition & 1 deletion pkg/snapshot/filesystem.go
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ func ensureFileSystemMinioDeployment(ctx context.Context, clientset kubernetes.I
}

func fileSystemMinioDeploymentResource(clientset kubernetes.Interface, secretChecksum string, deployOptions FileSystemDeployOptions, registryOptions kotsadmtypes.KotsadmOptions) (*appsv1.Deployment, error) {
image := "minio/minio:RELEASE.2021-07-08T19-43-25Z"
image := "minio/minio:RELEASE.2021-07-27T02-40-15Z"
imagePullSecrets := []corev1.LocalObjectReference{}

if !kotsutil.IsKurl(clientset) || deployOptions.Namespace != metav1.NamespaceDefault {
Expand Down

0 comments on commit a6c1a7a

Please sign in to comment.