diff --git a/roles/openshift-apps/planet/templates/buildconfig.yml b/roles/openshift-apps/planet/templates/buildconfig.yml index 2c11926771..428624e4e1 100644 --- a/roles/openshift-apps/planet/templates/buildconfig.yml +++ b/roles/openshift-apps/planet/templates/buildconfig.yml @@ -1,41 +1,26 @@ 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 + name: 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 + build: planet spec: - nodeSelector: null - output: - to: - kind: ImageStreamTag - name: planet:latest - postCommit: {} - resources: {} runPolicy: Serial source: - contextDir: / + type: Git 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 + ref: {{ (env == 'production')|ternary('stable', 'staging') }} + strategy: + type: Docker + output: + to: + kind: ImageStreamTag + name: planet:latest + triggers: + - type: ConfigChange + - type: ImageChange + - type: GitHub + github: + secret: "{{ planet_stg_github_secret }}" diff --git a/roles/openshift-apps/planet/templates/deployment.yml b/roles/openshift-apps/planet/templates/deployment.yml index fb719964e5..8bdbb26998 100644 --- a/roles/openshift-apps/planet/templates/deployment.yml +++ b/roles/openshift-apps/planet/templates/deployment.yml @@ -1,17 +1,11 @@ apiVersion: apps/v1 kind: Deployment metadata: + name: 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: - progressDeadlineSeconds: 600 replicas: 1 - revisionHistoryLimit: 10 selector: matchLabels: app: planet @@ -36,9 +30,5 @@ spec: volumes: - name: keytab-volume secret: - secretName: planet-keytab-http - dnsPolicy: ClusterFirst - restartPolicy: Always - schedulerName: default-scheduler - securityContext: {} - terminationGracePeriodSeconds: 30 + secretName: planet-keytab-http + \ No newline at end of file