-
Notifications
You must be signed in to change notification settings - Fork 87
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1842 from Nordix/fix-ironic-bmo-upgrade-1.6/adil
🐛 Fixing bmo and ironic version for clusterctl tests
- Loading branch information
Showing
23 changed files
with
667 additions
and
269 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
test/e2e/data/bmo-deployment/components/basic-auth/credentials_patch.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
apiVersion: apps/v1 | ||
kind: Deployment | ||
metadata: | ||
name: controller-manager | ||
namespace: system | ||
spec: | ||
template: | ||
spec: | ||
containers: | ||
- name: manager | ||
volumeMounts: | ||
- name: ironic-credentials | ||
mountPath: "/opt/metal3/auth/ironic" | ||
readOnly: true | ||
volumes: | ||
- name: ironic-credentials | ||
secret: | ||
secretName: ironic-credentials |
19 changes: 19 additions & 0 deletions
19
test/e2e/data/bmo-deployment/components/basic-auth/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
apiVersion: kustomize.config.k8s.io/v1alpha1 | ||
kind: Component | ||
|
||
# NOTE: This component requires a secret with the basic auth credentials! | ||
# How you create it is up to you. The required secrets is: | ||
# - ironic-credentials | ||
# | ||
# It should contain 2 fields: username and password. Example: | ||
# | ||
# apiVersion: v1 | ||
# kind: Secret | ||
# metadata: | ||
# name: ironic-credentials | ||
# data: | ||
# password: <base64-encoded-password> | ||
# username: <base64-encoded-username> | ||
|
||
patches: | ||
- path: credentials_patch.yaml |
8 changes: 8 additions & 0 deletions
8
test/e2e/data/bmo-deployment/components/tls/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
apiVersion: kustomize.config.k8s.io/v1alpha1 | ||
kind: Component | ||
|
||
patches: | ||
- path: tls_ca_patch.yaml | ||
target: | ||
kind: Deployment | ||
name: controller-manager |
17 changes: 17 additions & 0 deletions
17
test/e2e/data/bmo-deployment/components/tls/tls_ca_patch.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
apiVersion: apps/v1 | ||
kind: Deployment | ||
metadata: | ||
name: controller-manager | ||
spec: | ||
template: | ||
spec: | ||
containers: | ||
- name: manager | ||
volumeMounts: | ||
- name: cacert | ||
mountPath: "/opt/metal3/certs/ca" | ||
readOnly: true | ||
volumes: | ||
- name: cacert | ||
secret: | ||
secretName: ironic-cacert |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
DEPLOY_KERNEL_URL=http://172.22.0.2:6180/images/ironic-python-agent.kernel | ||
DEPLOY_RAMDISK_URL=http://172.22.0.2:6180/images/ironic-python-agent.initramfs | ||
IRONIC_ENDPOINT=https://172.22.0.2:6385/v1/ | ||
IRONIC_INSPECTOR_ENDPOINT=https://172.22.0.2:5050/v1/ |
38 changes: 38 additions & 0 deletions
38
test/e2e/data/bmo-deployment/overlays/release-0.5/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
apiVersion: kustomize.config.k8s.io/v1beta1 | ||
kind: Kustomization | ||
namespace: baremetal-operator-system | ||
resources: | ||
- https://github.com/metal3-io/baremetal-operator/config/overlays/basic-auth_tls?ref=release-0.5 | ||
configMapGenerator: | ||
- name: ironic | ||
behavior: create | ||
envs: | ||
- ironic.env | ||
patches: | ||
- patch: | | ||
# Don't try to pull again the pre-loaded image | ||
- op: replace | ||
path: /spec/template/spec/containers/0/imagePullPolicy | ||
value: IfNotPresent | ||
target: | ||
kind: Deployment | ||
name: controller-manager | ||
images: | ||
- name: quay.io/metal3-io/baremetal-operator | ||
newTag: release-0.5 | ||
- name: gcr.io/kubebuilder/kube-rbac-proxy | ||
newTag: v0.8.0 | ||
# We cannot use suffix hashes since the kustomizations we build on | ||
# cannot be aware of what suffixes we add. | ||
generatorOptions: | ||
disableNameSuffixHash: true | ||
# NOTE: These credentials are generated automatically in hack/ci-e2e.sh | ||
secretGenerator: | ||
- name: ironic-credentials | ||
files: | ||
- username=ironic-username | ||
- password=ironic-password | ||
- name: ironic-inspector-credentials | ||
files: | ||
- username=ironic-inspector-username | ||
- password=ironic-inspector-password |
15 changes: 15 additions & 0 deletions
15
test/e2e/data/ironic-deployment/components/basic-auth/auth.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
apiVersion: apps/v1 | ||
kind: Deployment | ||
metadata: | ||
name: ironic | ||
spec: | ||
template: | ||
spec: | ||
containers: | ||
- name: ironic | ||
envFrom: | ||
# This is the htpassword matching the ironic password | ||
- secretRef: | ||
name: ironic-htpasswd | ||
- configMapRef: | ||
name: ironic-bmo-configmap |
4 changes: 4 additions & 0 deletions
4
test/e2e/data/ironic-deployment/components/basic-auth/ironic-auth-config-tpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
[ironic] | ||
auth_type=http_basic | ||
username=${IRONIC_USERNAME} | ||
password=${IRONIC_PASSWORD} |
Oops, something went wrong.