Skip to content

Move CAPI resources in to target namespace #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Feb 1, 2021
Merged

Move CAPI resources in to target namespace #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions config/cluster-api/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,3 @@ resources:
- infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml
- infrastructure.cluster.x-k8s.io_awsmanagedclusters.yaml
- infrastructure.cluster.x-k8s.io_awsmanagedmachinepools.yaml
- manager-serviceaccount.yaml
- manager-clusterrole.yaml
- manager-clusterrolebinding.yaml
- manager-deployment.yaml
3 changes: 0 additions & 3 deletions config/install/development/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ resources:
- ../../hypershift-operator

images:
- name: cluster-api
newName: quay.io/hypershift/cluster-api
newTag: hypershift
- name: hypershift
newName: quay.io/hypershift/hypershift
newTag: latest
Expand Down
3 changes: 0 additions & 3 deletions config/install/production/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ resources:
- ../../hypershift-operator

images:
- name: cluster-api
newName: quay.io/hypershift/cluster-api
newTag: hypershift
- name: hypershift
newName: quay.io/hypershift/hypershift
newTag: latest
100 changes: 96 additions & 4 deletions hypershift-operator/assets/controlplane/hypershift/bindata.go
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions hypershift-operator/assets/controlplane/hypershift/capi/capa-manager-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ spec:
serviceAccountName: capa-controller-manager
containers:
- args:
- --namespace={{ .Namespace }}

@ironcladlou ironcladlou Jan 27, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use downward API to eliminate templating?

- --alsologtostderr
- --v=4
image: quay.io/hypershift/cluster-api-provider-aws:master
Expand Down
1 change: 0 additions & 1 deletion config/cluster-api/manager-clusterrole.yaml → .../hypershift/capi/manager-clusterrole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: cluster-api
rules:
- apiGroups:
Expand Down
2 changes: 1 addition & 1 deletion ...uster-api/manager-clusterrolebinding.yaml → ...hift/capi/manager-clusterrolebinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ roleRef:
subjects:
- kind: ServiceAccount
name: cluster-api
namespace: hypershift
namespace: {{ .Namespace }}
5 changes: 2 additions & 3 deletions config/cluster-api/manager-deployment.yaml → ...e/hypershift/capi/manager-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
apiVersion: apps/v1
kind: Deployment
metadata:
namespace: hypershift
name: cluster-api
spec:
replicas: 1
Expand All @@ -16,11 +15,11 @@ spec:
serviceAccountName: cluster-api
containers:
- name: manager
image: cluster-api:latest
image: quay.io/hypershift/cluster-api:hypershift
imagePullPolicy: Always
command:
- /manager
args:
- --namespace=hypershift
- --namespace={{ .Namespace }}

@ironcladlou ironcladlou Jan 27, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use downward API to eliminate templating?

- --alsologtostderr
- --v=4
1 change: 0 additions & 1 deletion ...g/cluster-api/manager-serviceaccount.yaml → ...pershift/capi/manager-serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
apiVersion: v1
kind: ServiceAccount
metadata:
namespace: hypershift
name: cluster-api
Loading