Skip to content

Commit 4068377

Browse files
Merge pull request #2733 from Nordix/lentzi90/e2e-irso-bump
🌱 E2E: Bump IrSO version to v0.5.2 and unify yaml formatting
2 parents f51814d + 7b351f7 commit 4068377

File tree

30 files changed

+133
-114
lines changed

30 files changed

+133
-114
lines changed

config/base/certmanager/kustomization.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
13
resources:
24
- certificate.yaml
35

config/base/crds/kustomization.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
13
# This kustomization.yaml is not intended to be run by itself,
24
# since it depends on service name and namespace that are out of this kustomize package.
35
# It should be run by config/default

config/base/kustomization.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
13
# Adds namespace to all resources.
24
namespace: baremetal-operator-system
35

config/base/prometheus/monitor.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ metadata:
99
namespace: system
1010
spec:
1111
endpoints:
12-
- path: /metrics
13-
port: https
14-
scheme: https
15-
bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
16-
tlsConfig:
17-
insecureSkipVerify: true
12+
- path: /metrics
13+
port: https
14+
scheme: https
15+
bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
16+
tlsConfig:
17+
insecureSkipVerify: true
1818
selector:
1919
matchLabels:
2020
control-plane: controller-manager

config/base/rbac/kustomization.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
13
resources:
24
# All RBAC will be applied under this service account in
35
# the deployment namespace. You may comment out this resource
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
13
resources:
24
- manifests.yaml
35
- service_patch.yaml
46

57
configurations:
6-
- kustomizeconfig.yaml
8+
- kustomizeconfig.yaml

config/components/tls/tls_ca_patch.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ spec:
88
containers:
99
- name: manager
1010
volumeMounts:
11-
- name: cacert
12-
mountPath: "/opt/metal3/certs/ca"
13-
readOnly: true
11+
- name: cacert
12+
mountPath: "/opt/metal3/certs/ca"
13+
readOnly: true
1414
volumes:
1515
- name: cacert
1616
secret:

config/kustomization.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
3-
43
resources:
5-
- namespace
6-
- default
4+
- namespace
5+
- default

config/overlays/basic-auth_tls/kustomization.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33

44
resources:
5-
- ../../namespace
6-
- ../../base
5+
- ../../namespace
6+
- ../../base
77

88
components:
9-
- ../../components/basic-auth
10-
- ../../components/tls
9+
- ../../components/basic-auth
10+
- ../../components/tls
1111
# Example for how to generate the necessary secrets:
1212
# secretGenerator:
1313
# - name: ironic-credentials

ironic-deployment/components/basic-auth/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ kind: Component
1414
# IRONIC_HTPASSWD: <base64-encoded-htpasswd-string>
1515

1616
patches:
17-
- path: auth.yaml
17+
- path: auth.yaml

0 commit comments

Comments
 (0)