Skip to content

Commit f0fd1c8

Browse files
committed
review changes
1 parent b1d08b6 commit f0fd1c8

19 files changed

+701
-616
lines changed

api/v1alpha1/external_secrets_config_types.go

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,6 @@ type ExternalSecretsConfigSpec struct {
6868
// controllerConfig is for specifying the configurations for the controller to use while installing the `external-secrets` operand and the plugins.
6969
// +kubebuilder:validation:Optional
7070
ControllerConfig ControllerConfig `json:"controllerConfig,omitempty"`
71-
72-
// networkPolicies specifies the list of network policy configurations
73-
// to be applied to external-secrets pods.
74-
//
75-
// Each entry allows specifying a name for the generated NetworkPolicy object,
76-
// along with its full Kubernetes NetworkPolicy definition.
77-
//
78-
// If this field is not provided, external-secrets components will be isolated
79-
// with deny-all network policies, which will prevent proper operation.
80-
//
81-
// +kubebuilder:validation:Optional
82-
// +optional
83-
NetworkPolicies []NetworkPolicy `json:"networkPolicies,omitempty"`
8471
}
8572

8673
// ExternalSecretsConfigStatus is the most recently observed status of the ExternalSecretsConfig.
@@ -134,6 +121,19 @@ type ControllerConfig struct {
134121
// +kubebuilder:validation:Maximum:=18000
135122
// +kubebuilder:validation:Optional
136123
PeriodicReconcileInterval uint32 `json:"periodicReconcileInterval,omitempty"`
124+
125+
// networkPolicies specifies the list of network policy configurations
126+
// to be applied to external-secrets pods.
127+
//
128+
// Each entry allows specifying a name for the generated NetworkPolicy object,
129+
// along with its full Kubernetes NetworkPolicy definition.
130+
//
131+
// If this field is not provided, external-secrets components will be isolated
132+
// with deny-all network policies, which will prevent proper operation.
133+
//
134+
// +kubebuilder:validation:Optional
135+
// +optional
136+
NetworkPolicies []NetworkPolicy `json:"networkPolicies,omitempty"`
137137
}
138138

139139
// BitwardenSecretManagerProvider is for enabling the bitwarden secrets manager provider and for setting up the additional service required for connecting with the bitwarden server.
@@ -232,8 +232,9 @@ const (
232232
type NetworkPolicy struct {
233233
// name is a unique identifier for this network policy configuration.
234234
// This name will be used as part of the generated NetworkPolicy resource name.
235+
// +kubebuilder:validation:MinLength:=1
236+
// +kubebuilder:validation:MaxLength:=253
235237
// +kubebuilder:validation:Required
236-
// +required
237238
Name string `json:"name"`
238239

239240
// componentName specifies which external-secrets component this network policy applies to.
@@ -248,7 +249,7 @@ type NetworkPolicy struct {
248249
// this field is empty then this NetworkPolicy limits all outgoing traffic (and serves
249250
// solely to ensure that the pods it selects are isolated by default).
250251
// The operator will automatically handle ingress rules based on the current running ports.
251-
// +optional
252-
// +listType=atomic
252+
// +kubebuilder:validation:Required
253+
//+listType=atomic
253254
Egress []networkingv1.NetworkPolicyEgressRule `json:"egress,omitempty" protobuf:"bytes,3,rep,name=egress"`
254255
}

api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bindata/external-secrets/networkpolicy-allow-webhook-traffic.yaml renamed to bindata/external-secrets/networkpolicy_allow-api-server-and-webhook-traffic.yaml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,15 @@ spec:
2323
ingress:
2424
- ports:
2525
- protocol: TCP
26-
port: 10250
26+
port: 10250
27+
# Allow Prometheus/monitoring to scrape metrics
28+
- from:
29+
- namespaceSelector:
30+
matchLabels:
31+
openshift.io/cluster-monitoring: "true"
32+
- namespaceSelector:
33+
matchLabels:
34+
name: openshift-monitoring
35+
ports:
36+
- protocol: TCP
37+
port: 8080

bindata/external-secrets/networkpolicy-allow-bitwarden-server-traffic.yaml renamed to bindata/external-secrets/networkpolicy_allow-api-server-egress-for-bitwarden-sever.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: networking.k8s.io/v1
22
kind: NetworkPolicy
33
metadata:
4-
name: allow-api-server-egress-for-bitwarden-sever
4+
name: allow-api-server-egress-for-bitwarden-server
55
namespace: external-secrets
66
labels:
77
app.kubernetes.io/name: bitwarden-sdk-server
@@ -11,7 +11,7 @@ metadata:
1111
spec:
1212
podSelector:
1313
matchLabels:
14-
app.kubernetes.io/name: external-secrets-bitwarden-server
14+
app.kubernetes.io/name: bitwarden-sdk-server
1515
policyTypes:
1616
- Ingress
1717
- Egress

bindata/external-secrets/networkpolicy-allow-cert-controller-traffic.yaml renamed to bindata/external-secrets/networkpolicy_allow-api-server-egress-for-cert-controller-traffic.yaml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,20 @@ spec:
1414
app.kubernetes.io/name: external-secrets-cert-controller
1515
policyTypes:
1616
- Egress
17+
- Ingress
1718
egress:
1819
- ports:
1920
- protocol: TCP
20-
port: 6443
21+
port: 6443
22+
ingress:
23+
# Allow Prometheus/monitoring to scrape metrics
24+
- from:
25+
- namespaceSelector:
26+
matchLabels:
27+
openshift.io/cluster-monitoring: "true"
28+
- namespaceSelector:
29+
matchLabels:
30+
name: openshift-monitoring
31+
ports:
32+
- protocol: TCP
33+
port: 8080

bindata/external-secrets/networkpolicy-allow-main-controller-traffic.yaml renamed to bindata/external-secrets/networkpolicy_allow-api-server-egress-for-main-controller-traffic.yaml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: networking.k8s.io/v1
22
kind: NetworkPolicy
33
metadata:
4-
name: allow-api-server-egress
4+
name: allow-api-server-egress-for-main-controller
55
namespace: external-secrets
66
labels:
77
app.kubernetes.io/name: external-secrets
@@ -14,7 +14,20 @@ spec:
1414
app.kubernetes.io/name: external-secrets
1515
policyTypes:
1616
- Egress
17+
- Ingress
1718
egress:
1819
- ports:
1920
- protocol: TCP
20-
port: 6443
21+
port: 6443
22+
ingress:
23+
# Allow Prometheus/monitoring to scrape metrics
24+
- from:
25+
- namespaceSelector:
26+
matchLabels:
27+
openshift.io/cluster-monitoring: "true"
28+
- namespaceSelector:
29+
matchLabels:
30+
name: openshift-monitoring
31+
ports:
32+
- protocol: TCP
33+
port: 8080

bundle/manifests/external-secrets-operator.clusterserviceversion.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ metadata:
220220
categories: Security
221221
console.openshift.io/disable-operand-delete: "true"
222222
containerImage: openshift.io/external-secrets-operator:latest
223-
createdAt: "2025-10-07T03:20:14Z"
223+
createdAt: "2025-10-09T11:13:16Z"
224224
features.operators.openshift.io/cnf: "false"
225225
features.operators.openshift.io/cni: "false"
226226
features.operators.openshift.io/csi: "false"
@@ -584,10 +584,8 @@ spec:
584584
- networkpolicies
585585
verbs:
586586
- create
587-
- delete
588587
- get
589588
- list
590-
- patch
591589
- update
592590
- watch
593591
- apiGroups:
@@ -735,7 +733,7 @@ spec:
735733
value: :8443
736734
- name: METRICS_SECURE
737735
value: "true"
738-
image: openshift.io/external-secrets-operator:latest
736+
image: quay.io/rh-ee-sbhor/external-secrets-operator:dev
739737
imagePullPolicy: Always
740738
livenessProbe:
741739
httpGet:

0 commit comments

Comments
 (0)