Merge pull request #2 from entando-k8s/latest-images

Initial jenkins-x import
entando-k8s · Mar 25, 2021 · 1f507c2 · 1f507c2
2 parents 8f5b1ba + 1678a98
commit 1f507c2
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 36 deletions.
diff --git a/jenkins-x.yml b/jenkins-x.yml
@@ -1 +1,26 @@
 buildPack: docker
+pipelineConfig:
+  agent:
+    image: entando-jx-maven
+  env:
+    - name: PIPELINE_CODE
+      value: eob
+  pipelines:
+    pullRequest:
+      build:
+        replace: true
+        steps:
+          - sh: echo "This avoids unwanted kaniko command substitution"  &&  skaffold build -f skaffold.yaml
+            name: container-build
+          - sh: operator-sdk bundle validate "${DOCKER_REGISTRY}/entando/${APP_NAME}:$(cat VERSION)"
+            name: verify-bundle
+    release:
+      build:
+        replace: true
+        steps:
+          - sh: echo "This avoids unwanted kaniko command substitution"  &&  skaffold build  -f skaffold.yaml
+            name: container-build
+          - sh: operator-sdk bundle validate "${DOCKER_REGISTRY}/entando/${APP_NAME}:$(cat VERSION)"
+            name: verify-bundle
+          - sh: jx step post build --image "${DOCKER_REGISTRY}/entando/${APP_NAME}:$(cat VERSION)"
+            name: post-build
diff --git a/manifests/entando-emtpy-tls-secret.yaml → manifests/entando-empty-tls-secret.yaml b/manifests/entando-emtpy-tls-secret.yaml → manifests/entando-empty-tls-secret.yaml
diff --git a/manifests/entando-k8s-operator.v0.3.x.clusterserviceversion.yaml b/manifests/entando-k8s-operator.v0.3.x.clusterserviceversion.yaml
@@ -1,7 +1,7 @@
 apiVersion: operators.coreos.com/v1alpha1
 kind: ClusterServiceVersion
 metadata:
-  name: entando-k8s-operator.v0.3.74
+  name: entando-k8s-operator.v0.3.75
   namespace: placeholder
   annotations:
     alm-examples: >-
@@ -28,7 +28,7 @@ metadata:
 spec:
   displayName: Entando Operator
   maturity: beta
-  version: 0.3.74
+  version: 0.3.75
 #  replaces: entando-k8s-operator.v0.3.56
   skips: []
   description: >
@@ -334,32 +334,32 @@ spec:
       image: registry.redhat.io/rhel8/mysql-80@sha256:162662b43ebc94e30f9ac66a57b143b192aebd65bb96cf44b1d54dd140563cd6
     - name: rhel8-postgresql-12
       image: registry.redhat.io/rhel8/postgresql-12@sha256:c6b6da4f762c2f68bfe558efe954739438ffa2e9aae1c617b50011fb0eed8347
-    - name: app-builder #6.3.44
-      image: docker.io/entando/app-builder@sha256:55228066b17dc2bbef6c20651ed6f0b61755407da61be8655c536953c4b7e43e
-    - name: entando-component-manager #6.3.8
-      image: docker.io/entando/entando-component-manager@sha256:5bca03eefa1eea5e1c8af9831981c2b9338e8c316684b3f029d87fa18e833411
-    - name: entando-de-app-eap #6.3.50
-      image: docker.io/entando/entando-de-app-eap@sha256:50257d3c1a0ed4da53f6c77acccb8cb8d1b15ecb3de8a40609443016d1e0f9d9
-    - name: entando-k8s-app-controller #6.3.5
+    - name: app-builder #6.3.48
+      image: docker.io/entando/app-builder@sha256:9741295af3ebfd4065d94719280405d2240b8ad434e0a677e7fb4f27586d74c9
+    - name: entando-component-manager #6.3.12
+      image: docker.io/entando/entando-component-manager@sha256:0af0c5aa4aa79fde87eded61cf111f5b70aec0a795ac0d1ee42223b5e8cab284
+    - name: entando-de-app-eap #6.3.55 
+      image: docker.io/entando/entando-de-app-eap@sha256:0c4b75b690659998ff50807ff6af029fd6209390c0468027e70723563a9c1133
+    - name: entando-k8s-app-controller #6.3.5 
       image: docker.io/entando/entando-k8s-app-controller@sha256:2360de53d9a8e3ddbf2cf4e9ba386576570b532a439d5f34a56bf226bdf8c678
-    - name: entando-k8s-app-plugin-link-controller #6.3.3
+    - name: entando-k8s-app-plugin-link-controller #6.3.3 
       image: docker.io/entando/entando-k8s-app-plugin-link-controller@sha256:7412f114e653479b27499cc2d1c366745e5d307e09d637f7967a67ab769654b7
-    - name: entando-k8s-cluster-infrastructure-controller #6.3.2
-      image: docker.io/entando/entando-k8s-cluster-infrastructure-controller@sha256:0ffaed8db606af38379d214c2fcce71ad6f478318dfe41160d8f68c8c2374866
-    - name: entando-k8s-composite-app-controller #6.3.3
+    - name: entando-k8s-cluster-infrastructure-controller #6.3.5 
+      image: docker.io/entando/entando-k8s-cluster-infrastructure-controller@sha256:3bf069302cea487926cdbc4f7899b7ca05c91306e854b9b5ff398aaeab0d6d46
+    - name: entando-k8s-composite-app-controller #6.3.3 
       image: docker.io/entando/entando-k8s-composite-app-controller@sha256:5393e8d039631401a0138f748edcdc2fe95a8a1cd7fd23d845f4561692780d15
     - name: entando-k8s-database-service-controller #6.3.7
       image: docker.io/entando/entando-k8s-database-service-controller@sha256:061cd86df694e2475c19d408e25da66c6feb26a1876e41030ab5c6d6ae9b558e
-    - name: entando-k8s-dbjob #6.3.1
+    - name: entando-k8s-dbjob #6.3.6 
       image: docker.io/entando/entando-k8s-dbjob@sha256:3141acbdc85fd22e3b1599e534252134a9dcf348277b70ffea3fc5afd15edab9
-    - name: entando-k8s-keycloak-controller #6.3.4
+    - name: entando-k8s-keycloak-controller #6.3.4 
       image: docker.io/entando/entando-k8s-keycloak-controller@sha256:58fc8bda7b68fc4e6311598739ec5b9b0271ef106d2e9bb116d19df4507b16b0
-    - name: entando-k8s-plugin-controller #6.3.3
+    - name: entando-k8s-plugin-controller #6.3.3 
       image: docker.io/entando/entando-k8s-plugin-controller@sha256:0ee92f85a37a5274014b2f956a4c2c3b39686708070e8c746ee3b2be0d0a668c
-    - name: entando-k8s-service #6.3.2
-      image: docker.io/entando/entando-k8s-service@sha256:3d5e53ab17a1ff213dc9f6bb23052bec0b0f085a2fba7bd28d753c431c7dadb0
-    - name: entando-redhat-sso #6.3.5
-      image: docker.io/ampie/entando-redhat-sso@sha256:2aae353d8632ad9a3671b496784ae05a06b3f57be69c1c1584e017f4cac85da7
+    - name: entando-k8s-service #6.3.3 
+      image: docker.io/entando/entando-k8s-service@sha256:6aaadf8b8515c433fea21b14df55f6e7cb8aa81e71ae46efab1e8ad3afc3bfd3
+    - name: entando-redhat-sso #6.3.6 
+      image: docker.io/entando/entando-redhat-sso@sha256:098a68b16a7adb1b5ec91038f9b52a517f1b868a8dcf39150484096b55ad0227
   install:
     strategy: deployment
     spec:
@@ -558,7 +558,7 @@ spec:
                 imagePullSecrets:
                   - name: entando-pull-secret
                 containers:
-                  - image: ampie/entando-k8s-controller-coordinator@sha256:ecc64250df8027a358a9772f93fa3b5cd21f63fc14a4200212a44f7d93f1a0a6
+                  - image: entando/entando-k8s-controller-coordinator@sha256:dc0c66a454872e9dd1e980239343e1978a2f3e87bf54ccc9718d2614f5d60fae
                     imagePullPolicy: IfNotPresent
                     name: entando-operator
                     resources:
@@ -584,7 +584,7 @@ spec:
                       - name: ENTANDO_DISABLE_KEYCLOAK_SSL_REQUIREMENT
                         value: "true"
                       - name: ENTANDO_K8S_OPERATOR_VERSION
-                        value: 0.3.74
+                        value: 0.3.75
                       - name: ENTANDO_K8S_OPERATOR_VERSION_TO_REPLACE
                         value: 0.3.56
                       - name: ENTANDO_K8S_OPERATOR_DEPLOYMENT_TYPE
@@ -607,32 +607,32 @@ spec:
                         value: registry.redhat.io/rhel8/mysql-80@sha256:162662b43ebc94e30f9ac66a57b143b192aebd65bb96cf44b1d54dd140563cd6
                       - name: RELATED_IMAGE_RHEL8_POSTGRESQL_12
                         value: registry.redhat.io/rhel8/postgresql-12@sha256:c6b6da4f762c2f68bfe558efe954739438ffa2e9aae1c617b50011fb0eed8347
-                      - name: RELATED_IMAGE_APP_BUILDER #6.3.44
-                        value: docker.io/entando/app-builder@sha256:55228066b17dc2bbef6c20651ed6f0b61755407da61be8655c536953c4b7e43e
-                      - name: RELATED_IMAGE_ENTANDO_COMPONENT_MANAGER #6.3.8
-                        value: docker.io/entando/entando-component-manager@sha256:5bca03eefa1eea5e1c8af9831981c2b9338e8c316684b3f029d87fa18e833411
-                      - name: RELATED_IMAGE_ENTANDO_DE_APP_EAP #6.3.50
-                        value: docker.io/entando/entando-de-app-eap@sha256:50257d3c1a0ed4da53f6c77acccb8cb8d1b15ecb3de8a40609443016d1e0f9d9
+                      - name: RELATED_IMAGE_APP_BUILDER #6.3.48
+                        value: docker.io/entando/app-builder@sha256:9741295af3ebfd4065d94719280405d2240b8ad434e0a677e7fb4f27586d74c9
+                      - name: RELATED_IMAGE_ENTANDO_COMPONENT_MANAGER #6.3.12
+                        value: docker.io/entando/entando-component-manager@sha256:0af0c5aa4aa79fde87eded61cf111f5b70aec0a795ac0d1ee42223b5e8cab284
+                      - name: RELATED_IMAGE_ENTANDO_DE_APP_EAP #6.3.55
+                        value: docker.io/entando/entando-de-app-eap@sha256:0c4b75b690659998ff50807ff6af029fd6209390c0468027e70723563a9c1133
                       - name: RELATED_IMAGE_ENTANDO_K8S_APP_CONTROLLER #6.3.5
                         value: docker.io/entando/entando-k8s-app-controller@sha256:2360de53d9a8e3ddbf2cf4e9ba386576570b532a439d5f34a56bf226bdf8c678
                       - name: RELATED_IMAGE_ENTANDO_K8S_APP_PLUGIN_LINK_CONTROLLER #6.3.3
                         value: docker.io/entando/entando-k8s-app-plugin-link-controller@sha256:7412f114e653479b27499cc2d1c366745e5d307e09d637f7967a67ab769654b7
-                      - name: RELATED_IMAGE_ENTANDO_K8S_CLUSTER_INFRASTRUCTURE_CONTROLLER #6.3.2
-                        value: docker.io/entando/entando-k8s-cluster-infrastructure-controller@sha256:8a109e31ab0f1e42dd4ab2f3239d2ef87d6964d5529f35cd03379574bc3cf967
+                      - name: RELATED_IMAGE_ENTANDO_K8S_CLUSTER_INFRASTRUCTURE_CONTROLLER #6.3.5
+                        value: docker.io/entando/entando-k8s-cluster-infrastructure-controller@sha256:3bf069302cea487926cdbc4f7899b7ca05c91306e854b9b5ff398aaeab0d6d46
                       - name: RELATED_IMAGE_ENTANDO_K8S_COMPOSITE_APP_CONTROLLER #6.3.3
                         value: docker.io/entando/entando-k8s-composite-app-controller@sha256:5393e8d039631401a0138f748edcdc2fe95a8a1cd7fd23d845f4561692780d15
                       - name: RELATED_IMAGE_ENTANDO_K8S_DATABASE_SERVICE_CONTROLLER #6.3.7
                         value: docker.io/entando/entando-k8s-database-service-controller@sha256:061cd86df694e2475c19d408e25da66c6feb26a1876e41030ab5c6d6ae9b558e
-                      - name: RELATED_IMAGE_ENTANDO_K8S_DBJOB #6.3.1
-                        value: docker.io/entando/entando-k8s-dbjob@sha256:a953072b663edeb3081c6f1a720079bdad2bdcc65e8ecca215363b3b2cd0e2f3
+                      - name: RELATED_IMAGE_ENTANDO_K8S_DBJOB #6.3.6
+                        value: docker.io/entando/entando-k8s-dbjob@sha256:3141acbdc85fd22e3b1599e534252134a9dcf348277b70ffea3fc5afd15edab9
                       - name: RELATED_IMAGE_ENTANDO_K8S_KEYCLOAK_CONTROLLER #6.3.4
                         value: docker.io/entando/entando-k8s-keycloak-controller@sha256:58fc8bda7b68fc4e6311598739ec5b9b0271ef106d2e9bb116d19df4507b16b0
                       - name: RELATED_IMAGE_ENTANDO_K8S_PLUGIN_CONTROLLER #6.3.3
                         value: docker.io/entando/entando-k8s-plugin-controller@sha256:0ee92f85a37a5274014b2f956a4c2c3b39686708070e8c746ee3b2be0d0a668c
-                      - name: RELATED_IMAGE_ENTANDO_K8S_SERVICE #6.3.2
-                        value: docker.io/entando/entando-k8s-service@sha256:3d5e53ab17a1ff213dc9f6bb23052bec0b0f085a2fba7bd28d753c431c7dadb0
-                      - name: RELATED_IMAGE_ENTANDO_REDHAT_SSO #6.3.5
-                        value: docker.io/entando/entando-redhat-sso@sha256:9b807937577a85de830cceaeedf73bf4bbfcabfbc8c246a21c2af06f02ef06c7
+                      - name: RELATED_IMAGE_ENTANDO_K8S_SERVICE #6.3.3
+                        value: docker.io/entando/entando-k8s-service@sha256:6aaadf8b8515c433fea21b14df55f6e7cb8aa81e71ae46efab1e8ad3afc3bfd3
+                      - name: RELATED_IMAGE_ENTANDO_REDHAT_SSO #6.3.6
+                        value: docker.io/entando/entando-redhat-sso@sha256:098a68b16a7adb1b5ec91038f9b52a517f1b868a8dcf39150484096b55ad0227
                     startupProbe:
                       exec:
                         command:

diff --git a/skaffold.yaml b/skaffold.yaml
@@ -26,3 +26,4 @@ profiles:
         setValueTemplates:
           image.repository: '{{.DOCKER_REGISTRY}}/{{.IMAGE_NAME}}'
           image.tag: '{{.DIGEST_HEX}}'
+
diff --git a/tests/scorecard/placeholder.txt b/tests/scorecard/placeholder.txt
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,3 +26,4 @@ profiles:
		setValueTemplates:
		image.repository: '{{.DOCKER_REGISTRY}}/{{.IMAGE_NAME}}'
		image.tag: '{{.DIGEST_HEX}}'