-
Notifications
You must be signed in to change notification settings - Fork 104
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Removed 00-assert that checks if KUDO is running and use --wait in in…
…stall (#1592) Signed-off-by: Andreas Neumann <aneumann@mesosphere.com>
- Loading branch information
1 parent
ff4a807
commit 738a730
Showing
37 changed files
with
142 additions
and
187 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,13 @@ | ||
apiVersion: v1 | ||
kind: Pod | ||
apiVersion: kudo.dev/v1beta1 | ||
kind: Instance | ||
metadata: | ||
labels: | ||
app: kudo-manager | ||
control-plane: controller-manager | ||
namespace: kudo-system | ||
name: first-operator | ||
status: | ||
phase: Running | ||
planStatus: | ||
deploy: | ||
status: COMPLETE | ||
--- | ||
apiVersion: apps/v1 | ||
kind: Deployment | ||
metadata: | ||
name: nginx-deployment |
File renamed without changes.
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 |
---|---|---|
@@ -1,13 +1,3 @@ | ||
apiVersion: kudo.dev/v1beta1 | ||
kind: Instance | ||
metadata: | ||
name: first-operator | ||
status: | ||
planStatus: | ||
deploy: | ||
status: COMPLETE | ||
--- | ||
apiVersion: apps/v1 | ||
kind: Deployment | ||
metadata: | ||
name: nginx-deployment | ||
apiVersion: v1 | ||
kind: Event | ||
message: 'Execution of plan cleanup finished with status COMPLETE' |
File renamed without changes.
File renamed without changes.
This file was deleted.
Oops, something went wrong.
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 |
---|---|---|
@@ -1,9 +1,24 @@ | ||
apiVersion: v1 | ||
kind: Pod | ||
apiVersion: apps/v1 | ||
kind: Deployment | ||
metadata: | ||
labels: | ||
app: kudo-manager | ||
control-plane: controller-manager | ||
namespace: kudo-system | ||
name: nginx-deployment | ||
spec: | ||
replicas: 2 | ||
template: | ||
metadata: | ||
annotations: | ||
kudo.dev/dependencies-hash: 6fa812afe527bdb6c9a5fbfcba8193bb | ||
kudo.dev/operator-version: 0.1.0 | ||
spec: | ||
containers: | ||
- name: nginx | ||
image: nginx:1.7.9 | ||
ports: | ||
- containerPort: 80 | ||
--- | ||
apiVersion: kudo.dev/v1beta1 | ||
kind: Instance | ||
status: | ||
phase: Running | ||
planStatus: | ||
deploy: | ||
status: COMPLETE |
File renamed without changes.
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
File renamed without changes.
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 |
---|---|---|
@@ -1,25 +1,13 @@ | ||
apiVersion: apps/v1 | ||
kind: Deployment | ||
apiVersion: v1 | ||
kind: ConfigMap | ||
metadata: | ||
name: nginx-deployment | ||
spec: | ||
replicas: 3 | ||
template: | ||
metadata: | ||
annotations: | ||
# This update to the deployment must have the same hash as 00-assert.yaml | ||
kudo.dev/dependencies-hash: 6fa812afe527bdb6c9a5fbfcba8193bb | ||
kudo.dev/operator-version: 0.1.0 | ||
spec: | ||
containers: | ||
- name: nginx | ||
image: nginx:1.7.9 | ||
ports: | ||
- containerPort: 80 | ||
name: configdata | ||
data: | ||
valueA: ChangedValue | ||
--- | ||
apiVersion: kudo.dev/v1beta1 | ||
kind: Instance | ||
status: | ||
planStatus: | ||
update-replica: | ||
update-param: | ||
status: COMPLETE |
File renamed without changes.
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 |
---|---|---|
@@ -1,13 +1,26 @@ | ||
apiVersion: v1 | ||
kind: ConfigMap | ||
apiVersion: apps/v1 | ||
kind: Deployment | ||
metadata: | ||
name: configdata | ||
data: | ||
valueA: ChangedValue | ||
name: nginx-deployment | ||
spec: | ||
replicas: 2 | ||
template: | ||
metadata: | ||
annotations: | ||
# After the second update to replicas the hash should change, based on the last deployed version of the config map | ||
kudo.dev/dependencies-hash: da9f56a62d3c4af2596bebace008d845 | ||
kudo.dev/operator-version: 0.1.0 | ||
spec: | ||
containers: | ||
- name: nginx | ||
image: nginx:1.7.9 | ||
ports: | ||
- containerPort: 80 | ||
--- | ||
apiVersion: kudo.dev/v1beta1 | ||
kind: Instance | ||
status: | ||
# We need to check for IN_PROGRESS here and for COMPLETE in the next step, as update-replica ran before and is still set to COMPLETE from the last run | ||
planStatus: | ||
update-param: | ||
status: COMPLETE | ||
update-replica: | ||
status: IN_PROGRESS |
File renamed without changes.
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 |
---|---|---|
@@ -1,26 +1,6 @@ | ||
apiVersion: apps/v1 | ||
kind: Deployment | ||
metadata: | ||
name: nginx-deployment | ||
spec: | ||
replicas: 2 | ||
template: | ||
metadata: | ||
annotations: | ||
# After the second update to replicas the hash should change, based on the last deployed version of the config map | ||
kudo.dev/dependencies-hash: da9f56a62d3c4af2596bebace008d845 | ||
kudo.dev/operator-version: 0.1.0 | ||
spec: | ||
containers: | ||
- name: nginx | ||
image: nginx:1.7.9 | ||
ports: | ||
- containerPort: 80 | ||
--- | ||
apiVersion: kudo.dev/v1beta1 | ||
kind: Instance | ||
status: | ||
# We need to check for IN_PROGRESS here and for COMPLETE in the next step, as update-replica ran before and is still set to COMPLETE from the last run | ||
planStatus: | ||
update-replica: | ||
status: IN_PROGRESS | ||
status: COMPLETE |
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 |
---|---|---|
@@ -1,6 +1,25 @@ | ||
apiVersion: apps/v1 | ||
kind: Deployment | ||
metadata: | ||
name: nginx-deployment | ||
spec: | ||
replicas: 2 | ||
template: | ||
metadata: | ||
annotations: | ||
# After this config map update the hash should change, as the deployment was applied as well | ||
kudo.dev/dependencies-hash: 1510654b540619228b477bdd56d44175 | ||
kudo.dev/operator-version: 0.1.0 | ||
spec: | ||
containers: | ||
- name: nginx | ||
image: nginx:1.7.9 | ||
ports: | ||
- containerPort: 80 | ||
--- | ||
apiVersion: kudo.dev/v1beta1 | ||
kind: Instance | ||
status: | ||
planStatus: | ||
update-replica: | ||
deploy: | ||
status: COMPLETE |
File renamed without changes.
This file was deleted.
Oops, something went wrong.
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 |
---|---|---|
@@ -1,9 +1,12 @@ | ||
apiVersion: v1 | ||
kind: Pod | ||
apiVersion: kudo.dev/v1beta1 | ||
kind: Instance | ||
metadata: | ||
labels: | ||
app: kudo-manager | ||
control-plane: controller-manager | ||
namespace: kudo-system | ||
kudo.dev/operator: feature-operator | ||
spec: | ||
operatorVersion: | ||
name: feature-operator-0.1.0 | ||
status: | ||
phase: Running | ||
planStatus: | ||
deploy: | ||
status: COMPLETE |
File renamed without changes.
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
File renamed without changes.
This file was deleted.
Oops, something went wrong.
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 |
---|---|---|
@@ -1,9 +1,12 @@ | ||
apiVersion: v1 | ||
kind: Pod | ||
apiVersion: kudo.dev/v1beta1 | ||
kind: Instance | ||
metadata: | ||
labels: | ||
app: kudo-manager | ||
control-plane: controller-manager | ||
namespace: kudo-system | ||
kudo.dev/operator: failjob-operator | ||
spec: | ||
operatorVersion: | ||
name: failjob-operator-0.1.0 | ||
status: | ||
phase: Running | ||
planStatus: | ||
deploy: | ||
status: FATAL_ERROR |
File renamed without changes.
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
File renamed without changes.
This file was deleted.
Oops, something went wrong.
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 |
---|---|---|
@@ -1,9 +1,19 @@ | ||
apiVersion: v1 | ||
kind: Pod | ||
apiVersion: kudo.dev/v1beta1 | ||
kind: Instance | ||
metadata: | ||
labels: | ||
app: kudo-manager | ||
control-plane: controller-manager | ||
namespace: kudo-system | ||
kudo.dev/operator: feature-operator | ||
spec: | ||
operatorVersion: | ||
name: feature-operator-0.1.0 | ||
status: | ||
phase: Running | ||
planStatus: | ||
deploy: | ||
status: COMPLETE | ||
--- | ||
apiVersion: v1 | ||
kind: ConfigMap | ||
metadata: | ||
name: feature-operator-cm | ||
data: | ||
foo: "1234" |
File renamed without changes.
Oops, something went wrong.