Skip to content

Commit

Permalink
for build only
Browse files Browse the repository at this point in the history
  • Loading branch information
shlomitn committed Sep 8, 2024
1 parent 8c87ad7 commit 3a777d6
Show file tree
Hide file tree
Showing 11 changed files with 89 additions and 93 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.23 as builder
FROM --platform=linux/amd64 golang:1.23 as builder

WORKDIR /workspace
# Copy the Go Modules manifests
Expand Down
1 change: 0 additions & 1 deletion api/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -319,12 +319,12 @@ spec:
- /manager
env:
- name: EXPORTER_IMAGE
value: quay.io/ibmodffs/ibm-storage-odf-block-driver:1.6.0
value: quay.io/uriziv1/ibm-storage-odf-block-driver:1.6.0
- name: RESOURCES_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.annotations['olm.operatorNamespace']
image: registry.connect.redhat.com/ibm/ibm-storage-odf-operator:1.6.0
image: quay.io/uriziv1/ibm-storage-odf-operator:1.6.0
imagePullPolicy: Always
livenessProbe:
httpGet:
Expand Down Expand Up @@ -376,7 +376,7 @@ spec:
app: ibm-odf-console
spec:
containers:
- image: quay.io/ibmodffs/ibm-storage-odf-plugin:1.6.0
- image: quay.io/uriziv1/ibm-storage-odf-plugin:1.6.0
name: ibm-odf-console
ports:
- containerPort: 9003
Expand Down
3 changes: 0 additions & 3 deletions bundle/metadata/annotations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,3 @@ annotations:
# Annotations for testing.
operators.operatorframework.io.test.mediatype.v1: scorecard+v1
operators.operatorframework.io.test.config.v1: tests/scorecard/

# OpenShift annotations:
com.redhat.openshift.versions: "v4.15-v4.16"
2 changes: 1 addition & 1 deletion bundle/metadata/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ dependencies:
- type: olm.package
value:
packageName: ibm-block-csi-operator
version: "=1.11.3"
version: ">=1.11.3"
8 changes: 4 additions & 4 deletions config/console/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ commonLabels:
app: ibm-odf-console

resources:
- console_init.yaml
- console_init.yaml

apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: ibm-console
newName: quay.io/ibmodffs/ibm-storage-odf-plugin
newTag: 1.6.0
- name: ibm-console
newName: quay.io/uriziv1/ibm-storage-odf-plugin
newTag: 1.6.0
2 changes: 1 addition & 1 deletion config/default/manager_config_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ spec:
- name: manager
env:
- name: EXPORTER_IMAGE
value: quay.io/ibmodffs/ibm-storage-odf-block-driver:1.6.0
value: quay.io/uriziv1/ibm-storage-odf-block-driver:1.6.0
72 changes: 36 additions & 36 deletions config/manager/csi.ibm.com_v1_ibmblockcsi_cr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,44 +45,44 @@ spec:
- s390x
- ppc64le

# tolerations:
# - effect: NoSchedule
# key: node-role.kubernetes.io/master
# operator: Exists
# tolerations:
# - effect: NoSchedule
# key: node-role.kubernetes.io/master
# operator: Exists

sidecars:
- name: csi-node-driver-registrar
repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
tag: "v2.5.0"
imagePullPolicy: IfNotPresent
- name: csi-provisioner
repository: k8s.gcr.io/sig-storage/csi-provisioner
tag: "v3.1.0"
imagePullPolicy: IfNotPresent
- name: csi-attacher
repository: k8s.gcr.io/sig-storage/csi-attacher
tag: "v3.4.0"
imagePullPolicy: IfNotPresent
- name: csi-snapshotter
repository: k8s.gcr.io/sig-storage/csi-snapshotter
tag: "v5.0.1"
imagePullPolicy: IfNotPresent
- name: csi-resizer
repository: k8s.gcr.io/sig-storage/csi-resizer
tag: "v1.4.0"
imagePullPolicy: IfNotPresent
- name: csi-addons-replicator
repository: quay.io/ibmcsiblock/csi-block-volumereplication-operator
tag: "v0.9.0"
imagePullPolicy: IfNotPresent
- name: csi-volume-group
repository: quay.io/ibmcsiblock/csi-volume-group-operator
tag: "v0.9.0"
imagePullPolicy: IfNotPresent
- name: livenessprobe
repository: k8s.gcr.io/sig-storage/livenessprobe
tag: "v2.6.0"
imagePullPolicy: IfNotPresent
- name: csi-node-driver-registrar
repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
tag: "v2.6.3"
imagePullPolicy: IfNotPresent
- name: csi-provisioner
repository: k8s.gcr.io/sig-storage/csi-provisioner
tag: "v3.4.0"
imagePullPolicy: IfNotPresent
- name: csi-attacher
repository: k8s.gcr.io/sig-storage/csi-attacher
tag: "v4.2.0"
imagePullPolicy: IfNotPresent
- name: csi-snapshotter
repository: k8s.gcr.io/sig-storage/csi-snapshotter
tag: "v6.2.1"
imagePullPolicy: IfNotPresent
- name: csi-resizer
repository: k8s.gcr.io/sig-storage/csi-resizer
tag: "v1.7.0"
imagePullPolicy: IfNotPresent
- name: csi-addons-replicator
repository: quay.io/ibmcsiblock/csi-block-volumereplication-operator
tag: "v0.9.0"
imagePullPolicy: IfNotPresent
- name: csi-volume-group
repository: quay.io/ibmcsiblock/csi-volume-group-operator
tag: "v0.9.1"
imagePullPolicy: IfNotPresent
- name: livenessprobe
repository: k8s.gcr.io/sig-storage/livenessprobe
tag: "v2.9.0"
imagePullPolicy: IfNotPresent

# healthPort: 9808
# imagePullSecrets:
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: controller
newName: quay.io/ibmodffs/ibm-storage-odf-operator
newName: quay.io/uriziv1/ibm-storage-odf-operator
newTag: 1.6.0
72 changes: 36 additions & 36 deletions config/samples/csi.ibm.com_v1_ibmblockcsi_cr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,44 +45,44 @@ spec:
- s390x
- ppc64le

# tolerations:
# - effect: NoSchedule
# key: node-role.kubernetes.io/master
# operator: Exists
# tolerations:
# - effect: NoSchedule
# key: node-role.kubernetes.io/master
# operator: Exists

sidecars:
- name: csi-node-driver-registrar
repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
tag: "v2.5.0"
imagePullPolicy: IfNotPresent
- name: csi-provisioner
repository: k8s.gcr.io/sig-storage/csi-provisioner
tag: "v3.1.0"
imagePullPolicy: IfNotPresent
- name: csi-attacher
repository: k8s.gcr.io/sig-storage/csi-attacher
tag: "v3.4.0"
imagePullPolicy: IfNotPresent
- name: csi-snapshotter
repository: k8s.gcr.io/sig-storage/csi-snapshotter
tag: "v5.0.1"
imagePullPolicy: IfNotPresent
- name: csi-resizer
repository: k8s.gcr.io/sig-storage/csi-resizer
tag: "v1.4.0"
imagePullPolicy: IfNotPresent
- name: csi-addons-replicator
repository: quay.io/ibmcsiblock/csi-block-volumereplication-operator
tag: "v0.9.0"
imagePullPolicy: IfNotPresent
- name: csi-volume-group
repository: quay.io/ibmcsiblock/csi-volume-group-operator
tag: "v0.9.0"
imagePullPolicy: IfNotPresent
- name: livenessprobe
repository: k8s.gcr.io/sig-storage/livenessprobe
tag: "v2.6.0"
imagePullPolicy: IfNotPresent
- name: csi-node-driver-registrar
repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar
tag: "v2.6.3"
imagePullPolicy: IfNotPresent
- name: csi-provisioner
repository: k8s.gcr.io/sig-storage/csi-provisioner
tag: "v3.4.0"
imagePullPolicy: IfNotPresent
- name: csi-attacher
repository: k8s.gcr.io/sig-storage/csi-attacher
tag: "v4.2.0"
imagePullPolicy: IfNotPresent
- name: csi-snapshotter
repository: k8s.gcr.io/sig-storage/csi-snapshotter
tag: "v6.2.1"
imagePullPolicy: IfNotPresent
- name: csi-resizer
repository: k8s.gcr.io/sig-storage/csi-resizer
tag: "v1.7.0"
imagePullPolicy: IfNotPresent
- name: csi-addons-replicator
repository: quay.io/ibmcsiblock/csi-block-volumereplication-operator
tag: "v0.9.0"
imagePullPolicy: IfNotPresent
- name: csi-volume-group
repository: quay.io/ibmcsiblock/csi-volume-group-operator
tag: "v0.9.1"
imagePullPolicy: IfNotPresent
- name: livenessprobe
repository: k8s.gcr.io/sig-storage/livenessprobe
tag: "v2.9.0"
imagePullPolicy: IfNotPresent

# healthPort: 9808
# imagePullSecrets:
Expand Down
12 changes: 6 additions & 6 deletions console/console.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package console

import (
"context"
"strings"
"math"
"strings"

consolev1 "github.com/openshift/api/console/v1"
operatorv1 "github.com/openshift/api/operator/v1"
Expand All @@ -36,11 +36,11 @@ const MainBasePath = "/"
const CompatibilityBasePath = "/compatibility/"

func safeIntToInt32(val int) int32 {
// Verify no integer overflow conversion int -> int32 (gosec G115)
if val < math.MinInt32 || val > math.MaxInt32 {
panic("safeIntToInt32 - integer overflow")
}
return int32(val) // #nosec G115
// Verify no integer overflow conversion int -> int32 (gosec G115)
if val < math.MinInt32 || val > math.MaxInt32 {
panic("safeIntToInt32 - integer overflow")
}
return int32(val) // #nosec G115
}

func GetDeployment(namespace string) *appsv1.Deployment {
Expand Down

0 comments on commit 3a777d6

Please sign in to comment.