Skip to content

Commit 16ba990

Browse files
dymurrayShawn Hurley
authored andcommitted
pkg/scaffold/ansible; Add k8s_status module (#946)
Move k8s_status rendering all inside of scaffold Add tests for k8s status
1 parent d570744 commit 16ba990

File tree

7 files changed

+446
-2
lines changed

7 files changed

+446
-2
lines changed

commands/operator-sdk/cmd/migrate.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ func migrateAnsible() {
8888
&dockerfile,
8989
&ansible.Entrypoint{},
9090
&ansible.UserSetup{},
91+
&ansible.K8sStatus{},
9192
)
9293
if err != nil {
9394
log.Fatalf("Migrate scaffold failed: (%v)", err)

hack/image/ansible/scaffold-ansible-image.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ func main() {
3838
&ansible.DockerfileHybrid{},
3939
&ansible.Entrypoint{},
4040
&ansible.UserSetup{},
41+
&ansible.K8sStatus{},
4142
)
4243
if err != nil {
4344
log.Fatalf("Add scaffold failed: (%v)", err)

pkg/scaffold/ansible/dockerfilehybrid.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ ENV OPERATOR=/usr/local/bin/ansible-operator \
6565
6666
# install operator binary
6767
COPY build/_output/bin/{{.ProjectName}} ${OPERATOR}
68+
# install k8s_status Ansible Module
69+
COPY library/k8s_status.py /usr/share/ansible/openshift/
6870
6971
COPY bin /usr/local/bin
7072
RUN /usr/local/bin/user_setup

0 commit comments

Comments
 (0)