Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correct image field in the manifest #57

Merged
merged 1 commit into from
Mar 3, 2022
+126 −96
Merged

Correct image field in the manifest #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 7 additions & 4 deletions bundle/manifests/dell-csm-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand Down Expand Up @@ -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"
}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
91 changes: 55 additions & 36 deletions bundle/manifests/storage.dell.com_containerstoragemodules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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,...
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading