Skip to content

Commit

Permalink
FSAT: Update fabric-operator for compatibility with v1.25.x
Browse files Browse the repository at this point in the history
This patch updates fabric-operator to utilize PodSecurity Admission
controller for Kubernetes v1.25.x.

This change is based on the following PR:
hyperledger-labs/fabric-operator#82

Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
  • Loading branch information
satota2 committed Sep 29, 2023
1 parent 95c7532 commit 83302d9
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 57 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,6 @@ metadata:
app.kubernetes.io/instance: "ibm-hlfsupport"
app.kubernetes.io/managed-by: "ibm-hlfsupport-operator"
rules:
- apiGroups:
- extensions
resourceNames:
- ibm-hlfsupport-psp
resources:
- podsecuritypolicies
verbs:
- use
- apiGroups:
- apiextensions.k8s.io
resources:
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- fabric-operator-psp.yaml
- fabric-operator-serviceaccount.yaml
- fabric-operator-clusterrole.yaml
- fabric-operator-clusterrolebinding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ metadata:
name: ${NS}
EOF

# https://kubernetes.io/docs/tasks/configure-pod-container/migrate-from-psp/
kubectl label --overwrite namespace $NS pod-security.kubernetes.io/enforce=baseline

pop_fn
}

Expand Down

0 comments on commit 83302d9

Please sign in to comment.