Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ OPERATOR_IMAGE_NAME ?= odlm
# Current Operator bundle image name
BUNDLE_IMAGE_NAME ?= odlm-operator-bundle
# Current Operator version
OPERATOR_VERSION ?= 4.3.9
OPERATOR_VERSION ?= 4.4.0

# Kind cluster name
KIND_CLUSTER_NAME ?= "odlm"
Expand Down Expand Up @@ -211,7 +211,7 @@ bundle-manifests: yq

generate-all: yq manifests kustomize operator-sdk ## Generate bundle manifests, metadata and package manifests
$(OPERATOR_SDK) generate kustomize manifests -q
- make bundle-manifests CHANNELS=v4.3 DEFAULT_CHANNEL=v4.3
- make bundle-manifests CHANNELS=v4.4 DEFAULT_CHANNEL=v4.4

##@ Test

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ metadata:
createdAt: "2024-09-28T19:55:35Z"
description: The Operand Deployment Lifecycle Manager provides a Kubernetes CRD-based API to manage the lifecycle of operands.
nss.operator.ibm.com/managed-operators: ibm-odlm
olm.skipRange: '>=1.2.0 <4.3.9'
olm.skipRange: '>=1.2.0 <4.4.0'
operators.openshift.io/infrastructure-features: '["disconnected"]'
operators.operatorframework.io/builder: operator-sdk-v1.32.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
Expand All @@ -150,7 +150,7 @@ metadata:
operatorframework.io/arch.ppc64le: supported
operatorframework.io/arch.s390x: supported
operatorframework.io/os.linux: supported
name: operand-deployment-lifecycle-manager.v4.3.9
name: operand-deployment-lifecycle-manager.v4.4.0
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -875,7 +875,7 @@ spec:
minKubeVersion: 1.19.0
provider:
name: IBM
version: 4.3.9
version: 4.4.0
relatedImages:
- image: icr.io/cpopen/odlm:4.3.9
- image: icr.io/cpopen/odlm:4.4.0
name: ODLM_IMAGE
4 changes: 2 additions & 2 deletions bundle/metadata/annotations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ annotations:
operators.operatorframework.io.bundle.manifests.v1: manifests/
operators.operatorframework.io.bundle.metadata.v1: metadata/
operators.operatorframework.io.bundle.package.v1: ibm-odlm
operators.operatorframework.io.bundle.channels.v1: v4.3
operators.operatorframework.io.bundle.channel.default.v1: v4.3
operators.operatorframework.io.bundle.channels.v1: v4.4
operators.operatorframework.io.bundle.channel.default.v1: v4.4
operators.operatorframework.io.metrics.builder: operator-sdk-v1.32.0
operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
description: The Operand Deployment Lifecycle Manager provides a Kubernetes CRD-based
API to manage the lifecycle of operands.
nss.operator.ibm.com/managed-operators: ibm-odlm
olm.skipRange: '>=1.2.0 <4.3.9'
olm.skipRange: '>=1.2.0 <4.4.0'
operators.openshift.io/infrastructure-features: '["disconnected"]'
operators.operatorframework.io/builder: operator-sdk-v1.2.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
Expand Down Expand Up @@ -489,6 +489,6 @@ spec:
provider:
name: IBM
relatedImages:
- image: icr.io/cpopen/odlm:4.3.9
- image: icr.io/cpopen/odlm:4.4.0
name: ODLM_IMAGE
version: 0.0.0
4 changes: 2 additions & 2 deletions helm-cluster-scoped/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: ibm-odlm-cluster-scoped
description: A Helm chart for ibm-odlm
type: application
version: 4.3.9
appVersion: 4.3.9
version: 4.4.0
appVersion: 4.4.0
4 changes: 2 additions & 2 deletions helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: ibm-odlm
description: A Helm chart for ibm-odlm
type: application
version: 4.3.9
appVersion: 4.3.9
version: 4.4.0
appVersion: 4.4.0
4 changes: 2 additions & 2 deletions helm/templates/operator-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ spec:
# olm.operatorNamespace: cs-op
# olm.skipRange: '>=1.2.0 <4.3.8'
# olm.targetNamespaces: cs-op
operatorframework.io/properties: '{"properties":[{"type":"olm.gvk","value":{"group":"operator.ibm.com","kind":"OperandBindInfo","version":"v1alpha1"}},{"type":"olm.gvk","value":{"group":"operator.ibm.com","kind":"OperandConfig","version":"v1alpha1"}},{"type":"olm.gvk","value":{"group":"operator.ibm.com","kind":"OperandRegistry","version":"v1alpha1"}},{"type":"olm.gvk","value":{"group":"operator.ibm.com","kind":"OperandRequest","version":"v1alpha1"}},{"type":"olm.gvk","value":{"group":"operator.ibm.com","kind":"OperatorConfig","version":"v1alpha1"}},{"type":"olm.package","value":{"packageName":"ibm-odlm","version":"4.3.8"}}]}'
operatorframework.io/properties: '{"properties":[{"type":"olm.gvk","value":{"group":"operator.ibm.com","kind":"OperandBindInfo","version":"v1alpha1"}},{"type":"olm.gvk","value":{"group":"operator.ibm.com","kind":"OperandConfig","version":"v1alpha1"}},{"type":"olm.gvk","value":{"group":"operator.ibm.com","kind":"OperandRegistry","version":"v1alpha1"}},{"type":"olm.gvk","value":{"group":"operator.ibm.com","kind":"OperandRequest","version":"v1alpha1"}},{"type":"olm.gvk","value":{"group":"operator.ibm.com","kind":"OperatorConfig","version":"v1alpha1"}},{"type":"olm.package","value":{"packageName":"ibm-odlm","version":"4.4.0"}}]}'
operators.openshift.io/infrastructure-features: '["disconnected"]'
operators.operatorframework.io/builder: operator-sdk-v1.32.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
Expand Down Expand Up @@ -201,7 +201,7 @@ spec:
name: namespace-scope
optional: true
- name: OPERATOR_CONDITION_NAME
value: operand-deployment-lifecycle-manager.v4.3.9
value: operand-deployment-lifecycle-manager.v4.4.0
- name: NO_OLM
value: "true"
image: {{ .Values.imagePullPrefix}}/{{ .Values.imageRegistryNamespaceOperator}}/{{ .Values.operatorImage }}:{{ .Values.operatorVersion }}
Expand Down
8 changes: 4 additions & 4 deletions helm/templates/rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -190,13 +190,13 @@ metadata:
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: operand-deployment-lifecycle-manager.v4.3.9
name: operand-deployment-lifecycle-manager.v4.4.0
namespace: {{ .Values.operatorNamespace }}
rules:
- apiGroups:
- operators.coreos.com
resourceNames:
- operand-deployment-lifecycle-manager.v4.3.9
- operand-deployment-lifecycle-manager.v4.4.0
resources:
- operatorconditions
verbs:
Expand All @@ -209,12 +209,12 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: operand-deployment-lifecycle-manager.v4.3.9
name: operand-deployment-lifecycle-manager.v4.4.0
namespace: {{ .Values.operatorNamespace }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: operand-deployment-lifecycle-manager.v4.3.9
name: operand-deployment-lifecycle-manager.v4.4.0
subjects:
- kind: ServiceAccount
name: operand-deployment-lifecycle-manager
Expand Down
2 changes: 1 addition & 1 deletion helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ imagePullSecret: ibm-entitlement-key
# Note there are no leading or trailing /'s
imageRegistryNamespaceOperator: cpopen
imageRegistryNamespaceOperand: cpopen/cpfs
operatorVersion: 4.3.9
operatorVersion: 4.4.0

# other configuration you think you might need for your operator
# following are examples, not required:
Expand Down
2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
package version

var (
Version = "4.3.9"
Version = "4.4.0"
)