Skip to content

Commit

Permalink
v5.0.17 assets (#2270)
Browse files Browse the repository at this point in the history
* Release v5.0.17 assets

Signed-off-by: pjuarezd <[email protected]>

* Run github actions checks on backport branches v5.0.x

Signed-off-by: pjuarezd <[email protected]>

* Add generated assets for Operator console v5.0.17

Signed-off-by: pjuarezd <[email protected]>

* Fix test for backport

Signed-off-by: pjuarezd <[email protected]>

---------

Signed-off-by: pjuarezd <[email protected]>
  • Loading branch information
pjuarezd authored Aug 14, 2024
1 parent 2e51bd3 commit 3c72532
Show file tree
Hide file tree
Showing 156 changed files with 898 additions and 1,187 deletions.
1 change: 1 addition & 0 deletions .github/workflows/goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
types: [opened, reopened, synchronize]
branches:
- 'release*'
- 'v5.0.*'
- 'master'

jobs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/kubernetes-tests.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Tenant Tests On Kind
on:
pull_request:
branches: [ master ]
branches: [ v5.0.* ]
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref }}
cancel-in-progress: true
Expand Down Expand Up @@ -174,7 +174,7 @@ jobs:
key: ${{ runner.os }}-binary-${{ github.run_id }}
- name: Tenant upgrade test on Kind
run: |
"${GITHUB_WORKSPACE}/testing/deploy-tenant-upgrade.sh"
"${GITHUB_WORKSPACE}/testing/deploy-tenant-upgrade.sh" "5.0.16"
test-kes:
timeout-minutes: 30
runs-on: ${{ matrix.os }}
Expand Down
30 changes: 18 additions & 12 deletions .github/workflows/ui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: UI
on:
pull_request:
branches:
- master
- v5.0.*
push:
branches:
- master
- v5.0.*

# This ensures that previous jobs for the PR are canceled when the PR is
# updated.
Expand All @@ -15,7 +15,6 @@ concurrency:
cancel-in-progress: true

jobs:

semgrep-static-code-analysis:
timeout-minutes: 30
name: "semgrep checks"
Expand Down Expand Up @@ -128,12 +127,6 @@ jobs:
go-version: ${{ matrix.go-version }}
cache: true
id: go
- uses: actions/cache@v3
name: Operator Binary Cache
with:
path: |
./minio-operator
key: ${{ runner.os }}-binary-${{ github.run_id }}
- uses: actions/cache@v3
id: assets-cache
name: Assets Cache
Expand All @@ -147,6 +140,12 @@ jobs:
GOOS: linux
run: |
make binary
- uses: actions/cache/save@v3
name: Save Operator Binary
with:
path: |
./minio-operator
key: ${{ runner.os }}-ui-binary-${{ github.run_id }}



Expand Down Expand Up @@ -200,7 +199,7 @@ jobs:
with:
path: |
./minio-operator
key: ${{ runner.os }}-binary-${{ github.run_id }}
key: ${{ runner.os }}-ui-binary-${{ github.run_id }}

# Runs a set of commands using the runners shell
- name: Start Kind for Operator UI
Expand Down Expand Up @@ -237,7 +236,7 @@ jobs:
with:
path: |
./minio-operator
key: ${{ runner.os }}-binary-${{ github.run_id }}
key: ${{ runner.os }}-ui-binary-${{ github.run_id }}

# Runs a set of commands using the runners shell
- name: Start Kind for Operator UI
Expand Down Expand Up @@ -311,6 +310,7 @@ jobs:
- ui-assets
- reuse-golang-dependencies
- semgrep-static-code-analysis
- compile-binary
runs-on: ubuntu-latest

strategy:
Expand All @@ -327,13 +327,19 @@ jobs:
go-version: ${{ matrix.go-version }}
cache: true
id: go
- uses: actions/cache@v3
name: Operator Binary Cache
with:
path: |
./minio-operator
key: ${{ runner.os }}-ui-binary-${{ github.run_id }}

- name: Operator API Tests
run: |
curl -sLO "https://dl.k8s.io/release/v1.23.1/bin/linux/amd64/kubectl" -o kubectl
chmod +x kubectl
mv kubectl /usr/local/bin
"${GITHUB_WORKSPACE}/tests/start-tests-tenant.sh"
"${GITHUB_WORKSPACE}/testing/start-tests-tenant.sh"
echo "start ---> make test-operator-integration";
make test-operator-integration;
Expand Down
2 changes: 1 addition & 1 deletion docs/policybinding_crd.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[id="{p}-api-reference"]
== API Reference

:minio-image: https://hub.docker.com/r/minio/minio/tags[minio/minio:RELEASE.2024-07-04T14-25-45Z]
:minio-image: https://hub.docker.com/r/minio/minio/tags[minio/minio:RELEASE.2024-08-03T04-33-23Z]
:kes-image: https://hub.docker.com/r/minio/kes/tags[minio/kes:2024-06-17T15-47-05Z]


Expand Down
2 changes: 1 addition & 1 deletion docs/templates/asciidoctor/gv_list.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[id="{p}-api-reference"]
== API Reference

:minio-image: https://hub.docker.com/r/minio/minio/tags[minio/minio:RELEASE.2024-07-04T14-25-45Z]
:minio-image: https://hub.docker.com/r/minio/minio/tags[minio/minio:RELEASE.2024-08-03T04-33-23Z]
:kes-image: https://hub.docker.com/r/minio/kes/tags[minio/kes:2024-06-17T15-47-05Z]

{{ range $groupVersions }}
Expand Down
2 changes: 1 addition & 1 deletion docs/tenant_crd.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[id="{p}-api-reference"]
== API Reference

:minio-image: https://hub.docker.com/r/minio/minio/tags[minio/minio:RELEASE.2024-07-04T14-25-45Z]
:minio-image: https://hub.docker.com/r/minio/minio/tags[minio/minio:RELEASE.2024-08-03T04-33-23Z]
:kes-image: https://hub.docker.com/r/minio/kes/tags[minio/kes:2024-06-17T15-47-05Z]


Expand Down
2 changes: 1 addition & 1 deletion examples/kustomization/base/tenant.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ spec:
## https://github.com/minio/minio/tree/master/docs/tls/kubernetes#2-create-kubernetes-secret
externalClientCertSecrets: [ ]
## Registry location and Tag to download MinIO Server image
image: quay.io/minio/minio:RELEASE.2024-07-04T14-25-45Z
image: quay.io/minio/minio:RELEASE.2024-08-03T04-33-23Z
imagePullSecret: { }
## Mount path where PV will be mounted inside container(s).
mountPath: /export
Expand Down
4 changes: 2 additions & 2 deletions helm/tenant/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ tenant:
#
# image:
# repository: quay.io/minio/minio
# tag: RELEASE.2024-07-04T14-25-45Z
# tag: RELEASE.2024-08-03T04-33-23Z
# pullPolicy: IfNotPresent
#
# The chart also supports specifying an image based on digest value:
Expand All @@ -70,7 +70,7 @@ tenant:
#
image:
repository: quay.io/minio/minio
tag: RELEASE.2024-07-04T14-25-45Z
tag: RELEASE.2024-08-03T04-33-23Z
pullPolicy: IfNotPresent
###
#
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/job.min.io/v1alpha1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const (
// +kubebuilder:resource:scope=Namespaced,shortName=miniojob,singular=miniojob
// +kubebuilder:printcolumn:name="Tenant",type=string,JSONPath=`.spec.tenant.name`
// +kubebuilder:printcolumn:name="Phase",type=string,JSONPath=`.spec.status.phase`
// +kubebuilder:metadata:annotations=operator.min.io/version=v5.0.16
// +kubebuilder:metadata:annotations=operator.min.io/version=v5.0.17

// MinIOJob is a top-level type. A client is created for it
type MinIOJob struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/minio.min.io/v2/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ const MinIOVolumeMountPath = "/export"
const MinIOVolumeSubPath = ""

// DefaultMinIOImage specifies the default MinIO Docker hub image
const DefaultMinIOImage = "minio/minio:RELEASE.2024-07-04T14-25-45Z"
const DefaultMinIOImage = "minio/minio:RELEASE.2024-08-03T04-33-23Z"

// DefaultMinIOUpdateURL specifies the default MinIO URL where binaries are
// pulled from during MinIO upgrades
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/minio.min.io/v2/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
// +kubebuilder:resource:scope=Namespaced,shortName=tenant,singular=tenant
// +kubebuilder:printcolumn:name="State",type="string",JSONPath=".status.currentState"
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
// +kubebuilder:metadata:annotations=operator.min.io/version=v5.0.16
// +kubebuilder:metadata:annotations=operator.min.io/version=v5.0.17
// +kubebuilder:storageversion
type Tenant struct {
metav1.TypeMeta `json:",inline"`
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/sts.min.io/v1alpha1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
// +kubebuilder:resource:scope=Namespaced,shortName=policybinding,singular=policybinding
// +kubebuilder:printcolumn:name="State",type="string",JSONPath=".status.currentState"
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
// +kubebuilder:metadata:annotations=operator.min.io/version=v5.0.16
// +kubebuilder:metadata:annotations=operator.min.io/version=v5.0.17
// +kubebuilder:storageversion

// PolicyBinding is a https://kubernetes.io/docs/concepts/overview/working-with-objects/kubernetes-objects/[Kubernetes object] describing a MinIO PolicyBinding.
Expand Down
2 changes: 1 addition & 1 deletion resources/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ commonAnnotations:
operator.min.io/authors: "MinIO, Inc."
operator.min.io/license: "AGPLv3"
operator.min.io/support: "https://subnet.min.io"
operator.min.io/version: v5.0.16
operator.min.io/version: v5.0.17
commonLabels:
app.kubernetes.io/name: operator
resources:
Expand Down
6 changes: 4 additions & 2 deletions testing/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@ function check_tenant_status() {
function install_cert_manager_tenant() {

echo "Install cert-manager tenant from our example:"
try kubectl apply -k github.com/minio/operator/examples/kustomization/tenant-certmanager
try kubectl apply -k "${SCRIPT_DIR}/../examples/kustomization/tenant-certmanager"

echo "Wait until tenant-certmanager-tls secret is generated by cert-manager..."
while ! kubectl get secret tenant-certmanager-tls --namespace tenant-certmanager
Expand Down Expand Up @@ -816,7 +816,9 @@ function install_tenant() {
value=myminio
echo "Installing lite tenant for version $1"

try kubectl apply -k "github.com/minio/operator/testing/tenant\?ref\=$1"
tenant_version="v${1}"

try kubectl apply -k "github.com/minio/operator/testing/tenant?ref=$tenant_version"
fi

echo "Waiting for the tenant statefulset, this indicates the tenant is being fulfilled"
Expand Down
File renamed without changes.
File renamed without changes.
132 changes: 0 additions & 132 deletions tests/common.sh

This file was deleted.

4 changes: 2 additions & 2 deletions web-app/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ default: build-static
build-static:
@echo "Building frontend static assets to 'build'"
@if [ -f "${NVM_DIR}/nvm.sh" ]; then \. "${NVM_DIR}/nvm.sh" && nvm install && nvm use; fi && \
NODE_OPTIONS=--openssl-legacy-provider yarn build
yarn build

test-warnings:
test-warnings build-static:
./check-warnings.sh

test-prettier:
Expand Down
Loading

0 comments on commit 3c72532

Please sign in to comment.