From d03f7eb599c6f68ab2778b59b6682d6e4e0a1bb4 Mon Sep 17 00:00:00 2001 From: Tatiana Krishtop Date: Thu, 29 Jun 2023 10:56:07 +0200 Subject: [PATCH] Move to Operator-SDK 1.30.0 based on ubi8.8 Signed-off-by: Tatiana Krishtop --- Dockerfile | 2 +- README.md | 2 +- Vagrantfile | 2 +- docs/dev/README.md | 4 ++-- .../simple-disconnected-operator.clusterserviceversion.yaml | 2 +- .../testdata/disconnected_bundle/metadata/annotations.yaml | 2 +- internal/runtime/assets.go | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6d315015..aca5995b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,7 +42,7 @@ LABEL ARCH=${ARCH} LABEL OS=${OS} # Define versions for dependencies -ARG OPERATOR_SDK_VERSION=1.29.0 +ARG OPERATOR_SDK_VERSION=1.30.0 # Add preflight binary COPY --from=builder /go/src/preflight/preflight /usr/local/bin/preflight diff --git a/README.md b/README.md index 727830d5..5dd39111 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ functional, and in your path. | Name | Tool cli | Minimum version | |----------------- |:-----------------:|----------------:| -| OperatorSDK | `operator-sdk` | v1.29.0 | +| OperatorSDK | `operator-sdk` | v1.30.0 | See our [Vagrantfile](Vagrantfile) for more information on setting up a development environment. Some checks may also require access to an OpenShift diff --git a/Vagrantfile b/Vagrantfile index 94657cc8..36c16b4e 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -32,7 +32,7 @@ Vagrant.configure("2") do |config| rm oc.tar.gz export ARCH=$(case $(uname -m) in x86_64) echo -n amd64 ;; aarch64) echo -n arm64 ;; *) echo -n $(uname -m) ;; esac) export OS=$(uname | awk '{print tolower($0)}') - export OPERATOR_SDK_DL_URL=https://github.com/operator-framework/operator-sdk/releases/download/v1.29.0 + export OPERATOR_SDK_DL_URL=https://github.com/operator-framework/operator-sdk/releases/download/v1.30.0 curl -LO ${OPERATOR_SDK_DL_URL}/operator-sdk_${OS}_${ARCH} chmod +x operator-sdk_${OS}_${ARCH} && sudo mv operator-sdk_${OS}_${ARCH} /usr/local/bin/operator-sdk echo "PATH=/usr/local/go/bin:$PATH" >> /home/vagrant/.bashrc diff --git a/docs/dev/README.md b/docs/dev/README.md index 8bda9995..c62df233 100644 --- a/docs/dev/README.md +++ b/docs/dev/README.md @@ -15,8 +15,8 @@ functional, and in your path. | Name | Tool cli | Minimum version | |----------------- |:-----------------:|----------------:| -| OperatorSDK | `operator-sdk` | v1.29.0 | -| OpenShift Client | `oc` | v4.7.19 | +| OperatorSDK | `operator-sdk` | v1.30.0 | +| OpenShift Client | `oc` | v4.10.0 | | Podman | `podman` | v3.0 | ## Checks diff --git a/internal/policy/operator/testdata/disconnected_bundle/manifests/simple-disconnected-operator.clusterserviceversion.yaml b/internal/policy/operator/testdata/disconnected_bundle/manifests/simple-disconnected-operator.clusterserviceversion.yaml index a085debd..36743c70 100644 --- a/internal/policy/operator/testdata/disconnected_bundle/manifests/simple-disconnected-operator.clusterserviceversion.yaml +++ b/internal/policy/operator/testdata/disconnected_bundle/manifests/simple-disconnected-operator.clusterserviceversion.yaml @@ -23,7 +23,7 @@ metadata: capabilities: Basic Install createdAt: "2022-12-16T20:14:33Z" operators.openshift.io/infrastructure-features: '["Disconnected"]' - operators.operatorframework.io/builder: operator-sdk-v1.29.0 + operators.operatorframework.io/builder: operator-sdk-v1.30.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 name: simple-disconnected-operator.v0.0.1 namespace: placeholder diff --git a/internal/policy/operator/testdata/disconnected_bundle/metadata/annotations.yaml b/internal/policy/operator/testdata/disconnected_bundle/metadata/annotations.yaml index 567f48af..fb84ce89 100644 --- a/internal/policy/operator/testdata/disconnected_bundle/metadata/annotations.yaml +++ b/internal/policy/operator/testdata/disconnected_bundle/metadata/annotations.yaml @@ -5,7 +5,7 @@ annotations: operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: simple-disconnected-operator operators.operatorframework.io.bundle.channels.v1: alpha - operators.operatorframework.io.metrics.builder: operator-sdk-v1.29.0 + operators.operatorframework.io.metrics.builder: operator-sdk-v1.30.0 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 diff --git a/internal/runtime/assets.go b/internal/runtime/assets.go index 2c85b703..b38d1f2f 100644 --- a/internal/runtime/assets.go +++ b/internal/runtime/assets.go @@ -21,7 +21,7 @@ import ( // to be used outside of this package. var images = map[string]string{ // operator policy, operator-sdk scorecard - "scorecard": "quay.io/operator-framework/scorecard-test:v1.29.0", + "scorecard": "quay.io/operator-framework/scorecard-test:v1.30.0", } // imageList takes the images mapping and represents them using just