Skip to content

Commit 614f937

Browse files
PRTamilanbanPRTamilanban
authored
Merge branch 'IBM:scripts-dev' into scripts-dev
2 parents 824e23c + 48b91ce commit 614f937

File tree

9 files changed

+202
-1
lines changed

9 files changed

+202
-1
lines changed

‎turbonomic/README.md‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,20 @@
1-
placeholder for readme
1+
2+
# Operators
3+
4+
## Deployments
5+
6+
### ibm-commonui-operator
7+
8+
CRD Name: clusterserviceversions.operators.coreos.com
9+
- [x] ibm-commonui-operator
10+
11+
12+
# Operands
13+
14+
## Deployments
15+
16+
### CommonWebUI
17+
18+
CRD Name: commonwebuis.operator.ibm.com
19+
- [x] common-web-ui
20+

‎turbonomic/operands/cert-manager.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
apiVersion: devops.turbonomic.io/v1alpha1
2+
kind: OperatorResourceMapping
3+
metadata:
4+
name: cert-manager-orm
5+
namespace: $namespace
6+
spec:
7+
mappings:
8+
patterns:
9+
- owned:
10+
apiVersion: apps/v1
11+
kind: Deployment
12+
path: .spec.template.spec.containers[?(@.name=="cert-manager-controller")].resources
13+
selector: cert_manager_controller_deploy
14+
ownerPath: .spec.certManagerController.resources
15+
- owned:
16+
apiVersion: apps/v1
17+
kind: Deployment
18+
path: .spec.template.spec.containers[?(@.name=="cert-manager-webhook")].resources
19+
selector: cert_manager_webhook_deploy
20+
ownerPath: .spec.certManagerWebhook.resources
21+
- owned:
22+
apiVersion: apps/v1
23+
kind: Deployment
24+
path: .spec.template.spec.containers[?(@.name=="cert-manager-cainjector")].resources
25+
selector: cert_manager_cainjector_deploy
26+
ownerPath: .spec.certManagerCAInjector.resources
27+
selectors:
28+
cert_manager_controller_deploy:
29+
matchLabels:
30+
app: ibm-cert-manager-controller
31+
cert_manager_webhook_deploy:
32+
matchLabels:
33+
app: ibm-cert-manager-webhook
34+
cert_manager_cainjector_deploy:
35+
matchLabels:
36+
app: ibm-cert-manager-cainjector
37+
owner:
38+
apiVersion: operator.ibm.com/v1
39+
kind: CertManagerConfig
40+
name: default

‎turbonomic/operands/im-auth-service.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
apiVersion: devops.turbonomic.io/v1alpha1
2+
kind: OperatorResourceMapping
3+
metadata:
4+
name: auth-service-orm
5+
namespace: $namespace
6+
spec:
7+
mappings:
8+
patterns:
9+
- owned:
10+
apiVersion: apps/v1
11+
kind: Deployment
12+
path: .spec.template.spec.containers[?(@.name=="platform-auth-service")].resources
13+
selector: im_auth_service_deploy
14+
ownerPath: .spec.authService.resources
15+
selectors:
16+
im_auth_service_deploy:
17+
matchLabels:
18+
app: platform-auth-service
19+
owner:
20+
apiVersion: operator.ibm.com/v1alpha1
21+
kind: Authentication
22+
name: example-authentication

‎turbonomic/operands/im-platform-idmgmt.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
apiVersion: devops.turbonomic.io/v1alpha1
2+
kind: OperatorResourceMapping
3+
metadata:
4+
name: management-orm
5+
namespace: $namespace
6+
spec:
7+
mappings:
8+
patterns:
9+
- owned:
10+
apiVersion: apps/v1
11+
kind: Deployment
12+
path: .spec.template.spec.containers[?(@.name=="platform-identity-management")].resources
13+
selector: im_management_deploy
14+
ownerPath: .spec.identityManager.resources
15+
selectors:
16+
im_management_deploy:
17+
matchLabels:
18+
app: platform-identity-management
19+
owner:
20+
apiVersion: operator.ibm.com/v1alpha1
21+
kind: Authentication
22+
name: example-authentication

‎turbonomic/operands/im-platform-idprovider.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
apiVersion: devops.turbonomic.io/v1alpha1
2+
kind: OperatorResourceMapping
3+
metadata:
4+
name: provider-orm
5+
namespace: $namespace
6+
spec:
7+
mappings:
8+
patterns:
9+
- owned:
10+
apiVersion: apps/v1
11+
kind: Deployment
12+
path: .spec.template.spec.containers[?(@.name=="platform-identity-provider")].resources
13+
selector: im_provider_deploy
14+
ownerPath: .spec.identityProvider.resources
15+
selectors:
16+
im_provider_deploy:
17+
matchLabels:
18+
app: platform-identity-provider
19+
owner:
20+
apiVersion: operator.ibm.com/v1alpha1
21+
kind: Authentication
22+
name: example-authentication

‎turbonomic/operands/orm-common-web-ui.yaml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
apiVersion: devops.turbonomic.io/v1alpha1
2+
kind: OperatorResourceMapping
3+
metadata:
4+
name: common-web-ui-orm
5+
spec:
6+
owner: # target same namespace by default
7+
apiVersion: operators.ibm.com/v1alpha1
8+
kind: CommonWebUI
9+
name: example-commonwebui
10+
mappings:
11+
patterns:
12+
- ownerPath: .spec.replicas
13+
owned:
14+
apiVersion: apps/v1
15+
kind: Deployment
16+
name: common-web-ui
17+
path: .spec.replicas
18+
- ownerPath: .spec.resources
19+
owned:
20+
apiVersion: apps/v1
21+
kind: Deployment
22+
name: common-web-ui
23+
path: .spec.template.spec.containers[?(@.name=="common-web-ui")].resources

‎turbonomic/operators/im-operator.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
apiVersion: devops.turbonomic.io/v1alpha1
2+
kind: OperatorResourceMapping
3+
metadata:
4+
name: im-operator-orm
5+
namespace: $namespace
6+
spec:
7+
mappings:
8+
patterns:
9+
- owned:
10+
apiVersion: apps/v1
11+
kind: Deployment
12+
path: .spec.template.spec.containers[?(@.name=="ibm-iam-operator")].resources
13+
name: ibm-iam-operator
14+
ownerPath: .spec.install.spec.deployments[?(@.name=="ibm-iam-operator")].spec.template.spec.containers[?(@.name=="ibm-iam-operator")].resources
15+
owner:
16+
apiVersion: operators.coreos.com/v1alpha1
17+
kind: ClusterServiceVersion
18+
name: ibm-iam-operator.v4.9.0

‎turbonomic/operators/orm-ibm-commonui-operator.yaml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
apiVersion: devops.turbonomic.io/v1alpha1
2+
kind: OperatorResourceMapping
3+
metadata:
4+
name: ibm-commonui-operator-orm
5+
spec:
6+
owner: # target same namespace by default
7+
apiVersion: operators.coreos.com/v1alpha1
8+
kind: ClusterServiceVersion
9+
name: ibm-commonui-operator.v4.6.0
10+
mappings:
11+
patterns:
12+
- ownerPath: .spec.install.spec.deployments[?(@.name=="ibm-commonui-operator")].spec.replicas
13+
owned:
14+
apiVersion: apps/v1
15+
kind: Deployment
16+
path: .spec.replicas
17+
name: ibm-commonui-operator
18+
- ownerPath: .spec.install.spec.deployments[?(@.name=="ibm-commonui-operator")].spec.template.spec.containers[?(@.name=="manager")].resources
19+
owned:
20+
apiVersion: apps/v1
21+
kind: Deployment
22+
path: .spec.template.spec.containers[?(@.name=="manager")].resources
23+
name: ibm-commonui-operator

‎velero/backup/common-service/label-common-service.sh‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,17 @@ function label_ns_and_related() {
273273
operand_requests=$(${OC} get operandrequest -n "$namespace" -o custom-columns=NAME:.metadata.name --no-headers)
274274
# Loop through each OperandRequest name
275275
while IFS= read -r operand_request; do
276+
# Skip all the operandrequest with ownerreference
277+
ownerReferences=$(${OC} get operandrequest $operand_request -n "$namespace" -o jsonpath='{.metadata.ownerReferences}')
278+
if [[ $ownerReferences != "" ]]; then
279+
continue
280+
fi
281+
# Skip all the operandrequest generate by ODLM
282+
control_by_odlm=$(${OC} get operandrequest $operand_request -n "$namespace" --show-labels --no-headers | grep "operator.ibm.com/opreq-control=true" || echo "false")
283+
if [[ $control_by_odlm != "false" ]]; then
284+
continue
285+
fi
286+
276287
${OC} label operandrequests $operand_request foundationservices.cloudpak.ibm.com=operand -n "$namespace" --overwrite=true 2>/dev/null
277288
done <<< "$operand_requests"
278289

@@ -298,6 +309,7 @@ function label_configmap() {
298309
title "Start to label the ConfigMaps... "
299310
${OC} label configmap common-service-maps foundationservices.cloudpak.ibm.com=configmap -n kube-public --overwrite=true 2>/dev/null
300311
${OC} label configmap cs-onprem-tenant-config foundationservices.cloudpak.ibm.com=configmap -n $SERVICES_NS --overwrite=true 2>/dev/null
312+
${OC} label configmap common-web-ui-config foundationservices.cloudpak.ibm.com=configmap -n $SERVICES_NS --overwrite=true 2>/dev/null
301313
echo ""
302314
}
303315

0 commit comments

Comments
 (0)