diff --git a/dist/ge-1-1-6/cluster-scoped-deployment/all-in-one.yaml b/dist/ge-1-1-6/cluster-scoped-deployment/all-in-one.yaml index 03dc313..c6384db 100644 --- a/dist/ge-1-1-6/cluster-scoped-deployment/all-in-one.yaml +++ b/dist/ge-1-1-6/cluster-scoped-deployment/all-in-one.yaml @@ -209,7 +209,7 @@ spec: The database management system (DBMS) to use for persistence of this EntandoApp. Can be any of mysql, oracle postgresql, embedded or none. Only 1 replica of the container is supported if embedded is selected. If Oracle is selected it must be created manually, the operator does not deploy Oracle instances. - See [here] (https://developer.entando.com/next/docs/consume/operator-intro.html#database-deployment) for how the operator will create and configure the DBMS. + See [here] (https://developer.entando.com/v7.3/docs/consume/operator-intro.html#database-deployment) for how the operator will create and configure the DBMS. type: string pattern: '^(mysql|oracle|postgresql|embedded|none)$' storageClass: @@ -223,7 +223,7 @@ spec: path specified in 'EntandoApp.spec.ingressPath' on this host. If omitted, the Entando Operator will automatically generate a hostname. - See [here] (https://developer.entando.com/next/docs/consume/operator-intro.html#ingress-path-generation) for how the operator will create and configure the Ingress. + See [here] (https://developer.entando.com/v7.3/docs/consume/operator-intro.html#ingress-path-generation) for how the operator will create and configure the Ingress. type: string pattern: '^([A-Za-z0-9-]{1,63}\.)*[[A-Za-z0-9-]{1,63}$' ingressPath: @@ -237,7 +237,7 @@ spec: tlsSecretName: description: > The name of a standard Kubernetes TLS Secret, assumed to be in the same Namespace as the EntandoApp being created. - See [here](https://developer.entando.com/next/docs/consume/operator-intro.html#tls-secret-creation) for details and instructions on + See [here](https://developer.entando.com/v7.3/docs/consume/operator-intro.html#tls-secret-creation) for details and instructions on creating a secret for your Entando applications. type: string pattern: '^([a-z])+([a-z0-9-\.])*[a-z0-9]$' @@ -248,6 +248,107 @@ spec: type: string pattern: '^([a-z])+([a-z0-9-\.])*[a-z0-9]$' environmentVariables: + description: > + A list of environment variables that are propagated to the app-engine and component-manager sub-modules. + The format follows the standard structure of Kubernetes Environment Variables + type: array + items: + type: object + properties: + name: + type: string + value: + type: string + valueFrom: + type: object + properties: + configMapKeyRef: + type: object + properties: + name: + description: Name of a ConfigMap in the same namespace as the EntandoApp + type: string + key: + description: Key of the ConfigMap entry in that holds the value to be used for the EnvironmentVariable + type: string + fieldRef: + type: object + properties: + apiVersion: + description: Version of the API to used for the field expression + type: string + fieldPath: + description: Full expression starting from the Pod resource + type: string + resourceFieldRef: + type: object + properties: + containerName: + description: Name of the container to use + type: string + resource: + description: Name of the resource to use + type: string + secretKeyRef: + type: object + properties: + name: + description: Name of a Secret in the same namespace as the EntandoApp + type: string + key: + description: Key of the Secret entry in that holds the value to be used for the EnvironmentVariable + type: string + environmentVariablesAppEngine: + description: > + A list of environment variables for the app-engine sub-module + type: array + items: + type: object + properties: + name: + type: string + value: + type: string + valueFrom: + type: object + properties: + configMapKeyRef: + type: object + properties: + name: + description: Name of a ConfigMap in the same namespace as the EntandoApp + type: string + key: + description: Key of the ConfigMap entry in that holds the value to be used for the EnvironmentVariable + type: string + fieldRef: + type: object + properties: + apiVersion: + description: Version of the API to used for the field expression + type: string + fieldPath: + description: Full expression starting from the Pod resource + type: string + resourceFieldRef: + type: object + properties: + containerName: + description: Name of the container to use + type: string + resource: + description: Name of the resource to use + type: string + secretKeyRef: + type: object + properties: + name: + description: Name of a Secret in the same namespace as the EntandoApp + type: string + key: + description: Key of the Secret entry in that holds the value to be used for the EnvironmentVariable + type: string + environmentVariablesComponentManager: description: > A list of environment variable following the standard structure of Kubernetes Environment Variables type: array @@ -297,6 +398,57 @@ spec: key: description: Key of the Secret entry in that holds the value to be used for the EnvironmentVariable type: string + environmentVariablesAppBuilder: + description: > + A list of environment variables for the app-builder sub-module + type: array + items: + type: object + properties: + name: + type: string + value: + type: string + valueFrom: + type: object + properties: + configMapKeyRef: + type: object + properties: + name: + description: Name of a ConfigMap in the same namespace as the EntandoApp + type: string + key: + description: Key of the ConfigMap entry in that holds the value to be used for the EnvironmentVariable + type: string + fieldRef: + type: object + properties: + apiVersion: + description: Version of the API to used for the field expression + type: string + fieldPath: + description: Full expression starting from the Pod resource + type: string + resourceFieldRef: + type: object + properties: + containerName: + description: Name of the container to use + type: string + resource: + description: Name of the resource to use + type: string + secretKeyRef: + type: object + properties: + name: + description: Name of a Secret in the same namespace as the EntandoApp + type: string + key: + description: Key of the Secret entry in that holds the value to be used for the EnvironmentVariable + type: string + resourceRequirements: description: > The projected resource requirements of the given EntandoApp deployment. Specifies the limits that the @@ -1791,7 +1943,7 @@ data: app-builder-6-3: >- {"version":"6.3.93-hotfix.1","executable-type":"n/a","registry":"registry.hub.docker.com","organization":"entando","repository":"app-builder"} app-builder-6-4: >- - {"version":"7.3.0-IT-403-PR-1521","executable-type":"n/a","registry":"registry.hub.docker.com","organization":"entando","repository":"app-builder"} + {"version":"7.5.0","executable-type":"n/a","registry":"registry.hub.docker.com","organization":"entando","repository":"app-builder"} busybox: >- {"version":"latest","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-avatar-plugin: >- @@ -1799,45 +1951,45 @@ data: entando-component-manager-6-3: >- {"version":"6.3.26-fix.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-component-manager"} entando-component-manager-6-4: >- - {"version":"7.3.0-IT-442-PR-352","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-component-manager"} + {"version":"7.5.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-component-manager"} entando-de-app-eap-6-3: >- {"version":"6.3.68-fix.3-ENG-3332-PR-335","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-de-app-eap"} entando-de-app-eap-6-4: >- - {"version":"7.2.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-de-app-eap"} + {"version":"7.3.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-de-app-eap"} entando-de-app-wildfly-6-3: >- {"version":"6.3.68-fix.3-ENG-3332-PR-335","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-de-app-wildfly"} entando-de-app-wildfly-6-4: >- - {"version":"7.2.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-de-app-wildfly"} + {"version":"7.3.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-de-app-wildfly"} entando-de-app-tomcat-6-4: >- - {"version":"7.3.0-IT-410-PR-189","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-de-app-tomcat"} + {"version":"7.5.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-de-app-tomcat"} entando-k8s-app-controller: >- - {"version":"7.2.0-IT-442-PR-90","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.5.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-k8s-app-plugin-link-controller: >- - {"version":"7.3.0-IT-442-PR-54","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.5.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-k8s-database-service-controller: >- - {"version":"7.2.0-IT-442-PR-48","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.5.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-k8s-dbjob: >- - {"version":"7.2.0-IT-442-PR-46","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.5.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-k8s-keycloak-controller: >- - {"version":"7.2.0-IT-442-PR-72","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.5.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-k8s-plugin-controller: >- - {"version":"7.3.0-IT-442-PR-83","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.5.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-k8s-service: >- - {"version":"7.3.0-ENG-5087-PR-80","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.5.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-keycloak: >- - {"version":"7.2.0-IT-406-PR-39","executable-type":"","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.5.0","executable-type":"","registry":"registry.hub.docker.com","organization":"entando"} entando-process-driven-plugin: >- {"version":"6.0.50-fix.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-redhat-sso: >- - {"version":"7.2.0","executable-type":"","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.5.0","executable-type":"","registry":"registry.hub.docker.com","organization":"entando"} mysql-80-centos7: >- - {"version":"v8.0.33-IT-409-PR-8-KB-release-2F-8.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-mysql-rocky"} + {"version":"8.0.33","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-mysql-rocky"} postgresql-12-centos7: >- - {"version":"14.1.0-IT-408-PR-10","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-postgres-rocky"} + {"version":"18.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-postgres-rocky"} rhel8-mysql-80: >- - {"version":"v8.0.33-IT-409-PR-8-KB-release-2F-8.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando",,"repository":"entando-mysql-ubi"} + {"version":"8.0.33","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando",,"repository":"entando-mysql-ubi"} rhel8-postgresql-12: >- - {"version":"14.1.0-IT-408-PR-10","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-postgres-ubi"} + {"version":"18.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-postgres-ubi"} --- # Source: entando-k8s-operator-bundle/charts/operator/templates/operator-clusterrole.yaml apiVersion: rbac.authorization.k8s.io/v1 @@ -1878,6 +2030,7 @@ rules: - extensions resources: - deployments + - deployments/scale verbs: - "*" - apiGroups: @@ -1977,6 +2130,7 @@ rules: - extensions resources: - deployments + - deployments/scale verbs: - "*" - apiGroups: @@ -2075,7 +2229,7 @@ spec: volumes: containers: - name: operator - image: "entando/entando-k8s-controller-coordinator:7.2.0-IT-442-PR-131" + image: "entando/entando-k8s-controller-coordinator:7.5.0" imagePullPolicy: Always volumeMounts: env: @@ -2201,5 +2355,5 @@ spec: failureThreshold: 1 timeoutSeconds: 1 image: >- - docker.io/entando/entando-k8s-service:7.3.0-ENG-5087-PR-80 + docker.io/entando/entando-k8s-service:7.5.0 serviceAccount: entando-operator diff --git a/dist/ge-1-1-6/namespace-scoped-deployment/cluster-resources.yaml b/dist/ge-1-1-6/namespace-scoped-deployment/cluster-resources.yaml index e6f03e2..5030b32 100644 --- a/dist/ge-1-1-6/namespace-scoped-deployment/cluster-resources.yaml +++ b/dist/ge-1-1-6/namespace-scoped-deployment/cluster-resources.yaml @@ -209,7 +209,7 @@ spec: The database management system (DBMS) to use for persistence of this EntandoApp. Can be any of mysql, oracle postgresql, embedded or none. Only 1 replica of the container is supported if embedded is selected. If Oracle is selected it must be created manually, the operator does not deploy Oracle instances. - See [here] (https://developer.entando.com/next/docs/consume/operator-intro.html#database-deployment) for how the operator will create and configure the DBMS. + See [here] (https://developer.entando.com/v7.3/docs/consume/operator-intro.html#database-deployment) for how the operator will create and configure the DBMS. type: string pattern: '^(mysql|oracle|postgresql|embedded|none)$' storageClass: @@ -223,7 +223,7 @@ spec: path specified in 'EntandoApp.spec.ingressPath' on this host. If omitted, the Entando Operator will automatically generate a hostname. - See [here] (https://developer.entando.com/next/docs/consume/operator-intro.html#ingress-path-generation) for how the operator will create and configure the Ingress. + See [here] (https://developer.entando.com/v7.3/docs/consume/operator-intro.html#ingress-path-generation) for how the operator will create and configure the Ingress. type: string pattern: '^([A-Za-z0-9-]{1,63}\.)*[[A-Za-z0-9-]{1,63}$' ingressPath: @@ -237,7 +237,7 @@ spec: tlsSecretName: description: > The name of a standard Kubernetes TLS Secret, assumed to be in the same Namespace as the EntandoApp being created. - See [here](https://developer.entando.com/next/docs/consume/operator-intro.html#tls-secret-creation) for details and instructions on + See [here](https://developer.entando.com/v7.3/docs/consume/operator-intro.html#tls-secret-creation) for details and instructions on creating a secret for your Entando applications. type: string pattern: '^([a-z])+([a-z0-9-\.])*[a-z0-9]$' @@ -248,6 +248,107 @@ spec: type: string pattern: '^([a-z])+([a-z0-9-\.])*[a-z0-9]$' environmentVariables: + description: > + A list of environment variables that are propagated to the app-engine and component-manager sub-modules. + The format follows the standard structure of Kubernetes Environment Variables + type: array + items: + type: object + properties: + name: + type: string + value: + type: string + valueFrom: + type: object + properties: + configMapKeyRef: + type: object + properties: + name: + description: Name of a ConfigMap in the same namespace as the EntandoApp + type: string + key: + description: Key of the ConfigMap entry in that holds the value to be used for the EnvironmentVariable + type: string + fieldRef: + type: object + properties: + apiVersion: + description: Version of the API to used for the field expression + type: string + fieldPath: + description: Full expression starting from the Pod resource + type: string + resourceFieldRef: + type: object + properties: + containerName: + description: Name of the container to use + type: string + resource: + description: Name of the resource to use + type: string + secretKeyRef: + type: object + properties: + name: + description: Name of a Secret in the same namespace as the EntandoApp + type: string + key: + description: Key of the Secret entry in that holds the value to be used for the EnvironmentVariable + type: string + environmentVariablesAppEngine: + description: > + A list of environment variables for the app-engine sub-module + type: array + items: + type: object + properties: + name: + type: string + value: + type: string + valueFrom: + type: object + properties: + configMapKeyRef: + type: object + properties: + name: + description: Name of a ConfigMap in the same namespace as the EntandoApp + type: string + key: + description: Key of the ConfigMap entry in that holds the value to be used for the EnvironmentVariable + type: string + fieldRef: + type: object + properties: + apiVersion: + description: Version of the API to used for the field expression + type: string + fieldPath: + description: Full expression starting from the Pod resource + type: string + resourceFieldRef: + type: object + properties: + containerName: + description: Name of the container to use + type: string + resource: + description: Name of the resource to use + type: string + secretKeyRef: + type: object + properties: + name: + description: Name of a Secret in the same namespace as the EntandoApp + type: string + key: + description: Key of the Secret entry in that holds the value to be used for the EnvironmentVariable + type: string + environmentVariablesComponentManager: description: > A list of environment variable following the standard structure of Kubernetes Environment Variables type: array @@ -297,6 +398,57 @@ spec: key: description: Key of the Secret entry in that holds the value to be used for the EnvironmentVariable type: string + environmentVariablesAppBuilder: + description: > + A list of environment variables for the app-builder sub-module + type: array + items: + type: object + properties: + name: + type: string + value: + type: string + valueFrom: + type: object + properties: + configMapKeyRef: + type: object + properties: + name: + description: Name of a ConfigMap in the same namespace as the EntandoApp + type: string + key: + description: Key of the ConfigMap entry in that holds the value to be used for the EnvironmentVariable + type: string + fieldRef: + type: object + properties: + apiVersion: + description: Version of the API to used for the field expression + type: string + fieldPath: + description: Full expression starting from the Pod resource + type: string + resourceFieldRef: + type: object + properties: + containerName: + description: Name of the container to use + type: string + resource: + description: Name of the resource to use + type: string + secretKeyRef: + type: object + properties: + name: + description: Name of a Secret in the same namespace as the EntandoApp + type: string + key: + description: Key of the Secret entry in that holds the value to be used for the EnvironmentVariable + type: string + resourceRequirements: description: > The projected resource requirements of the given EntandoApp deployment. Specifies the limits that the diff --git a/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml b/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml index 64be539..dd207de 100644 --- a/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml +++ b/dist/ge-1-1-6/namespace-scoped-deployment/namespace-resources.yaml @@ -36,7 +36,7 @@ data: app-builder-6-3: >- {"version":"6.3.93-hotfix.1","executable-type":"n/a","registry":"registry.hub.docker.com","organization":"entando","repository":"app-builder"} app-builder-6-4: >- - {"version":"7.3.0-IT-403-PR-1521","executable-type":"n/a","registry":"registry.hub.docker.com","organization":"entando","repository":"app-builder"} + {"version":"7.5.0","executable-type":"n/a","registry":"registry.hub.docker.com","organization":"entando","repository":"app-builder"} busybox: >- {"version":"latest","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-avatar-plugin: >- @@ -44,45 +44,45 @@ data: entando-component-manager-6-3: >- {"version":"6.3.26-fix.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-component-manager"} entando-component-manager-6-4: >- - {"version":"7.3.0-IT-442-PR-352","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-component-manager"} + {"version":"7.5.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-component-manager"} entando-de-app-eap-6-3: >- {"version":"6.3.68-fix.3-ENG-3332-PR-335","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-de-app-eap"} entando-de-app-eap-6-4: >- - {"version":"7.2.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-de-app-eap"} + {"version":"7.3.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-de-app-eap"} entando-de-app-wildfly-6-3: >- {"version":"6.3.68-fix.3-ENG-3332-PR-335","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-de-app-wildfly"} entando-de-app-wildfly-6-4: >- - {"version":"7.2.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-de-app-wildfly"} + {"version":"7.3.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-de-app-wildfly"} entando-de-app-tomcat-6-4: >- - {"version":"7.3.0-IT-410-PR-189","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-de-app-tomcat"} + {"version":"7.5.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-de-app-tomcat"} entando-k8s-app-controller: >- - {"version":"7.2.0-IT-442-PR-90","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.5.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-k8s-app-plugin-link-controller: >- - {"version":"7.3.0-IT-442-PR-54","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.5.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-k8s-database-service-controller: >- - {"version":"7.2.0-IT-442-PR-48","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.5.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-k8s-dbjob: >- - {"version":"7.2.0-IT-442-PR-46","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.5.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-k8s-keycloak-controller: >- - {"version":"7.2.0-IT-442-PR-72","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.5.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-k8s-plugin-controller: >- - {"version":"7.3.0-IT-442-PR-83","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.5.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-k8s-service: >- - {"version":"7.3.0-ENG-5087-PR-80","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.5.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-keycloak: >- - {"version":"7.2.0-IT-406-PR-39","executable-type":"","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.5.0","executable-type":"","registry":"registry.hub.docker.com","organization":"entando"} entando-process-driven-plugin: >- {"version":"6.0.50-fix.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando"} entando-redhat-sso: >- - {"version":"7.2.0","executable-type":"","registry":"registry.hub.docker.com","organization":"entando"} + {"version":"7.5.0","executable-type":"","registry":"registry.hub.docker.com","organization":"entando"} mysql-80-centos7: >- - {"version":"v8.0.33-IT-409-PR-8-KB-release-2F-8.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-mysql-rocky"} + {"version":"8.0.33","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-mysql-rocky"} postgresql-12-centos7: >- - {"version":"14.1.0-IT-408-PR-10","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-postgres-rocky"} + {"version":"18.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-postgres-rocky"} rhel8-mysql-80: >- - {"version":"v8.0.33-IT-409-PR-8-KB-release-2F-8.0","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando",,"repository":"entando-mysql-ubi"} + {"version":"8.0.33","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando",,"repository":"entando-mysql-ubi"} rhel8-postgresql-12: >- - {"version":"14.1.0-IT-408-PR-10","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-postgres-ubi"} + {"version":"18.1","executable-type":"jvm","registry":"registry.hub.docker.com","organization":"entando","repository":"entando-postgres-ubi"} --- # Source: entando-k8s-operator-bundle/charts/operator/templates/operator-role.yaml apiVersion: rbac.authorization.k8s.io/v1 @@ -123,6 +123,7 @@ rules: - extensions resources: - deployments + - deployments/scale verbs: - "*" - apiGroups: @@ -285,7 +286,7 @@ spec: volumes: containers: - name: operator - image: "entando/entando-k8s-controller-coordinator:7.2.0-IT-442-PR-131" + image: "entando/entando-k8s-controller-coordinator:7.5.0" imagePullPolicy: Always volumeMounts: env: @@ -415,5 +416,5 @@ spec: failureThreshold: 1 timeoutSeconds: 1 image: >- - docker.io/entando/entando-k8s-service:7.3.0-ENG-5087-PR-80 + docker.io/entando/entando-k8s-service:7.5.0 serviceAccount: entando-operator diff --git a/dist/ge-1-1-6/plain-templates/misc/entando-cds.yaml b/dist/ge-1-1-6/plain-templates/misc/entando-cds.yaml index 6659577..10e6ac8 100644 --- a/dist/ge-1-1-6/plain-templates/misc/entando-cds.yaml +++ b/dist/ge-1-1-6/plain-templates/misc/entando-cds.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Secret metadata: - name: YOUR-TENANT-ID-kc-secret + name: YOUR-TENANT-NAME-kc-secret type: Opaque stringData: KC_PUBLIC_KEY: "-----BEGIN PUBLIC KEY-----\nYOUR-PUBLIC-KEYCLOAK-KEY\n-----END PUBLIC KEY-----\n" @@ -10,8 +10,8 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: labels: - deployment: YOUR-TENANT-ID-cds-deployment - name: YOUR-TENANT-ID-cds-pvc + deployment: YOUR-TENANT-NAME-cds-deployment + name: YOUR-TENANT-NAME-cds-pvc spec: accessModes: - ReadWriteOnce @@ -24,9 +24,9 @@ spec: apiVersion: v1 kind: Service metadata: - name: YOUR-TENANT-ID-cds-service + name: YOUR-TENANT-NAME-cds-service labels: - app: YOUR-TENANT-ID-cds-service + app: YOUR-TENANT-NAME-cds-service spec: ports: - port: 8080 @@ -38,22 +38,22 @@ spec: protocol: TCP targetPort: 8081 selector: - app: YOUR-TENANT-ID-cds-deployment + app: YOUR-TENANT-NAME-cds-deployment --- apiVersion: apps/v1 kind: Deployment metadata: - name: YOUR-TENANT-ID-cds-deployment + name: YOUR-TENANT-NAME-cds-deployment labels: - app: YOUR-TENANT-ID-cds-deployment + app: YOUR-TENANT-NAME-cds-deployment spec: selector: matchLabels: - app: YOUR-TENANT-ID-cds-deployment + app: YOUR-TENANT-NAME-cds-deployment template: metadata: labels: - app: YOUR-TENANT-ID-cds-deployment + app: YOUR-TENANT-NAME-cds-deployment spec: initContainers: - name: init-cds-data @@ -61,9 +61,9 @@ spec: - name: FORCE_CDS value: "false" - name: REPO_PATH - value: https://raw.github.com/entando-ps/cds/entando721/entando-data/ + value: https://raw.github.com/entando-ps/cds/entando730/entando-data/ - name: ARCHIVE_NAME - value: entando721.tar.gz + value: entando730.tar.gz image: registry.hub.docker.com/entando/busybox-cds:1.36.0 imagePullPolicy: IfNotPresent volumeMounts: @@ -87,7 +87,7 @@ spec: valueFrom: secretKeyRef: key: KC_PUBLIC_KEY - name: YOUR-TENANT-ID-kc-secret + name: YOUR-TENANT-NAME-kc-secret - name: CORS_ALLOWED_ORIGIN # # use for external CDS service value: All # enter your Entando app domain name - name: CORS_ALLOWED_ORIGIN_END_WITH # use for wildcard domain name @@ -123,14 +123,14 @@ spec: volumes: - name: cds-data-volume persistentVolumeClaim: - claimName: YOUR-TENANT-ID-cds-pvc + claimName: YOUR-TENANT-NAME-cds-pvc readOnly: false replicas: 1 --- apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: YOUR-TENANT-ID-cds-ingress + name: YOUR-TENANT-NAME-cds-ingress annotations: nginx.ingress.kubernetes.io/configuration-snippet: | proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for; @@ -147,14 +147,14 @@ spec: paths: - backend: service: - name: YOUR-TENANT-ID-cds-service + name: YOUR-TENANT-NAME-cds-service port: number: 8081 pathType: Prefix - path: /YOUR-TENANT-ID + path: /YOUR-TENANT-NAME - backend: service: - name: YOUR-TENANT-ID-cds-service + name: YOUR-TENANT-NAME-cds-service port: number: 8080 pathType: Prefix diff --git a/dist/ge-1-1-6/plain-templates/misc/entando-solrCloud.yaml b/dist/ge-1-1-6/plain-templates/misc/entando-solrCloud.yaml index a8644e1..4011297 100644 --- a/dist/ge-1-1-6/plain-templates/misc/entando-solrCloud.yaml +++ b/dist/ge-1-1-6/plain-templates/misc/entando-solrCloud.yaml @@ -23,7 +23,7 @@ spec: replicas: 3 solrImage: repository: entando/entando-solr - tag: "8" + tag: "8.11.4" solrJavaMem: -Xms2048M -Xmx2048M updateStrategy: method: StatefulSet @@ -33,7 +33,7 @@ spec: image: pullPolicy: IfNotPresent repository: pravega/zookeeper - tag: 0.2.13 + tag: 0.2.15 persistence: reclaimPolicy: Delete spec: diff --git a/dist/ge-1-1-6/plain-templates/misc/entando-tenant-ingress.yaml b/dist/ge-1-1-6/plain-templates/misc/entando-tenant-ingress.yaml index 49dbccf..dd2f90e 100644 --- a/dist/ge-1-1-6/plain-templates/misc/entando-tenant-ingress.yaml +++ b/dist/ge-1-1-6/plain-templates/misc/entando-tenant-ingress.yaml @@ -8,11 +8,12 @@ metadata: generation: 4 labels: EntandoApp: YOUR-APP-NAME - name: YOUR-TENANT-ID-YOUR-APP-NAME-ingress + EntandoTenant: YOUR-TENANT-NAME + name: YOUR-TENANT-NAME-YOUR-APP-NAME-ingress spec: ingressClassName: nginx rules: - - host: YOUR-TENANT-ID.YOUR-APP-NAME.YOUR-HOST-NAME + - host: YOUR-TENANT-NAME.YOUR-APP-NAME.YOUR-HOST-NAME http: paths: - backend: diff --git a/dist/ge-1-1-6/plain-templates/misc/entando-tenants-secret.yaml b/dist/ge-1-1-6/plain-templates/misc/entando-tenants-secret.yaml index 6e6822c..c5c1b82 100644 --- a/dist/ge-1-1-6/plain-templates/misc/entando-tenants-secret.yaml +++ b/dist/ge-1-1-6/plain-templates/misc/entando-tenants-secret.yaml @@ -7,24 +7,34 @@ stringData: ENTANDO_TENANTS: >- [ { - "tenantCode": "YOUR-TENANT-ID", - "fqdns": "YOUR-TENANT-ID.YOUR-APP-NAME.YOUR-HOST-NAME", + "tenantCode": "YOUR-TENANT-NAME", + "entandoAppIngressName": "YOUR-TENANT-NAME-mt-ingress", + "fqdns": "YOUR-TENANT-NAME.YOUR-APP-NAME.YOUR-HOST-NAME", "kcEnabled": true, "kcAuthUrl": "https://YOUR-APP-NAME.YOUR-HOST-NAME/auth", - "kcRealm": "YOUR-TENANT-ID", + "kcInternalAuthUrl": "http://default-sso-in-namespace-service.mt.svc.cluster.local:8080/auth", + "kcAdminUsername": "entando_keycloak_admin", + "kcAdminPassword": "YOUR-KEYCLOAK-ADMIN-PASSWORD", + "kcRealm": "YOUR-TENANT-NAME", "kcClientId": "YOUR-APP-NAME", "kcClientSecret": "YOUR-TENANT-KC-SECRET", "kcPublicClientId": "entando-web", "kcSecureUris": "", "kcDefaultAuthorizations": "", "dbDriverClassName": "org.postgresql.Driver", - "dbUrl": "jdbc:postgresql://default-postgresql-dbms-in-namespace-service.YOUR-NAMESPACE.svc.cluster.local:5432/default_postgresql_dbms_in_namespace_db?currentSchema=YOUR-TENANT-ID", + "dbUrl": "jdbc:postgresql://default-postgresql-dbms-in-namespace-service.YOUR-NAMESPACE.svc.cluster.local:5432/default_postgresql_dbms_in_namespace_db?currentSchema=YOUR-TENANT-NAME", "dbUsername": "postgres", "dbPassword": "YOUR-POSTGRES-DB-PASSWORD", - "cdsPublicUrl": "http://YOUR-APP-NAME-cds.YOUR-HOST-NAME/YOUR-TENANT-ID", - "cdsPrivateUrl": "http://YOUR-TENANT-ID-cds-service:8080", + "cdsPublicUrl": "http://YOUR-APP-NAME-cds.YOUR-HOST-NAME/YOUR-TENANT-NAME", + "cdsPrivateUrl": "http://YOUR-TENANT-NAME-cds-service:8080", "cdsPath": "api/v1", "solrAddress": "http://solr-solrcloud-common/solr", - "solrCore": "YOUR-TENANT-ID" + "solrCore": "YOUR-TENANT-NAME", + "deDbDriverClassName": "org.postgresql.Driver", + "deDbUrl": "jdbc:postgresql://default-postgresql-dbms-in-namespace-service.mt.svc.cluster.local:5432/default_postgresql_dbms_in_namespace_db?currentSchema=YOUR-TENANT-NAME_cmschema", + "deDbUsername": "postgres", + "deDbPassword": "YOUR-POSTGRES-DB-DE-PASSWORD", + "deKcClientId": "YOUR-KEYCLOAK-CLIENT-ID", + "deKcClientSecret": "YOUR-KEYCLOAK-CLIENT-SECRET" } - ] \ No newline at end of file + ] diff --git a/dist/ge-1-1-6/plain-templates/misc/entando-upgrade.sh b/dist/ge-1-1-6/plain-templates/misc/entando-upgrade.sh index 0138453..751d690 100644 --- a/dist/ge-1-1-6/plain-templates/misc/entando-upgrade.sh +++ b/dist/ge-1-1-6/plain-templates/misc/entando-upgrade.sh @@ -101,9 +101,9 @@ EOF # We need to create the kustomization.yaml file inside the overlay directory based on the environment we are working on if [ $clusterType == "K8S" ]; then # We are going to download the K8S template from entando-releases repository - curl -O https://raw.githubusercontent.com/entando/entando-releases/release/7.2/dist/ge-1-1-6/plain-templates/misc/kustomization-K8S.yaml + curl -O https://raw.githubusercontent.com/entando/entando-releases/release/7.3/dist/ge-1-1-6/plain-templates/misc/kustomization-K8S.yaml else - curl -O https://raw.githubusercontent.com/entando/entando-releases/release/7.2/dist/ge-1-1-6/plain-templates/misc/kustomization-OCP.yaml + curl -O https://raw.githubusercontent.com/entando/entando-releases/release/7.3/dist/ge-1-1-6/plain-templates/misc/kustomization-OCP.yaml fi # Generate the final kustomization file diff --git a/dist/ge-1-1-6/plain-templates/misc/kustomization-K8S.yaml b/dist/ge-1-1-6/plain-templates/misc/kustomization-K8S.yaml index 5bd9815..227c693 100644 --- a/dist/ge-1-1-6/plain-templates/misc/kustomization-K8S.yaml +++ b/dist/ge-1-1-6/plain-templates/misc/kustomization-K8S.yaml @@ -1,12 +1,12 @@ - name: registry.hub.docker.com/entando/entando-mysql-ubi newName: registry.hub.docker.com/entando/entando-mysql-ubi - newTag: v8.0.33-IT-409-PR-8-KB-release-2F-8.0 + newTag: 8.0.33 - name: registry.hub.docker.com/entando/entando-postgres-ubi newName: registry.hub.docker.com/entando/entando-postgres-ubi - newTag: 14.1.0-IT-408-PR-10 + newTag: v14.8 - name: registry.hub.docker.com/entando/app-builder newName: registry.hub.docker.com/entando/app-builder - newTag: 7.3.0-IT-403-PR-1521 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/busybox newName: registry.hub.docker.com/entando/busybox newTag: latest @@ -15,22 +15,22 @@ newTag: 6.0.5 - name: registry.hub.docker.com/entando/entando-component-manager newName: registry.hub.docker.com/entando/entando-component-manager - newTag: 7.3.0-IT-442-PR-352 + newTag: 7.3.0-fix.2 - name: registry.hub.docker.com/entando/entando-de-app-eap newName: registry.hub.docker.com/entando/entando-de-app-eap - newTag: 7.2.1 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/entando-de-app-wildfly newName: registry.hub.docker.com/entando/entando-de-app-wildfly - newTag: 7.2.1 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/entando-de-app-tomcat newName: registry.hub.docker.com/entando/entando-de-app-tomcat - newTag: 7.3.0-IT-410-PR-189 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/entando-k8s-app-controller newName: registry.hub.docker.com/entando/entando-k8s-app-controller - newTag: 7.2.0-IT-442-PR-90 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/entando-k8s-app-plugin-link-controller newName: registry.hub.docker.com/entando/entando-k8s-app-plugin-link-controller - newTag: 7.3.0-IT-442-PR-54 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/entando-k8s-cluster-infrastructure-controller newName: registry.hub.docker.com/entando/entando-k8s-cluster-infrastructure-controller newTag: 6.3.7 @@ -39,34 +39,34 @@ newTag: 6.3.11 - name: registry.hub.docker.com/entando/entando-k8s-controller-coordinator newName: registry.hub.docker.com/entando/entando-k8s-controller-coordinator - newTag: 7.2.0-IT-442-PR-131 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/entando-k8s-database-service-controller newName: registry.hub.docker.com/entando/entando-k8s-database-service-controller - newTag: 7.2.0-IT-442-PR-48 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/entando-k8s-dbjob newName: registry.hub.docker.com/entando/entando-k8s-dbjob - newTag: 7.2.0-IT-442-PR-46 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/entando-k8s-keycloak-controller newName: registry.hub.docker.com/entando/entando-k8s-keycloak-controller - newTag: 7.2.0-IT-442-PR-72 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/entando-k8s-plugin-controller newName: registry.hub.docker.com/entando/entando-k8s-plugin-controller - newTag: 7.3.0-IT-442-PR-83 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/entando-k8s-service newName: registry.hub.docker.com/entando/entando-k8s-service - newTag: 7.3.0-ENG-5087-PR-80 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/entando-process-driven-plugin newName: registry.hub.docker.com/entando/entando-process-driven-plugin newTag: 6.0.50-fix.1 - name: registry.hub.docker.com/entando/entando-keycloak newName: registry.hub.docker.com/entando/entando-keycloak - newTag: 7.2.0-IT-406-PR-39 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/entando-redhat-sso newName: registry.hub.docker.com/entando/entando-redhat-sso - newTag: 7.2.0 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/entando-mysql-rocky newName: registry.hub.docker.com/entando/entando-mysql-rocky - newTag: v8.0.33-IT-409-PR-8-KB-release-2F-8.0 + newTag: 8.0.33 - name: registry.hub.docker.com/entando/entando-postgres-rocky newName: registry.hub.docker.com/entando/entando-postgres-rocky - newTag: 14.1.0-IT-408-PR-10 + newTag: v14.8 diff --git a/dist/ge-1-1-6/plain-templates/misc/kustomization-OCP.yaml b/dist/ge-1-1-6/plain-templates/misc/kustomization-OCP.yaml index 7378ca1..7b28817 100644 --- a/dist/ge-1-1-6/plain-templates/misc/kustomization-OCP.yaml +++ b/dist/ge-1-1-6/plain-templates/misc/kustomization-OCP.yaml @@ -1,12 +1,12 @@ - name: registry.hub.docker.com/entando/entando-mysql-ubi newName: registry.hub.docker.com/entando/entando-mysql-ubi - digest: sha256:1ec3d943f63b855b3caca61d35e39ad9cd6b42543c7a6732028f78c497a3c3a7 + digest: sha256:9af1569799dcd85699fce8cbc53b6f778267a98405bbd042f55be7faef728b5d - name: registry.hub.docker.com/entando/entando-postgres-ubi newName: registry.hub.docker.com/entando/entando-postgres-ubi - digest: sha256:d09b7d940614b408f6b7f6e880a75b9fea4f3f0ce2dcccd6b55189ecf5c1e3db + digest: sha256:1143ab73187edba8bc449cf57a58f249a478a91cfd27e071b85ae0c1b2d32e2a - name: registry.hub.docker.com/entando/app-builder newName: registry.hub.docker.com/entando/app-builder - digest: sha256:4ce12c7277ba7fb4a3111538512ddd1d39bc7f3b7d17b26f6fe4021ec21b547f + digest: sha256:2656afc1d02dbed73229e32c80669a8a51650bfe71f07b41dcccabf669034862 - name: registry.hub.docker.com/entando/busybox newName: registry.hub.docker.com/entando/busybox digest: sha256:a1ef5f92be800a97cf5baf89937aafe64bbd285514c4d8fec53f6800f8c4b31f @@ -15,22 +15,22 @@ digest: sha256:3ff5425ca1b27c609614879bf1c8a25df4e6c0c560caa683d272eccd6090cee6 - name: registry.hub.docker.com/entando/entando-component-manager newName: registry.hub.docker.com/entando/entando-component-manager - digest: sha256:f7ac841dd526844dd6d07c73ae35a2c03294a5d2edf8403ff1c587b3f946ab09 + digest: sha256:8167f58ae9faf8be3ed478c8888f2e3f1219b3524d70620e01ceed8950d543ce - name: registry.hub.docker.com/entando/entando-de-app-eap newName: registry.hub.docker.com/entando/entando-de-app-eap - digest: sha256:05901d8560c372b6616df9db83b6e2d481681a7fd34568ec7a96513de41d7496 + digest: sha256:f3e2c103445f7d21f4f2e53032e14bea6389cecca8ea4b6a181fba569e985401 - name: registry.hub.docker.com/entando/entando-de-app-wildfly newName: registry.hub.docker.com/entando/entando-de-app-wildfly - digest: sha256:6afb110660ba0e175c5c5d2bb2de987cea14227c6db2bb36f06ef520242408dc + digest: sha256:dcf5d4e67189e4b810bd78e31953ce4dbe897d442feb2754fec8b29934221269 - name: registry.hub.docker.com/entando/entando-de-app-tomcat newName: registry.hub.docker.com/entando/entando-de-app-tomcat - digest: sha256:d20dff3e25d11bddf23c6ac7a08d45c0745c3ac9f2be18fb7b4654264b99414f + digest: sha256:2734dfae019b5e514d5c0cee3fec50850bd1ec7515628998fde6e1832e098273 - name: registry.hub.docker.com/entando/entando-k8s-app-controller newName: registry.hub.docker.com/entando/entando-k8s-app-controller - digest: sha256:2784239a7d62a2cd98b3b3c0ac22e9efc5758ea00764fff2e099cf2ed6219102 + digest: sha256:ef1a6cba29ada42b465b4ae7542dae8571f8c4b0c209cb68604dff9539ef86eb - name: registry.hub.docker.com/entando/entando-k8s-app-plugin-link-controller newName: registry.hub.docker.com/entando/entando-k8s-app-plugin-link-controller - digest: sha256:28e732a0da2ac74cae470423f6aafb025ffd1d8821cea3668445fc098720858a + digest: sha256:16d8a4cf2cbf55d9d743dda36763f6d9dd84b88312027f6cd9962d48c2587078 - name: registry.hub.docker.com/entando/entando-k8s-cluster-infrastructure-controller newName: registry.hub.docker.com/entando/entando-k8s-cluster-infrastructure-controller digest: sha256:86dbea6696349d7b2393e12bacef4d1acec2dd3f8551e397fa26c92706a18dd3 @@ -39,34 +39,34 @@ digest: sha256:4bc6797bb41b3e407b64530c3cff7a78f3fc2c22863caad9c606ccd650310b61 - name: registry.hub.docker.com/entando/entando-k8s-controller-coordinator newName: registry.hub.docker.com/entando/entando-k8s-controller-coordinator - digest: sha256:1d4a90618a13be7c191d9bc296294f697a8972dbf9a55e9a76a714350e89db5d + digest: sha256:332ef068ed21cb43aaa38dfde655d8ecf637a467952ac77330e5a26c642381a2 - name: registry.hub.docker.com/entando/entando-k8s-database-service-controller newName: registry.hub.docker.com/entando/entando-k8s-database-service-controller - digest: sha256:9ca7d91f73882257c1efb2fd775b65e398599a177b2c4094d81c82bb1cedabf2 + digest: sha256:2b04bcf75e5c3f662c7cad51e7a770d9706ffef02b7167603a98cdaa40ddb52d - name: registry.hub.docker.com/entando/entando-k8s-dbjob newName: registry.hub.docker.com/entando/entando-k8s-dbjob - digest: sha256:d7e8582ea8146aeca0f66b0149be712f749123cec984c7cad2534569b8b0c171 + digest: sha256:27fb97213726408615190eddaace0f1f50d11fb877080b69475032d4cec6ca04 - name: registry.hub.docker.com/entando/entando-k8s-keycloak-controller newName: registry.hub.docker.com/entando/entando-k8s-keycloak-controller - digest: sha256:3d2c90b246013e64640c33637c3847049f327ab02c35719f7ccbe26b42f7a9d7 + digest: sha256:33a9ce7ce8eaab0923e0af3107ba6a40068d10f597042f27dbbffeb4ee6ce041 - name: registry.hub.docker.com/entando/entando-k8s-plugin-controller newName: registry.hub.docker.com/entando/entando-k8s-plugin-controller - digest: sha256:eca9b3f39cf4e24ad7485f506610bd8d1a63dc19aab8f70de876f2387fc0c8e0 + digest: sha256:d28ef449f1cb7aad32c3e846f4cc52b0c69296a966c177bac9171e2f53baca03 - name: registry.hub.docker.com/entando/entando-k8s-service newName: registry.hub.docker.com/entando/entando-k8s-service - digest: sha256:1ef8042ea5cafec2807c322363a82bf17f349c13cda7a600763533e3ec869db3 + digest: sha256:42af4d77c95201a2f9325c412b0d434dd2da023094757d432424e3b3af66a138 - name: registry.hub.docker.com/entando/entando-process-driven-plugin newName: registry.hub.docker.com/entando/entando-process-driven-plugin digest: sha256:18db1afb892393c1dcf7c36e5a4bbd1d6bc60029014094178ce1acb5dd1f68a4 - name: registry.hub.docker.com/entando/entando-keycloak newName: registry.hub.docker.com/entando/entando-keycloak - digest: sha256:e1e01bcafd0b850106a7897a81e32966147f72bcbeb26c1b91c7c0650ca2fbea + digest: sha256:cab6cded577c41a187bfc4981a5d59421be14b0067d63a9ad952d02c72532894 - name: registry.hub.docker.com/entando/entando-redhat-sso newName: registry.hub.docker.com/entando/entando-redhat-sso - digest: sha256:e8c9e9e193a6dbc9ea171497b5b6768f442f31e465d67e961eb7553bdcaddf18 + digest: sha256:3b663d67e54b34818f55dcb30a7d7a4d55e91c9bbfa6cdb2860756db88195aae - name: registry.hub.docker.com/entando/entando-mysql-rocky newName: registry.hub.docker.com/entando/entando-mysql-rocky - digest: sha256:f944e3cc69c9e30c7d59c9727610e28eec8152e26518c181ccf3de45306de490 + digest: sha256:e9d8cbd7b5bbf2982b5167e1a45866d2348a00d98dbeb2effeaf5d26179e4685 - name: registry.hub.docker.com/entando/entando-postgres-rocky newName: registry.hub.docker.com/entando/entando-postgres-rocky - digest: sha256:a1c47871c354f630047edbc45b93784ae4d5817e57f2a69223daf7141cfc84b3 + digest: sha256:eef845b29cf889aa983d38e1c1e7b4412bfe3e3a500640cf9f7369b9e97ac702 diff --git a/dist/ge-1-1-6/samples/entando-cds.yaml b/dist/ge-1-1-6/samples/entando-cds.yaml index 6659577..10e6ac8 100644 --- a/dist/ge-1-1-6/samples/entando-cds.yaml +++ b/dist/ge-1-1-6/samples/entando-cds.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Secret metadata: - name: YOUR-TENANT-ID-kc-secret + name: YOUR-TENANT-NAME-kc-secret type: Opaque stringData: KC_PUBLIC_KEY: "-----BEGIN PUBLIC KEY-----\nYOUR-PUBLIC-KEYCLOAK-KEY\n-----END PUBLIC KEY-----\n" @@ -10,8 +10,8 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: labels: - deployment: YOUR-TENANT-ID-cds-deployment - name: YOUR-TENANT-ID-cds-pvc + deployment: YOUR-TENANT-NAME-cds-deployment + name: YOUR-TENANT-NAME-cds-pvc spec: accessModes: - ReadWriteOnce @@ -24,9 +24,9 @@ spec: apiVersion: v1 kind: Service metadata: - name: YOUR-TENANT-ID-cds-service + name: YOUR-TENANT-NAME-cds-service labels: - app: YOUR-TENANT-ID-cds-service + app: YOUR-TENANT-NAME-cds-service spec: ports: - port: 8080 @@ -38,22 +38,22 @@ spec: protocol: TCP targetPort: 8081 selector: - app: YOUR-TENANT-ID-cds-deployment + app: YOUR-TENANT-NAME-cds-deployment --- apiVersion: apps/v1 kind: Deployment metadata: - name: YOUR-TENANT-ID-cds-deployment + name: YOUR-TENANT-NAME-cds-deployment labels: - app: YOUR-TENANT-ID-cds-deployment + app: YOUR-TENANT-NAME-cds-deployment spec: selector: matchLabels: - app: YOUR-TENANT-ID-cds-deployment + app: YOUR-TENANT-NAME-cds-deployment template: metadata: labels: - app: YOUR-TENANT-ID-cds-deployment + app: YOUR-TENANT-NAME-cds-deployment spec: initContainers: - name: init-cds-data @@ -61,9 +61,9 @@ spec: - name: FORCE_CDS value: "false" - name: REPO_PATH - value: https://raw.github.com/entando-ps/cds/entando721/entando-data/ + value: https://raw.github.com/entando-ps/cds/entando730/entando-data/ - name: ARCHIVE_NAME - value: entando721.tar.gz + value: entando730.tar.gz image: registry.hub.docker.com/entando/busybox-cds:1.36.0 imagePullPolicy: IfNotPresent volumeMounts: @@ -87,7 +87,7 @@ spec: valueFrom: secretKeyRef: key: KC_PUBLIC_KEY - name: YOUR-TENANT-ID-kc-secret + name: YOUR-TENANT-NAME-kc-secret - name: CORS_ALLOWED_ORIGIN # # use for external CDS service value: All # enter your Entando app domain name - name: CORS_ALLOWED_ORIGIN_END_WITH # use for wildcard domain name @@ -123,14 +123,14 @@ spec: volumes: - name: cds-data-volume persistentVolumeClaim: - claimName: YOUR-TENANT-ID-cds-pvc + claimName: YOUR-TENANT-NAME-cds-pvc readOnly: false replicas: 1 --- apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: YOUR-TENANT-ID-cds-ingress + name: YOUR-TENANT-NAME-cds-ingress annotations: nginx.ingress.kubernetes.io/configuration-snippet: | proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for; @@ -147,14 +147,14 @@ spec: paths: - backend: service: - name: YOUR-TENANT-ID-cds-service + name: YOUR-TENANT-NAME-cds-service port: number: 8081 pathType: Prefix - path: /YOUR-TENANT-ID + path: /YOUR-TENANT-NAME - backend: service: - name: YOUR-TENANT-ID-cds-service + name: YOUR-TENANT-NAME-cds-service port: number: 8080 pathType: Prefix diff --git a/dist/ge-1-1-6/samples/entando-solrCloud.yaml b/dist/ge-1-1-6/samples/entando-solrCloud.yaml index a8644e1..4011297 100644 --- a/dist/ge-1-1-6/samples/entando-solrCloud.yaml +++ b/dist/ge-1-1-6/samples/entando-solrCloud.yaml @@ -23,7 +23,7 @@ spec: replicas: 3 solrImage: repository: entando/entando-solr - tag: "8" + tag: "8.11.4" solrJavaMem: -Xms2048M -Xmx2048M updateStrategy: method: StatefulSet @@ -33,7 +33,7 @@ spec: image: pullPolicy: IfNotPresent repository: pravega/zookeeper - tag: 0.2.13 + tag: 0.2.15 persistence: reclaimPolicy: Delete spec: diff --git a/dist/ge-1-1-6/samples/entando-tenant-ingress.yaml b/dist/ge-1-1-6/samples/entando-tenant-ingress.yaml index 49dbccf..dd2f90e 100644 --- a/dist/ge-1-1-6/samples/entando-tenant-ingress.yaml +++ b/dist/ge-1-1-6/samples/entando-tenant-ingress.yaml @@ -8,11 +8,12 @@ metadata: generation: 4 labels: EntandoApp: YOUR-APP-NAME - name: YOUR-TENANT-ID-YOUR-APP-NAME-ingress + EntandoTenant: YOUR-TENANT-NAME + name: YOUR-TENANT-NAME-YOUR-APP-NAME-ingress spec: ingressClassName: nginx rules: - - host: YOUR-TENANT-ID.YOUR-APP-NAME.YOUR-HOST-NAME + - host: YOUR-TENANT-NAME.YOUR-APP-NAME.YOUR-HOST-NAME http: paths: - backend: diff --git a/dist/ge-1-1-6/samples/entando-tenants-secret.yaml b/dist/ge-1-1-6/samples/entando-tenants-secret.yaml index 6e6822c..c5c1b82 100644 --- a/dist/ge-1-1-6/samples/entando-tenants-secret.yaml +++ b/dist/ge-1-1-6/samples/entando-tenants-secret.yaml @@ -7,24 +7,34 @@ stringData: ENTANDO_TENANTS: >- [ { - "tenantCode": "YOUR-TENANT-ID", - "fqdns": "YOUR-TENANT-ID.YOUR-APP-NAME.YOUR-HOST-NAME", + "tenantCode": "YOUR-TENANT-NAME", + "entandoAppIngressName": "YOUR-TENANT-NAME-mt-ingress", + "fqdns": "YOUR-TENANT-NAME.YOUR-APP-NAME.YOUR-HOST-NAME", "kcEnabled": true, "kcAuthUrl": "https://YOUR-APP-NAME.YOUR-HOST-NAME/auth", - "kcRealm": "YOUR-TENANT-ID", + "kcInternalAuthUrl": "http://default-sso-in-namespace-service.mt.svc.cluster.local:8080/auth", + "kcAdminUsername": "entando_keycloak_admin", + "kcAdminPassword": "YOUR-KEYCLOAK-ADMIN-PASSWORD", + "kcRealm": "YOUR-TENANT-NAME", "kcClientId": "YOUR-APP-NAME", "kcClientSecret": "YOUR-TENANT-KC-SECRET", "kcPublicClientId": "entando-web", "kcSecureUris": "", "kcDefaultAuthorizations": "", "dbDriverClassName": "org.postgresql.Driver", - "dbUrl": "jdbc:postgresql://default-postgresql-dbms-in-namespace-service.YOUR-NAMESPACE.svc.cluster.local:5432/default_postgresql_dbms_in_namespace_db?currentSchema=YOUR-TENANT-ID", + "dbUrl": "jdbc:postgresql://default-postgresql-dbms-in-namespace-service.YOUR-NAMESPACE.svc.cluster.local:5432/default_postgresql_dbms_in_namespace_db?currentSchema=YOUR-TENANT-NAME", "dbUsername": "postgres", "dbPassword": "YOUR-POSTGRES-DB-PASSWORD", - "cdsPublicUrl": "http://YOUR-APP-NAME-cds.YOUR-HOST-NAME/YOUR-TENANT-ID", - "cdsPrivateUrl": "http://YOUR-TENANT-ID-cds-service:8080", + "cdsPublicUrl": "http://YOUR-APP-NAME-cds.YOUR-HOST-NAME/YOUR-TENANT-NAME", + "cdsPrivateUrl": "http://YOUR-TENANT-NAME-cds-service:8080", "cdsPath": "api/v1", "solrAddress": "http://solr-solrcloud-common/solr", - "solrCore": "YOUR-TENANT-ID" + "solrCore": "YOUR-TENANT-NAME", + "deDbDriverClassName": "org.postgresql.Driver", + "deDbUrl": "jdbc:postgresql://default-postgresql-dbms-in-namespace-service.mt.svc.cluster.local:5432/default_postgresql_dbms_in_namespace_db?currentSchema=YOUR-TENANT-NAME_cmschema", + "deDbUsername": "postgres", + "deDbPassword": "YOUR-POSTGRES-DB-DE-PASSWORD", + "deKcClientId": "YOUR-KEYCLOAK-CLIENT-ID", + "deKcClientSecret": "YOUR-KEYCLOAK-CLIENT-SECRET" } - ] \ No newline at end of file + ] diff --git a/dist/ge-1-1-6/samples/entando-upgrade.sh b/dist/ge-1-1-6/samples/entando-upgrade.sh index 0138453..751d690 100644 --- a/dist/ge-1-1-6/samples/entando-upgrade.sh +++ b/dist/ge-1-1-6/samples/entando-upgrade.sh @@ -101,9 +101,9 @@ EOF # We need to create the kustomization.yaml file inside the overlay directory based on the environment we are working on if [ $clusterType == "K8S" ]; then # We are going to download the K8S template from entando-releases repository - curl -O https://raw.githubusercontent.com/entando/entando-releases/release/7.2/dist/ge-1-1-6/plain-templates/misc/kustomization-K8S.yaml + curl -O https://raw.githubusercontent.com/entando/entando-releases/release/7.3/dist/ge-1-1-6/plain-templates/misc/kustomization-K8S.yaml else - curl -O https://raw.githubusercontent.com/entando/entando-releases/release/7.2/dist/ge-1-1-6/plain-templates/misc/kustomization-OCP.yaml + curl -O https://raw.githubusercontent.com/entando/entando-releases/release/7.3/dist/ge-1-1-6/plain-templates/misc/kustomization-OCP.yaml fi # Generate the final kustomization file diff --git a/dist/ge-1-1-6/samples/kustomization-K8S.yaml b/dist/ge-1-1-6/samples/kustomization-K8S.yaml index 5bd9815..227c693 100644 --- a/dist/ge-1-1-6/samples/kustomization-K8S.yaml +++ b/dist/ge-1-1-6/samples/kustomization-K8S.yaml @@ -1,12 +1,12 @@ - name: registry.hub.docker.com/entando/entando-mysql-ubi newName: registry.hub.docker.com/entando/entando-mysql-ubi - newTag: v8.0.33-IT-409-PR-8-KB-release-2F-8.0 + newTag: 8.0.33 - name: registry.hub.docker.com/entando/entando-postgres-ubi newName: registry.hub.docker.com/entando/entando-postgres-ubi - newTag: 14.1.0-IT-408-PR-10 + newTag: v14.8 - name: registry.hub.docker.com/entando/app-builder newName: registry.hub.docker.com/entando/app-builder - newTag: 7.3.0-IT-403-PR-1521 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/busybox newName: registry.hub.docker.com/entando/busybox newTag: latest @@ -15,22 +15,22 @@ newTag: 6.0.5 - name: registry.hub.docker.com/entando/entando-component-manager newName: registry.hub.docker.com/entando/entando-component-manager - newTag: 7.3.0-IT-442-PR-352 + newTag: 7.3.0-fix.2 - name: registry.hub.docker.com/entando/entando-de-app-eap newName: registry.hub.docker.com/entando/entando-de-app-eap - newTag: 7.2.1 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/entando-de-app-wildfly newName: registry.hub.docker.com/entando/entando-de-app-wildfly - newTag: 7.2.1 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/entando-de-app-tomcat newName: registry.hub.docker.com/entando/entando-de-app-tomcat - newTag: 7.3.0-IT-410-PR-189 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/entando-k8s-app-controller newName: registry.hub.docker.com/entando/entando-k8s-app-controller - newTag: 7.2.0-IT-442-PR-90 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/entando-k8s-app-plugin-link-controller newName: registry.hub.docker.com/entando/entando-k8s-app-plugin-link-controller - newTag: 7.3.0-IT-442-PR-54 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/entando-k8s-cluster-infrastructure-controller newName: registry.hub.docker.com/entando/entando-k8s-cluster-infrastructure-controller newTag: 6.3.7 @@ -39,34 +39,34 @@ newTag: 6.3.11 - name: registry.hub.docker.com/entando/entando-k8s-controller-coordinator newName: registry.hub.docker.com/entando/entando-k8s-controller-coordinator - newTag: 7.2.0-IT-442-PR-131 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/entando-k8s-database-service-controller newName: registry.hub.docker.com/entando/entando-k8s-database-service-controller - newTag: 7.2.0-IT-442-PR-48 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/entando-k8s-dbjob newName: registry.hub.docker.com/entando/entando-k8s-dbjob - newTag: 7.2.0-IT-442-PR-46 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/entando-k8s-keycloak-controller newName: registry.hub.docker.com/entando/entando-k8s-keycloak-controller - newTag: 7.2.0-IT-442-PR-72 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/entando-k8s-plugin-controller newName: registry.hub.docker.com/entando/entando-k8s-plugin-controller - newTag: 7.3.0-IT-442-PR-83 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/entando-k8s-service newName: registry.hub.docker.com/entando/entando-k8s-service - newTag: 7.3.0-ENG-5087-PR-80 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/entando-process-driven-plugin newName: registry.hub.docker.com/entando/entando-process-driven-plugin newTag: 6.0.50-fix.1 - name: registry.hub.docker.com/entando/entando-keycloak newName: registry.hub.docker.com/entando/entando-keycloak - newTag: 7.2.0-IT-406-PR-39 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/entando-redhat-sso newName: registry.hub.docker.com/entando/entando-redhat-sso - newTag: 7.2.0 + newTag: 7.3.0 - name: registry.hub.docker.com/entando/entando-mysql-rocky newName: registry.hub.docker.com/entando/entando-mysql-rocky - newTag: v8.0.33-IT-409-PR-8-KB-release-2F-8.0 + newTag: 8.0.33 - name: registry.hub.docker.com/entando/entando-postgres-rocky newName: registry.hub.docker.com/entando/entando-postgres-rocky - newTag: 14.1.0-IT-408-PR-10 + newTag: v14.8 diff --git a/dist/ge-1-1-6/samples/kustomization-OCP.yam b/dist/ge-1-1-6/samples/kustomization-OCP.yam index 7378ca1..7b28817 100644 --- a/dist/ge-1-1-6/samples/kustomization-OCP.yam +++ b/dist/ge-1-1-6/samples/kustomization-OCP.yam @@ -1,12 +1,12 @@ - name: registry.hub.docker.com/entando/entando-mysql-ubi newName: registry.hub.docker.com/entando/entando-mysql-ubi - digest: sha256:1ec3d943f63b855b3caca61d35e39ad9cd6b42543c7a6732028f78c497a3c3a7 + digest: sha256:9af1569799dcd85699fce8cbc53b6f778267a98405bbd042f55be7faef728b5d - name: registry.hub.docker.com/entando/entando-postgres-ubi newName: registry.hub.docker.com/entando/entando-postgres-ubi - digest: sha256:d09b7d940614b408f6b7f6e880a75b9fea4f3f0ce2dcccd6b55189ecf5c1e3db + digest: sha256:1143ab73187edba8bc449cf57a58f249a478a91cfd27e071b85ae0c1b2d32e2a - name: registry.hub.docker.com/entando/app-builder newName: registry.hub.docker.com/entando/app-builder - digest: sha256:4ce12c7277ba7fb4a3111538512ddd1d39bc7f3b7d17b26f6fe4021ec21b547f + digest: sha256:2656afc1d02dbed73229e32c80669a8a51650bfe71f07b41dcccabf669034862 - name: registry.hub.docker.com/entando/busybox newName: registry.hub.docker.com/entando/busybox digest: sha256:a1ef5f92be800a97cf5baf89937aafe64bbd285514c4d8fec53f6800f8c4b31f @@ -15,22 +15,22 @@ digest: sha256:3ff5425ca1b27c609614879bf1c8a25df4e6c0c560caa683d272eccd6090cee6 - name: registry.hub.docker.com/entando/entando-component-manager newName: registry.hub.docker.com/entando/entando-component-manager - digest: sha256:f7ac841dd526844dd6d07c73ae35a2c03294a5d2edf8403ff1c587b3f946ab09 + digest: sha256:8167f58ae9faf8be3ed478c8888f2e3f1219b3524d70620e01ceed8950d543ce - name: registry.hub.docker.com/entando/entando-de-app-eap newName: registry.hub.docker.com/entando/entando-de-app-eap - digest: sha256:05901d8560c372b6616df9db83b6e2d481681a7fd34568ec7a96513de41d7496 + digest: sha256:f3e2c103445f7d21f4f2e53032e14bea6389cecca8ea4b6a181fba569e985401 - name: registry.hub.docker.com/entando/entando-de-app-wildfly newName: registry.hub.docker.com/entando/entando-de-app-wildfly - digest: sha256:6afb110660ba0e175c5c5d2bb2de987cea14227c6db2bb36f06ef520242408dc + digest: sha256:dcf5d4e67189e4b810bd78e31953ce4dbe897d442feb2754fec8b29934221269 - name: registry.hub.docker.com/entando/entando-de-app-tomcat newName: registry.hub.docker.com/entando/entando-de-app-tomcat - digest: sha256:d20dff3e25d11bddf23c6ac7a08d45c0745c3ac9f2be18fb7b4654264b99414f + digest: sha256:2734dfae019b5e514d5c0cee3fec50850bd1ec7515628998fde6e1832e098273 - name: registry.hub.docker.com/entando/entando-k8s-app-controller newName: registry.hub.docker.com/entando/entando-k8s-app-controller - digest: sha256:2784239a7d62a2cd98b3b3c0ac22e9efc5758ea00764fff2e099cf2ed6219102 + digest: sha256:ef1a6cba29ada42b465b4ae7542dae8571f8c4b0c209cb68604dff9539ef86eb - name: registry.hub.docker.com/entando/entando-k8s-app-plugin-link-controller newName: registry.hub.docker.com/entando/entando-k8s-app-plugin-link-controller - digest: sha256:28e732a0da2ac74cae470423f6aafb025ffd1d8821cea3668445fc098720858a + digest: sha256:16d8a4cf2cbf55d9d743dda36763f6d9dd84b88312027f6cd9962d48c2587078 - name: registry.hub.docker.com/entando/entando-k8s-cluster-infrastructure-controller newName: registry.hub.docker.com/entando/entando-k8s-cluster-infrastructure-controller digest: sha256:86dbea6696349d7b2393e12bacef4d1acec2dd3f8551e397fa26c92706a18dd3 @@ -39,34 +39,34 @@ digest: sha256:4bc6797bb41b3e407b64530c3cff7a78f3fc2c22863caad9c606ccd650310b61 - name: registry.hub.docker.com/entando/entando-k8s-controller-coordinator newName: registry.hub.docker.com/entando/entando-k8s-controller-coordinator - digest: sha256:1d4a90618a13be7c191d9bc296294f697a8972dbf9a55e9a76a714350e89db5d + digest: sha256:332ef068ed21cb43aaa38dfde655d8ecf637a467952ac77330e5a26c642381a2 - name: registry.hub.docker.com/entando/entando-k8s-database-service-controller newName: registry.hub.docker.com/entando/entando-k8s-database-service-controller - digest: sha256:9ca7d91f73882257c1efb2fd775b65e398599a177b2c4094d81c82bb1cedabf2 + digest: sha256:2b04bcf75e5c3f662c7cad51e7a770d9706ffef02b7167603a98cdaa40ddb52d - name: registry.hub.docker.com/entando/entando-k8s-dbjob newName: registry.hub.docker.com/entando/entando-k8s-dbjob - digest: sha256:d7e8582ea8146aeca0f66b0149be712f749123cec984c7cad2534569b8b0c171 + digest: sha256:27fb97213726408615190eddaace0f1f50d11fb877080b69475032d4cec6ca04 - name: registry.hub.docker.com/entando/entando-k8s-keycloak-controller newName: registry.hub.docker.com/entando/entando-k8s-keycloak-controller - digest: sha256:3d2c90b246013e64640c33637c3847049f327ab02c35719f7ccbe26b42f7a9d7 + digest: sha256:33a9ce7ce8eaab0923e0af3107ba6a40068d10f597042f27dbbffeb4ee6ce041 - name: registry.hub.docker.com/entando/entando-k8s-plugin-controller newName: registry.hub.docker.com/entando/entando-k8s-plugin-controller - digest: sha256:eca9b3f39cf4e24ad7485f506610bd8d1a63dc19aab8f70de876f2387fc0c8e0 + digest: sha256:d28ef449f1cb7aad32c3e846f4cc52b0c69296a966c177bac9171e2f53baca03 - name: registry.hub.docker.com/entando/entando-k8s-service newName: registry.hub.docker.com/entando/entando-k8s-service - digest: sha256:1ef8042ea5cafec2807c322363a82bf17f349c13cda7a600763533e3ec869db3 + digest: sha256:42af4d77c95201a2f9325c412b0d434dd2da023094757d432424e3b3af66a138 - name: registry.hub.docker.com/entando/entando-process-driven-plugin newName: registry.hub.docker.com/entando/entando-process-driven-plugin digest: sha256:18db1afb892393c1dcf7c36e5a4bbd1d6bc60029014094178ce1acb5dd1f68a4 - name: registry.hub.docker.com/entando/entando-keycloak newName: registry.hub.docker.com/entando/entando-keycloak - digest: sha256:e1e01bcafd0b850106a7897a81e32966147f72bcbeb26c1b91c7c0650ca2fbea + digest: sha256:cab6cded577c41a187bfc4981a5d59421be14b0067d63a9ad952d02c72532894 - name: registry.hub.docker.com/entando/entando-redhat-sso newName: registry.hub.docker.com/entando/entando-redhat-sso - digest: sha256:e8c9e9e193a6dbc9ea171497b5b6768f442f31e465d67e961eb7553bdcaddf18 + digest: sha256:3b663d67e54b34818f55dcb30a7d7a4d55e91c9bbfa6cdb2860756db88195aae - name: registry.hub.docker.com/entando/entando-mysql-rocky newName: registry.hub.docker.com/entando/entando-mysql-rocky - digest: sha256:f944e3cc69c9e30c7d59c9727610e28eec8152e26518c181ccf3de45306de490 + digest: sha256:e9d8cbd7b5bbf2982b5167e1a45866d2348a00d98dbeb2effeaf5d26179e4685 - name: registry.hub.docker.com/entando/entando-postgres-rocky newName: registry.hub.docker.com/entando/entando-postgres-rocky - digest: sha256:a1c47871c354f630047edbc45b93784ae4d5817e57f2a69223daf7141cfc84b3 + digest: sha256:eef845b29cf889aa983d38e1c1e7b4412bfe3e3a500640cf9f7369b9e97ac702 diff --git a/dist/ge-1-1-6/samples/openshift-catalog-source.yaml b/dist/ge-1-1-6/samples/openshift-catalog-source.yaml index 727474e..fbd4e79 100644 --- a/dist/ge-1-1-6/samples/openshift-catalog-source.yaml +++ b/dist/ge-1-1-6/samples/openshift-catalog-source.yaml @@ -1,14 +1,14 @@ apiVersion: operators.coreos.com/v1alpha1 kind: CatalogSource metadata: - name: entando-7-3-0-test12 + name: entando-7-5-1 namespace: openshift-marketplace labels: operatorframework.io/arch.amd64: supported operatorframework.io/arch.arm64: supported spec: - displayName: "Entando 7.3.0-test12" - image: registry.hub.docker.com/entandobuilduser/entando-k8s-index@sha256:84571434ce6a5ac7026555a1dbe90b1b35b7548596d687e9593e51d5272672de + displayName: "Entando 7.5.1" + image: registry.hub.docker.com/entandobuilduser/entando-k8s-index@sha256:d274d2eb7973a4f606772db98b348484ae041346b2b110be3c5bf54c96d53f79 sourceType: grpc updateStrategy: registryPoll: diff --git a/dist/manifest b/dist/manifest index e627a21..f68c874 100755 --- a/dist/manifest +++ b/dist/manifest @@ -1,30 +1,30 @@ # ENTANDO VERSION -ENTANDO_RELEASE="v7.3.0-test12" +ENTANDO_RELEASE="v7.5.1" # -------------------------------------------------------------------------------- # OLM INSTALLATIONS - OPERATOR BUNDLE -OPERATOR_BUNDLE_VERSION="v7.3.0-test12" +OPERATOR_BUNDLE_VERSION="v7.5.1" REPO_OPERATOR_BUNDLE_ADDR="https://github.com/entando-k8s/entando-k8s-operator-bundle.git" REPO_OPERATOR_BUNDLE_DIR="entando-k8s-operator-bundle" -OKD_CATALOG_IMAGE="registry.hub.docker.com/entandobuilduser/entando-k8s-index@sha256:84571434ce6a5ac7026555a1dbe90b1b35b7548596d687e9593e51d5272672de" +OKD_CATALOG_IMAGE="registry.hub.docker.com/entandobuilduser/entando-k8s-index@sha256:d274d2eb7973a4f606772db98b348484ae041346b2b110be3c5bf54c96d53f79" # TOOL: ENTANDO CLI -ENTANDO_CLI_VERSION="v7.2.1" +ENTANDO_CLI_VERSION="v7.5.0" # TOOL: BUNDLER REPO_ENTANDO_BUNDLER_ADDR="https://github.com/entando/entando-bundler" -VER_ENTANDO_BUNDLER_REQ="v7.1.2" -VER_ENTANDO_BUNDLER_DEF="v7.1.2" +VER_ENTANDO_BUNDLER_REQ="v7.3.0" +VER_ENTANDO_BUNDLER_DEF="v7.3.0" # TOOL: entando-bundle-cli REPO_ENTANDO_BUNDLE_CLI_ADDR="https://github.com/entando/entando-bundle-cli" -VER_ENTANDO_BUNDLE_CLI_REQ="v1.1.1" -VER_ENTANDO_BUNDLE_CLI_DEF="v1.1.1" +VER_ENTANDO_BUNDLE_CLI_REQ="v1.2.3" +VER_ENTANDO_BUNDLE_CLI_DEF="v1.2.3" # TOOL: ECR -VER_GENERATOR_JHIPSTER_ENTANDO_REQ="v7.2.0" -VER_GENERATOR_JHIPSTER_ENTANDO_DEF="v7.2.0" +VER_GENERATOR_JHIPSTER_ENTANDO_REQ="v7.3.0" +VER_GENERATOR_JHIPSTER_ENTANDO_DEF="v7.3.0" VER_JHIPSTER_REQ="7.9.3" VER_JHIPSTER_DEF="7.9.3" @@ -33,20 +33,20 @@ VER_JHIPSTER_DEF="7.9.3" # OTHER DEPENDENCIES # JDK -VER_JDK_REQ="11.*.*" -VER_JDK_DEF="11.0.17" +VER_JDK_REQ="17.*.*" +VER_JDK_DEF="17.0.18" # NODE VER_NODE_REQ="14.*.*" VER_NODE_DEF="v14.20.0" # K3S -VER_K3S_REQ="1.23.*" -VER_K3S_DEF="v1.23.16+k3s1" +VER_K3S_REQ="1.26.*" +VER_K3S_DEF="v1.32.13+k3s1" # OPENSHIFT OKD -VER_OKD_REQ="4.11" -VER_OKD_DEF="4.11" +VER_OKD_REQ="4.13" +VER_OKD_DEF="4.18" # -------------------------------------------------------------------------------- diff --git a/dist/manifest.yaml b/dist/manifest.yaml index 4b7b67d..6c0a28b 100644 --- a/dist/manifest.yaml +++ b/dist/manifest.yaml @@ -1,12 +1,12 @@ entando: - main: "v7.3.0-test12" - operator_bundle: "v7.3.0-test12" - entando_cli_version: "v7.2.1" + main: "v7.5.1" + operator_bundle: "v7.5.1" + entando_cli_version: "v7.5.0" dependencies: jdk: - req_ver: "11.*.*" - def_ver: "11.0.17" + req_ver: "17.*.*" + def_ver: "17.0.18" node: req_ver: "14.*.*" def_ver: "v14.20.0" @@ -14,17 +14,17 @@ dependencies: req_ver: "7.9.3" def_ver: "7.9.3" generator_jhipster_entando: - req_ver: "v7.2.0" - def_ver: "v7.2.0" + req_ver: "v7.3.0" + def_ver: "v7.3.0" entando_bundler: - req_ver: "v7.1.2" - def_ver: "v7.1.2" + req_ver: "v7.3.0" + def_ver: "v7.3.0" entando_bundle_cli: - req_ver: "v1.1.1" - def_ver: "v1.1.1" + req_ver: "v1.2.3" + def_ver: "v1.2.3" k3s: - req_ver: "1.23.*" - def_ver: "v1.23.16+k3s1" + req_ver: "1.26.*" + def_ver: "v1.32.13+k3s1" okd: - req_ver: "4.11" - def_ver: "4.11" + req_ver: "4.13" + def_ver: "4.18" diff --git a/manifest b/manifest index e627a21..f68c874 100755 --- a/manifest +++ b/manifest @@ -1,30 +1,30 @@ # ENTANDO VERSION -ENTANDO_RELEASE="v7.3.0-test12" +ENTANDO_RELEASE="v7.5.1" # -------------------------------------------------------------------------------- # OLM INSTALLATIONS - OPERATOR BUNDLE -OPERATOR_BUNDLE_VERSION="v7.3.0-test12" +OPERATOR_BUNDLE_VERSION="v7.5.1" REPO_OPERATOR_BUNDLE_ADDR="https://github.com/entando-k8s/entando-k8s-operator-bundle.git" REPO_OPERATOR_BUNDLE_DIR="entando-k8s-operator-bundle" -OKD_CATALOG_IMAGE="registry.hub.docker.com/entandobuilduser/entando-k8s-index@sha256:84571434ce6a5ac7026555a1dbe90b1b35b7548596d687e9593e51d5272672de" +OKD_CATALOG_IMAGE="registry.hub.docker.com/entandobuilduser/entando-k8s-index@sha256:d274d2eb7973a4f606772db98b348484ae041346b2b110be3c5bf54c96d53f79" # TOOL: ENTANDO CLI -ENTANDO_CLI_VERSION="v7.2.1" +ENTANDO_CLI_VERSION="v7.5.0" # TOOL: BUNDLER REPO_ENTANDO_BUNDLER_ADDR="https://github.com/entando/entando-bundler" -VER_ENTANDO_BUNDLER_REQ="v7.1.2" -VER_ENTANDO_BUNDLER_DEF="v7.1.2" +VER_ENTANDO_BUNDLER_REQ="v7.3.0" +VER_ENTANDO_BUNDLER_DEF="v7.3.0" # TOOL: entando-bundle-cli REPO_ENTANDO_BUNDLE_CLI_ADDR="https://github.com/entando/entando-bundle-cli" -VER_ENTANDO_BUNDLE_CLI_REQ="v1.1.1" -VER_ENTANDO_BUNDLE_CLI_DEF="v1.1.1" +VER_ENTANDO_BUNDLE_CLI_REQ="v1.2.3" +VER_ENTANDO_BUNDLE_CLI_DEF="v1.2.3" # TOOL: ECR -VER_GENERATOR_JHIPSTER_ENTANDO_REQ="v7.2.0" -VER_GENERATOR_JHIPSTER_ENTANDO_DEF="v7.2.0" +VER_GENERATOR_JHIPSTER_ENTANDO_REQ="v7.3.0" +VER_GENERATOR_JHIPSTER_ENTANDO_DEF="v7.3.0" VER_JHIPSTER_REQ="7.9.3" VER_JHIPSTER_DEF="7.9.3" @@ -33,20 +33,20 @@ VER_JHIPSTER_DEF="7.9.3" # OTHER DEPENDENCIES # JDK -VER_JDK_REQ="11.*.*" -VER_JDK_DEF="11.0.17" +VER_JDK_REQ="17.*.*" +VER_JDK_DEF="17.0.18" # NODE VER_NODE_REQ="14.*.*" VER_NODE_DEF="v14.20.0" # K3S -VER_K3S_REQ="1.23.*" -VER_K3S_DEF="v1.23.16+k3s1" +VER_K3S_REQ="1.26.*" +VER_K3S_DEF="v1.32.13+k3s1" # OPENSHIFT OKD -VER_OKD_REQ="4.11" -VER_OKD_DEF="4.11" +VER_OKD_REQ="4.13" +VER_OKD_DEF="4.18" # --------------------------------------------------------------------------------