From 86582a6a3ba5e98ea4d0228191715b9fa808811b Mon Sep 17 00:00:00 2001 From: Christian Coffield Date: Thu, 3 Mar 2022 18:38:11 +0530 Subject: [PATCH] Correct image field in manifest (#57) --- Makefile | 2 +- ...ll-csm-operator.clusterserviceversion.yaml | 11 ++- ...rage.dell.com_containerstoragemodules.yaml | 91 +++++++++++-------- ...rage.dell.com_containerstoragemodules.yaml | 81 +++++++++-------- config/manager/kustomization.yaml | 2 +- ...ll-csm-operator.clusterserviceversion.yaml | 3 + config/samples/storage_v1_csm_powerscale.yaml | 6 +- ...rage.dell.com_containerstoragemodules.yaml | 12 +-- deploy/operator.yaml | 9 +- docker.mk | 5 +- 10 files changed, 126 insertions(+), 96 deletions(-) diff --git a/Makefile b/Makefile index 33c4925d7..650b66f9c 100644 --- a/Makefile +++ b/Makefile @@ -151,7 +151,7 @@ endef bundle: manifests kustomize ## Generate bundle manifests and metadata, then validate generated files. operator-sdk generate kustomize manifests -q cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG) - $(KUSTOMIZE) build config/manifests | operator-sdk generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS) + $(KUSTOMIZE) build config/manifests | operator-sdk generate bundle -q --overwrite --version $(BUNDLE_VERSION) $(BUNDLE_METADATA_OPTS) operator-sdk bundle validate ./bundle .PHONY: bundle-build diff --git a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml index 6f62b6515..2163eeffd 100644 --- a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml +++ b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml @@ -48,10 +48,10 @@ metadata: "value": "debug" } ], - "image": "dellemc/csi-isilon:v2.x.y", + "image": "dellemc/csi-isilon:v2.2.0", "imagePullPolicy": "IfNotPresent" }, - "configVersion": "v2.x.y", + "configVersion": "v2.2.0", "controller": { "envs": [ { @@ -112,7 +112,7 @@ metadata: "image": "dellemc/csm-authorization-sidecar:v1.0.0" } ], - "configVersion": "v2.x.y", + "configVersion": "v2.0.0", "enabled": false, "name": "authorization" } @@ -204,6 +204,9 @@ spec: - description: Tolerations is the list of tolerations for the driver pods displayName: Tolerations path: driver.controller.tolerations + - description: CSIDriverSpec is the specification for CSIDriver + displayName: CSI Driver Spec + path: driver.csiDriverSpec - description: CSIDriverType is the CSI Driver type for Dell Technologies - e.g, powermax, powerflex,... displayName: CSI Driver Type @@ -678,7 +681,7 @@ spec: - --leader-elect command: - /manager - image: dellemc/dell-csm-operator:0.1.0 + image: dellemc/dell-csm-operator:v0.1.0 imagePullPolicy: Always livenessProbe: httpGet: diff --git a/bundle/manifests/storage.dell.com_containerstoragemodules.yaml b/bundle/manifests/storage.dell.com_containerstoragemodules.yaml index cb9991397..266b72770 100644 --- a/bundle/manifests/storage.dell.com_containerstoragemodules.yaml +++ b/bundle/manifests/storage.dell.com_containerstoragemodules.yaml @@ -28,6 +28,10 @@ spec: jsonPath: .spec.driver.configVersion name: ConfigVersion type: string + - description: State of Installation + jsonPath: .status.state + name: State + type: string name: v1alpha1 schema: openAPIV3Schema: @@ -82,14 +86,15 @@ spec: type: string value: description: 'Variable references $(VAR_NAME) are expanded - using the previous defined environment variables in - the container and any service environment variables. + using the previously defined environment variables + in the container and any service environment variables. If a variable cannot be resolved, the reference in - the input string will be unchanged. The $(VAR_NAME) - syntax can be escaped with a double $$, ie: $$(VAR_NAME). - Escaped references will never be expanded, regardless - of whether the variable exists or not. Defaults to - "".' + the input string will be unchanged. Double $$ are + reduced to a single $, which allows for escaping the + $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce + the string literal "$(VAR_NAME)". Escaped references + will never be expanded, regardless of whether the + variable exists or not. Defaults to "".' type: string valueFrom: description: Source for the environment variable's value. @@ -274,14 +279,15 @@ spec: type: string value: description: 'Variable references $(VAR_NAME) are expanded - using the previous defined environment variables in - the container and any service environment variables. + using the previously defined environment variables + in the container and any service environment variables. If a variable cannot be resolved, the reference in - the input string will be unchanged. The $(VAR_NAME) - syntax can be escaped with a double $$, ie: $$(VAR_NAME). - Escaped references will never be expanded, regardless - of whether the variable exists or not. Defaults to - "".' + the input string will be unchanged. Double $$ are + reduced to a single $, which allows for escaping the + $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce + the string literal "$(VAR_NAME)". Escaped references + will never be expanded, regardless of whether the + variable exists or not. Defaults to "".' type: string valueFrom: description: Source for the environment variable's value. @@ -436,6 +442,12 @@ spec: type: object type: array type: object + csiDriverSpec: + description: CSIDriverSpec is the specification for CSIDriver + properties: + fSGroupPolicy: + type: string + type: object csiDriverType: description: CSIDriverType is the CSI Driver type for Dell Technologies - e.g, powermax, powerflex,... @@ -479,14 +491,16 @@ spec: type: string value: description: 'Variable references $(VAR_NAME) are - expanded using the previous defined environment + expanded using the previously defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. - The $(VAR_NAME) syntax can be escaped with a double - $$, ie: $$(VAR_NAME). Escaped references will never - be expanded, regardless of whether the variable - exists or not. Defaults to "".' + Double $$ are reduced to a single $, which allows + for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" + will produce the string literal "$(VAR_NAME)". Escaped + references will never be expanded, regardless of + whether the variable exists or not. Defaults to + "".' type: string valueFrom: description: Source for the environment variable's @@ -668,14 +682,15 @@ spec: type: string value: description: 'Variable references $(VAR_NAME) are expanded - using the previous defined environment variables in - the container and any service environment variables. + using the previously defined environment variables + in the container and any service environment variables. If a variable cannot be resolved, the reference in - the input string will be unchanged. The $(VAR_NAME) - syntax can be escaped with a double $$, ie: $$(VAR_NAME). - Escaped references will never be expanded, regardless - of whether the variable exists or not. Defaults to - "".' + the input string will be unchanged. Double $$ are + reduced to a single $, which allows for escaping the + $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce + the string literal "$(VAR_NAME)". Escaped references + will never be expanded, regardless of whether the + variable exists or not. Defaults to "".' type: string valueFrom: description: Source for the environment variable's value. @@ -862,14 +877,16 @@ spec: type: string value: description: 'Variable references $(VAR_NAME) are - expanded using the previous defined environment + expanded using the previously defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. - The $(VAR_NAME) syntax can be escaped with a double - $$, ie: $$(VAR_NAME). Escaped references will never - be expanded, regardless of whether the variable - exists or not. Defaults to "".' + Double $$ are reduced to a single $, which allows + for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" + will produce the string literal "$(VAR_NAME)". Escaped + references will never be expanded, regardless of + whether the variable exists or not. Defaults to + "".' type: string valueFrom: description: Source for the environment variable's @@ -1080,14 +1097,16 @@ spec: type: string value: description: 'Variable references $(VAR_NAME) are - expanded using the previous defined environment + expanded using the previously defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. - The $(VAR_NAME) syntax can be escaped with a double - $$, ie: $$(VAR_NAME). Escaped references will - never be expanded, regardless of whether the variable - exists or not. Defaults to "".' + Double $$ are reduced to a single $, which allows + for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" + will produce the string literal "$(VAR_NAME)". + Escaped references will never be expanded, regardless + of whether the variable exists or not. Defaults + to "".' type: string valueFrom: description: Source for the environment variable's diff --git a/config/crd/bases/storage.dell.com_containerstoragemodules.yaml b/config/crd/bases/storage.dell.com_containerstoragemodules.yaml index 1f2646bd5..1225e3c67 100644 --- a/config/crd/bases/storage.dell.com_containerstoragemodules.yaml +++ b/config/crd/bases/storage.dell.com_containerstoragemodules.yaml @@ -88,14 +88,15 @@ spec: type: string value: description: 'Variable references $(VAR_NAME) are expanded - using the previous defined environment variables in - the container and any service environment variables. + using the previously defined environment variables + in the container and any service environment variables. If a variable cannot be resolved, the reference in - the input string will be unchanged. The $(VAR_NAME) - syntax can be escaped with a double $$, ie: $$(VAR_NAME). - Escaped references will never be expanded, regardless - of whether the variable exists or not. Defaults to - "".' + the input string will be unchanged. Double $$ are + reduced to a single $, which allows for escaping the + $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce + the string literal "$(VAR_NAME)". Escaped references + will never be expanded, regardless of whether the + variable exists or not. Defaults to "".' type: string valueFrom: description: Source for the environment variable's value. @@ -280,14 +281,15 @@ spec: type: string value: description: 'Variable references $(VAR_NAME) are expanded - using the previous defined environment variables in - the container and any service environment variables. + using the previously defined environment variables + in the container and any service environment variables. If a variable cannot be resolved, the reference in - the input string will be unchanged. The $(VAR_NAME) - syntax can be escaped with a double $$, ie: $$(VAR_NAME). - Escaped references will never be expanded, regardless - of whether the variable exists or not. Defaults to - "".' + the input string will be unchanged. Double $$ are + reduced to a single $, which allows for escaping the + $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce + the string literal "$(VAR_NAME)". Escaped references + will never be expanded, regardless of whether the + variable exists or not. Defaults to "".' type: string valueFrom: description: Source for the environment variable's value. @@ -491,14 +493,16 @@ spec: type: string value: description: 'Variable references $(VAR_NAME) are - expanded using the previous defined environment + expanded using the previously defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. - The $(VAR_NAME) syntax can be escaped with a double - $$, ie: $$(VAR_NAME). Escaped references will never - be expanded, regardless of whether the variable - exists or not. Defaults to "".' + Double $$ are reduced to a single $, which allows + for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" + will produce the string literal "$(VAR_NAME)". Escaped + references will never be expanded, regardless of + whether the variable exists or not. Defaults to + "".' type: string valueFrom: description: Source for the environment variable's @@ -680,14 +684,15 @@ spec: type: string value: description: 'Variable references $(VAR_NAME) are expanded - using the previous defined environment variables in - the container and any service environment variables. + using the previously defined environment variables + in the container and any service environment variables. If a variable cannot be resolved, the reference in - the input string will be unchanged. The $(VAR_NAME) - syntax can be escaped with a double $$, ie: $$(VAR_NAME). - Escaped references will never be expanded, regardless - of whether the variable exists or not. Defaults to - "".' + the input string will be unchanged. Double $$ are + reduced to a single $, which allows for escaping the + $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce + the string literal "$(VAR_NAME)". Escaped references + will never be expanded, regardless of whether the + variable exists or not. Defaults to "".' type: string valueFrom: description: Source for the environment variable's value. @@ -874,14 +879,16 @@ spec: type: string value: description: 'Variable references $(VAR_NAME) are - expanded using the previous defined environment + expanded using the previously defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. - The $(VAR_NAME) syntax can be escaped with a double - $$, ie: $$(VAR_NAME). Escaped references will never - be expanded, regardless of whether the variable - exists or not. Defaults to "".' + Double $$ are reduced to a single $, which allows + for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" + will produce the string literal "$(VAR_NAME)". Escaped + references will never be expanded, regardless of + whether the variable exists or not. Defaults to + "".' type: string valueFrom: description: Source for the environment variable's @@ -1092,14 +1099,16 @@ spec: type: string value: description: 'Variable references $(VAR_NAME) are - expanded using the previous defined environment + expanded using the previously defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. - The $(VAR_NAME) syntax can be escaped with a double - $$, ie: $$(VAR_NAME). Escaped references will - never be expanded, regardless of whether the variable - exists or not. Defaults to "".' + Double $$ are reduced to a single $, which allows + for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" + will produce the string literal "$(VAR_NAME)". + Escaped references will never be expanded, regardless + of whether the variable exists or not. Defaults + to "".' type: string valueFrom: description: Source for the environment variable's diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index e204f382e..e45062904 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: dellemc/dell-csm-operator - newTag: 0.1.0 + newTag: v0.1.0 diff --git a/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml b/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml index e9c249a2f..1c9e45174 100644 --- a/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml @@ -85,6 +85,9 @@ spec: - description: Tolerations is the list of tolerations for the driver pods displayName: Tolerations path: driver.controller.tolerations + - description: CSIDriverSpec is the specification for CSIDriver + displayName: CSI Driver Spec + path: driver.csiDriverSpec - description: CSIDriverType is the CSI Driver type for Dell Technologies - e.g, powermax, powerflex,... displayName: CSI Driver Type diff --git a/config/samples/storage_v1_csm_powerscale.yaml b/config/samples/storage_v1_csm_powerscale.yaml index bcf45da14..6c3c5745b 100644 --- a/config/samples/storage_v1_csm_powerscale.yaml +++ b/config/samples/storage_v1_csm_powerscale.yaml @@ -9,7 +9,7 @@ spec: k8sVersion: v1.23 # Config version for CSI PowerScale v2.0.0 driver - configVersion: v2.0.0 + configVersion: v2.2.0 # volumeNamePrefix: defines a string prepended to each volume created by the CSI driver. # Allowed values: string @@ -20,8 +20,8 @@ spec: dnsPolicy: ClusterFirstWithHostNet forceUpdate: false common: - # Image for CSI PowerScale driver v2.0.0 - image: "dellemc/csi-isilon:v2.0.0" + # Image for CSI PowerScale driver v2.2.0 + image: "dellemc/csi-isilon:v2.2.0" imagePullPolicy: IfNotPresent envs: # X_CSI_VERBOSE: Indicates what content of the OneFS REST API message should be logged in debug level logs diff --git a/deploy/crds/storage.dell.com_containerstoragemodules.yaml b/deploy/crds/storage.dell.com_containerstoragemodules.yaml index 8a7394860..fe2f301c8 100644 --- a/deploy/crds/storage.dell.com_containerstoragemodules.yaml +++ b/deploy/crds/storage.dell.com_containerstoragemodules.yaml @@ -74,7 +74,7 @@ spec: description: Name of the environment variable. Must be a C_IDENTIFIER. type: string value: - description: 'Variable references $(VAR_NAME) are expanded using the previous defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to "".' + description: 'Variable references $(VAR_NAME) are expanded using the previously defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to "".' type: string valueFrom: description: Source for the environment variable's value. Cannot be used if value is not empty. @@ -206,7 +206,7 @@ spec: description: Name of the environment variable. Must be a C_IDENTIFIER. type: string value: - description: 'Variable references $(VAR_NAME) are expanded using the previous defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to "".' + description: 'Variable references $(VAR_NAME) are expanded using the previously defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to "".' type: string valueFrom: description: Source for the environment variable's value. Cannot be used if value is not empty. @@ -355,7 +355,7 @@ spec: description: Name of the environment variable. Must be a C_IDENTIFIER. type: string value: - description: 'Variable references $(VAR_NAME) are expanded using the previous defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to "".' + description: 'Variable references $(VAR_NAME) are expanded using the previously defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to "".' type: string valueFrom: description: Source for the environment variable's value. Cannot be used if value is not empty. @@ -485,7 +485,7 @@ spec: description: Name of the environment variable. Must be a C_IDENTIFIER. type: string value: - description: 'Variable references $(VAR_NAME) are expanded using the previous defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to "".' + description: 'Variable references $(VAR_NAME) are expanded using the previously defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to "".' type: string valueFrom: description: Source for the environment variable's value. Cannot be used if value is not empty. @@ -620,7 +620,7 @@ spec: description: Name of the environment variable. Must be a C_IDENTIFIER. type: string value: - description: 'Variable references $(VAR_NAME) are expanded using the previous defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to "".' + description: 'Variable references $(VAR_NAME) are expanded using the previously defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to "".' type: string valueFrom: description: Source for the environment variable's value. Cannot be used if value is not empty. @@ -776,7 +776,7 @@ spec: description: Name of the environment variable. Must be a C_IDENTIFIER. type: string value: - description: 'Variable references $(VAR_NAME) are expanded using the previous defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to "".' + description: 'Variable references $(VAR_NAME) are expanded using the previously defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to "".' type: string valueFrom: description: Source for the environment variable's value. Cannot be used if value is not empty. diff --git a/deploy/operator.yaml b/deploy/operator.yaml index fd0dec1a9..90b9716cb 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -1,11 +1,4 @@ apiVersion: v1 -kind: Namespace -metadata: - labels: - control-plane: controller-manager - name: dell-csm-operator ---- -apiVersion: v1 kind: ServiceAccount metadata: labels: @@ -436,7 +429,7 @@ spec: - --leader-elect command: - /manager - image: controller:latest + image: dellemc/dell-csm-operator:v0.1.0 imagePullPolicy: Always livenessProbe: httpGet: diff --git a/docker.mk b/docker.mk index aeaefa1e4..9501f5185 100644 --- a/docker.mk +++ b/docker.mk @@ -15,7 +15,10 @@ BUNDLE_IMAGE_TAG_BASE_COMMUNITY ?= dell-csm-community-operator-bundle CATALOG_IMAGE_TAG_BASE_COMMUNITY ?= dell-csm-community-operator-catalog # Operator version tagged with build number. For e.g. - v1.2.0.001 -VERSION ?= 0.1.0 +VERSION ?= v0.1.0 + +# Bundle Version is the semantic version(required by operator-sdk) +BUNDLE_VERSION ?= 0.1.0 # Timestamp local builds TIMESTAMP := $(shell date +%Y%m%d%H%M%S)