Skip to content

Commit

Permalink
Remove deprecated registrykey dependencies (#1262)
Browse files Browse the repository at this point in the history 
---------
Signed-off-by: badri-pathak <[email protected]>
  • Loading branch information
@badri-pathak
badri-pathak authored Jan 3, 2025
1 parent 87ae3cd commit ae8fb79
Show file tree
Hide file tree
Showing 15 changed files with 632 additions and 337 deletions.
273 changes: 160 additions & 113 deletions generated/installer/ibm-spectrum-scale-csi-operator-dev.yaml
View file

Large diffs are not rendered by default.

273 changes: 160 additions & 113 deletions generated/installer/ibm-spectrum-scale-csi-operator.yaml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion operator/api/v1/zz_generated.deepcopy.go
View file

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

162 changes: 158 additions & 4 deletions operator/config/crd/bases/csi.ibm.com_csiscaleoperators.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,8 @@ spec:
properties:
labelSelector:
description: A label query over a set of resources,
in this case pods.
in this case pods. If it's null, this PodAffinityTerm
matches with no Pods.
properties:
matchExpressions:
description: matchExpressions is a list of label
Expand Down Expand Up @@ -331,6 +332,44 @@ spec:
The requirements are ANDed.
type: object
type: object
matchLabelKeys:
description: MatchLabelKeys is a set of pod label
keys to select which pods will be taken into consideration.
The keys are used to lookup values from the incoming
pod labels, those key-value labels are merged
with `LabelSelector` as `key in (value)` to select
the group of existing pods which pods will be
taken into consideration for the incoming pod's
pod (anti) affinity. Keys that don't exist in
the incoming pod labels will be ignored. The default
value is empty. The same key is forbidden to exist
in both MatchLabelKeys and LabelSelector. Also,
MatchLabelKeys cannot be set when LabelSelector
isn't set. This is an alpha field and requires
enabling MatchLabelKeysInPodAffinity feature gate.
items:
type: string
type: array
x-kubernetes-list-type: atomic
mismatchLabelKeys:
description: MismatchLabelKeys is a set of pod label
keys to select which pods will be taken into consideration.
The keys are used to lookup values from the incoming
pod labels, those key-value labels are merged
with `LabelSelector` as `key notin (value)` to
select the group of existing pods which pods will
be taken into consideration for the incoming pod's
pod (anti) affinity. Keys that don't exist in
the incoming pod labels will be ignored. The default
value is empty. The same key is forbidden to exist
in both MismatchLabelKeys and LabelSelector. Also,
MismatchLabelKeys cannot be set when LabelSelector
isn't set. This is an alpha field and requires
enabling MatchLabelKeysInPodAffinity feature gate.
items:
type: string
type: array
x-kubernetes-list-type: atomic
namespaceSelector:
description: A label query over the set of namespaces
that the term applies to. The term is applied
Expand Down Expand Up @@ -440,7 +479,8 @@ spec:
properties:
labelSelector:
description: A label query over a set of resources,
in this case pods.
in this case pods. If it's null, this PodAffinityTerm
matches with no Pods.
properties:
matchExpressions:
description: matchExpressions is a list of label
Expand Down Expand Up @@ -485,6 +525,43 @@ spec:
requirements are ANDed.
type: object
type: object
matchLabelKeys:
description: MatchLabelKeys is a set of pod label keys
to select which pods will be taken into consideration.
The keys are used to lookup values from the incoming
pod labels, those key-value labels are merged with
`LabelSelector` as `key in (value)` to select the
group of existing pods which pods will be taken into
consideration for the incoming pod's pod (anti) affinity.
Keys that don't exist in the incoming pod labels will
be ignored. The default value is empty. The same key
is forbidden to exist in both MatchLabelKeys and LabelSelector.
Also, MatchLabelKeys cannot be set when LabelSelector
isn't set. This is an alpha field and requires enabling
MatchLabelKeysInPodAffinity feature gate.
items:
type: string
type: array
x-kubernetes-list-type: atomic
mismatchLabelKeys:
description: MismatchLabelKeys is a set of pod label
keys to select which pods will be taken into consideration.
The keys are used to lookup values from the incoming
pod labels, those key-value labels are merged with
`LabelSelector` as `key notin (value)` to select the
group of existing pods which pods will be taken into
consideration for the incoming pod's pod (anti) affinity.
Keys that don't exist in the incoming pod labels will
be ignored. The default value is empty. The same key
is forbidden to exist in both MismatchLabelKeys and
LabelSelector. Also, MismatchLabelKeys cannot be set
when LabelSelector isn't set. This is an alpha field
and requires enabling MatchLabelKeysInPodAffinity
feature gate.
items:
type: string
type: array
x-kubernetes-list-type: atomic
namespaceSelector:
description: A label query over the set of namespaces
that the term applies to. The term is applied to the
Expand Down Expand Up @@ -587,7 +664,8 @@ spec:
properties:
labelSelector:
description: A label query over a set of resources,
in this case pods.
in this case pods. If it's null, this PodAffinityTerm
matches with no Pods.
properties:
matchExpressions:
description: matchExpressions is a list of label
Expand Down Expand Up @@ -636,6 +714,44 @@ spec:
The requirements are ANDed.
type: object
type: object
matchLabelKeys:
description: MatchLabelKeys is a set of pod label
keys to select which pods will be taken into consideration.
The keys are used to lookup values from the incoming
pod labels, those key-value labels are merged
with `LabelSelector` as `key in (value)` to select
the group of existing pods which pods will be
taken into consideration for the incoming pod's
pod (anti) affinity. Keys that don't exist in
the incoming pod labels will be ignored. The default
value is empty. The same key is forbidden to exist
in both MatchLabelKeys and LabelSelector. Also,
MatchLabelKeys cannot be set when LabelSelector
isn't set. This is an alpha field and requires
enabling MatchLabelKeysInPodAffinity feature gate.
items:
type: string
type: array
x-kubernetes-list-type: atomic
mismatchLabelKeys:
description: MismatchLabelKeys is a set of pod label
keys to select which pods will be taken into consideration.
The keys are used to lookup values from the incoming
pod labels, those key-value labels are merged
with `LabelSelector` as `key notin (value)` to
select the group of existing pods which pods will
be taken into consideration for the incoming pod's
pod (anti) affinity. Keys that don't exist in
the incoming pod labels will be ignored. The default
value is empty. The same key is forbidden to exist
in both MismatchLabelKeys and LabelSelector. Also,
MismatchLabelKeys cannot be set when LabelSelector
isn't set. This is an alpha field and requires
enabling MatchLabelKeysInPodAffinity feature gate.
items:
type: string
type: array
x-kubernetes-list-type: atomic
namespaceSelector:
description: A label query over the set of namespaces
that the term applies to. The term is applied
Expand Down Expand Up @@ -745,7 +861,8 @@ spec:
properties:
labelSelector:
description: A label query over a set of resources,
in this case pods.
in this case pods. If it's null, this PodAffinityTerm
matches with no Pods.
properties:
matchExpressions:
description: matchExpressions is a list of label
Expand Down Expand Up @@ -790,6 +907,43 @@ spec:
requirements are ANDed.
type: object
type: object
matchLabelKeys:
description: MatchLabelKeys is a set of pod label keys
to select which pods will be taken into consideration.
The keys are used to lookup values from the incoming
pod labels, those key-value labels are merged with
`LabelSelector` as `key in (value)` to select the
group of existing pods which pods will be taken into
consideration for the incoming pod's pod (anti) affinity.
Keys that don't exist in the incoming pod labels will
be ignored. The default value is empty. The same key
is forbidden to exist in both MatchLabelKeys and LabelSelector.
Also, MatchLabelKeys cannot be set when LabelSelector
isn't set. This is an alpha field and requires enabling
MatchLabelKeysInPodAffinity feature gate.
items:
type: string
type: array
x-kubernetes-list-type: atomic
mismatchLabelKeys:
description: MismatchLabelKeys is a set of pod label
keys to select which pods will be taken into consideration.
The keys are used to lookup values from the incoming
pod labels, those key-value labels are merged with
`LabelSelector` as `key notin (value)` to select the
group of existing pods which pods will be taken into
consideration for the incoming pod's pod (anti) affinity.
Keys that don't exist in the incoming pod labels will
be ignored. The default value is empty. The same key
is forbidden to exist in both MismatchLabelKeys and
LabelSelector. Also, MismatchLabelKeys cannot be set
when LabelSelector isn't set. This is an alpha field
and requires enabling MatchLabelKeysInPodAffinity
feature gate.
items:
type: string
type: array
x-kubernetes-list-type: atomic
namespaceSelector:
description: A label query over the set of namespaces
that the term applies to. The term is applied to the
Expand Down
4 changes: 2 additions & 2 deletions operator/config/overlays/cnsa-k8s/kustomization.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ kind: Kustomization
# Adds namespace to all resources.
namespace: ibm-spectrum-scale-csi

bases:
- ../../manager/
resources:
- ../../rbac/
- ../../manager/
- ../../crd/

patches:
Expand Down
4 changes: 2 additions & 2 deletions operator/config/overlays/cnsa/kustomization.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ kind: Kustomization
# Adds namespace to all resources.
namespace: ibm-spectrum-scale-csi

bases:
- ../../manager/
resources:
- ../../rbac/
- ../../manager/
- ../../crd/
- ../../scc/

Expand Down
4 changes: 2 additions & 2 deletions operator/config/overlays/default/kustomization.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ kind: Kustomization
# Adds namespace to all resources.
namespace: ibm-spectrum-scale-csi-driver

bases:
- ../../manager/
resources:
- ../../rbac/
- ../../manager/
- ../../crd/

patches:
Expand Down
2 changes: 1 addition & 1 deletion operator/config/overlays/ocp-rhel/kustomization.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: Kustomization
# Adds namespace to all resources.
namespace: ibm-spectrum-scale-csi-driver

bases:
resources:
- ../default
- ../../scc

Expand Down
2 changes: 1 addition & 1 deletion operator/config/rbac/kustomization.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resources:
- service_account.yaml
- role.yaml
- role_binding.yaml
- service_account.yaml
1 change: 0 additions & 1 deletion operator/config/rbac/service_account.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@ metadata:
name: ibm-spectrum-scale-csi-operator
namespace: ibm-spectrum-scale-csi-driver
imagePullSecrets:
- name: ibm-spectrum-scale-csi-registrykey
- name: ibm-entitlement-key
3 changes: 1 addition & 2 deletions operator/controllers/config/constants.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,7 @@ const (
CSIFinalizer = "finalizer.csiscaleoperators.csi.ibm.com"

//Default imagePullSecrets
ImagePullSecretRegistryKey = "ibm-spectrum-scale-csi-registrykey" // #nosec G101 false positive
ImagePullSecretEntitlementKey = "ibm-entitlement-key" // #nosec G101 false positive
ImagePullSecretEntitlementKey = "ibm-entitlement-key" // #nosec G101 false positive

DaemonSetUpgradeUpdateStrategyType = "RollingUpdate"

Expand Down
Loading

0 comments on commit ae8fb79

Please sign in to comment.