Преглед изворни кода

Merge pull request #11403 from patrickdillon/change-bastion-host-namespace

Change namespace of testing bastion server to byoh-ssh-bastion.
OpenShift Merge Robot пре 6 година
родитељ
комит
c507ed0411

+ 1 - 1
test/aws/files/01_service.yml

@@ -4,7 +4,7 @@ metadata:
   labels:
   labels:
     run: ssh-bastion
     run: ssh-bastion
   name: ssh-bastion
   name: ssh-bastion
-  namespace: openshift-ssh-bastion
+  namespace: byoh-ssh-bastion
   annotations:
   annotations:
     service.beta.kubernetes.io/aws-load-balancer-backend-protocol: "tcp"
     service.beta.kubernetes.io/aws-load-balancer-backend-protocol: "tcp"
     service.beta.kubernetes.io/aws-load-balancer-type: "nlb"
     service.beta.kubernetes.io/aws-load-balancer-type: "nlb"

+ 1 - 1
test/aws/files/02_serviceaccount.yml

@@ -2,4 +2,4 @@ apiVersion: v1
 kind: ServiceAccount
 kind: ServiceAccount
 metadata:
 metadata:
   name: ssh-bastion
   name: ssh-bastion
-  namespace: openshift-ssh-bastion
+  namespace: byoh-ssh-bastion

+ 1 - 1
test/aws/files/03_role.yml

@@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 kind: Role
 metadata:
 metadata:
   name: ssh-bastion
   name: ssh-bastion
-  namespace: openshift-ssh-bastion
+  namespace: byoh-ssh-bastion
 rules:
 rules:
 - apiGroups:
 - apiGroups:
   - security.openshift.io
   - security.openshift.io

+ 2 - 2
test/aws/files/04_rolebinding.yml

@@ -4,7 +4,7 @@ metadata:
   annotations:
   annotations:
     openshift.io/description: Allows ssh-pod to run as root
     openshift.io/description: Allows ssh-pod to run as root
   name: ssh-bastion
   name: ssh-bastion
-  namespace: openshift-ssh-bastion
+  namespace: byoh-ssh-bastion
 roleRef:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   kind: Role
@@ -12,4 +12,4 @@ roleRef:
 subjects:
 subjects:
 - apiGroup: rbac.authorization.k8s.io
 - apiGroup: rbac.authorization.k8s.io
   kind: User
   kind: User
-  name: system:serviceaccount:openshift-ssh-bastion:ssh-bastion
+  name: system:serviceaccount:byoh-ssh-bastion:ssh-bastion

+ 1 - 1
test/aws/files/06_clusterrolebinding.yml

@@ -11,4 +11,4 @@ roleRef:
 subjects:
 subjects:
 - apiGroup: rbac.authorization.k8s.io
 - apiGroup: rbac.authorization.k8s.io
   kind: User
   kind: User
-  name: system:serviceaccount:openshift-ssh-bastion:ssh-bastion
+  name: system:serviceaccount:byoh-ssh-bastion:ssh-bastion

+ 1 - 1
test/aws/files/07_deployment.yml

@@ -4,7 +4,7 @@ metadata:
   labels:
   labels:
     run: ssh-bastion
     run: ssh-bastion
   name: ssh-bastion
   name: ssh-bastion
-  namespace: openshift-ssh-bastion
+  namespace: byoh-ssh-bastion
 spec:
 spec:
   replicas: 1
   replicas: 1
   selector:
   selector:

+ 4 - 4
test/aws/ssh_bastion.yml

@@ -3,7 +3,7 @@
   k8s:
   k8s:
     kubeconfig: "{{ kubeconfig_path }}"
     kubeconfig: "{{ kubeconfig_path }}"
     kind: Namespace
     kind: Namespace
-    name: openshift-ssh-bastion
+    name: byoh-ssh-bastion
     state: present
     state: present
 
 
 - name: Create ssh bastion keys secret
 - name: Create ssh bastion keys secret
@@ -14,7 +14,7 @@
       kind: Secret
       kind: Secret
       metadata:
       metadata:
         name: ssh-host-keys
         name: ssh-host-keys
-        namespace: openshift-ssh-bastion
+        namespace: byoh-ssh-bastion
       data:
       data:
         ssh_host_rsa_key: "{{ lookup('file', '../../inventory/dynamic/injected/ssh-privatekey') | b64encode }}"
         ssh_host_rsa_key: "{{ lookup('file', '../../inventory/dynamic/injected/ssh-privatekey') | b64encode }}"
         sshd_config: "{{ lookup('file', 'files/sshd_config') | b64encode }}"
         sshd_config: "{{ lookup('file', 'files/sshd_config') | b64encode }}"
@@ -58,7 +58,7 @@
 - name: Wait for ssh bastion deployment to rollout
 - name: Wait for ssh bastion deployment to rollout
   k8s_facts:
   k8s_facts:
     kubeconfig: "{{ kubeconfig_path }}"
     kubeconfig: "{{ kubeconfig_path }}"
-    namespace: openshift-ssh-bastion
+    namespace: byoh-ssh-bastion
     kind: Deployment
     kind: Deployment
     name: ssh-bastion
     name: ssh-bastion
   register: k8s_result
   register: k8s_result
@@ -74,7 +74,7 @@
 - name: Get ssh bastion address
 - name: Get ssh bastion address
   k8s_facts:
   k8s_facts:
     kubeconfig: "{{ kubeconfig_path }}"
     kubeconfig: "{{ kubeconfig_path }}"
-    namespace: openshift-ssh-bastion
+    namespace: byoh-ssh-bastion
     kind: Service
     kind: Service
     name: ssh-bastion
     name: ssh-bastion
   register: k8s_result
   register: k8s_result