diff --git a/roles/openshift-apps/planet/templates/buildconfig.yml b/roles/openshift-apps/planet/templates/buildconfig.yml index bfa12288fc..2c11926771 100644 --- a/roles/openshift-apps/planet/templates/buildconfig.yml +++ b/roles/openshift-apps/planet/templates/buildconfig.yml @@ -1,41 +1,41 @@ -- apiVersion: build.openshift.io/v1 - kind: BuildConfig - metadata: - annotations: - app.openshift.io/vcs-ref: "" - app.openshift.io/vcs-uri: https://github.com/fedora-infra/planet - labels: - app: planet - app.kubernetes.io/component: planet - app.kubernetes.io/instance: planet - app.kubernetes.io/name: planet - app.kubernetes.io/part-of: planet-app - name: planet - spec: - nodeSelector: null - output: - to: - kind: ImageStreamTag - name: planet:latest - postCommit: {} - resources: {} - runPolicy: Serial - source: - contextDir: / - git: - uri: https://github.com/fedora-infra/planet - type: Git - strategy: - dockerStrategy: - dockerfilePath: Dockerfile - type: Docker - triggers: - - generic: - secretReference: - name: planet-generic-webhook-secret - type: Generic - - github: - secretReference: - name: planet-github-webhook-secret - type: GitHub - - type: ConfigChange +apiVersion: build.openshift.io/v1 +kind: BuildConfig +metadata: + annotations: + app.openshift.io/vcs-ref: "" + app.openshift.io/vcs-uri: https://github.com/fedora-infra/planet + labels: + app: planet + app.kubernetes.io/component: planet + app.kubernetes.io/instance: planet + app.kubernetes.io/name: planet + app.kubernetes.io/part-of: planet-app + name: planet +spec: + nodeSelector: null + output: + to: + kind: ImageStreamTag + name: planet:latest + postCommit: {} + resources: {} + runPolicy: Serial + source: + contextDir: / + git: + uri: https://github.com/fedora-infra/planet + type: Git + strategy: + dockerStrategy: + dockerfilePath: Dockerfile + type: Docker + triggers: + - generic: + secretReference: + name: planet-generic-webhook-secret + type: Generic + - github: + secretReference: + name: planet-github-webhook-secret + type: GitHub + - type: ConfigChange diff --git a/roles/openshift-apps/planet/templates/deployment.yml b/roles/openshift-apps/planet/templates/deployment.yml index f78a959279..ae41bf5d21 100644 --- a/roles/openshift-apps/planet/templates/deployment.yml +++ b/roles/openshift-apps/planet/templates/deployment.yml @@ -1,50 +1,50 @@ -- apiVersion: apps/v1 - kind: Deployment - metadata: - labels: +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + app: planet + app.kubernetes.io/component: planet + app.kubernetes.io/instance: planet + app.kubernetes.io/name: planet + app.kubernetes.io/part-of: planet-app + name: planet +spec: + progressDeadlineSeconds: 600 + replicas: 1 + revisionHistoryLimit: 10 + selector: + matchLabels: app: planet - app.kubernetes.io/component: planet - app.kubernetes.io/instance: planet - app.kubernetes.io/name: planet - app.kubernetes.io/part-of: planet-app - name: planet - spec: - progressDeadlineSeconds: 600 - replicas: 1 - revisionHistoryLimit: 10 - selector: - matchLabels: + strategy: + type: Recreate + template: + metadata: + creationTimestamp: null + labels: app: planet - strategy: - type: Recreate - template: - metadata: - creationTimestamp: null - labels: - app: planet - deployment: planet - spec: - containers: - - name: planet - image: planet:latest - ports: - - containerPort: 8080 - volumeMounts: - - name: ipa-config-volume - mountPath: /etc/ipa - readOnly: true - - name: keytab-volume - mountPath: /etc/keytabs - readOnly: true - volumes: + deployment: planet + spec: + containers: + - name: planet + image: planet:latest + ports: + - containerPort: 8080 + volumeMounts: - name: ipa-config-volume - configMap: - name: ipa-client-config + mountPath: /etc/ipa + readOnly: true - name: keytab-volume - secret: - secretName: planet-keytab - dnsPolicy: ClusterFirst - restartPolicy: Always - schedulerName: default-scheduler - securityContext: {} - terminationGracePeriodSeconds: 30 + mountPath: /etc/keytabs + readOnly: true + volumes: + - name: ipa-config-volume + configMap: + name: ipa-client-config + - name: keytab-volume + secret: + secretName: planet-keytab + dnsPolicy: ClusterFirst + restartPolicy: Always + schedulerName: default-scheduler + securityContext: {} + terminationGracePeriodSeconds: 30