This repository has been archived by the owner on Mar 24, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 70
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add integration test for deployment labels
- Loading branch information
1 parent
908ad07
commit e1ff2b5
Showing
15 changed files
with
783 additions
and
2 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
26 changes: 26 additions & 0 deletions
26
integration/update/jenkins-deployment-labels/expected/.ship/state.json
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 |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| { | ||
| "v1": { | ||
| "config": {}, | ||
| "helmValues": "Master:\n Name: jenkins-master\n Image: jenkins/jenkins\n ImageTag: lts\n ImagePullPolicy: Always\n Component: jenkins-master\n UseSecurity: true\n HostNetworking: false\n AdminUser: admin\n resources:\n requests:\n cpu: 50m\n memory: 256Mi\n limits:\n cpu: 2000m\n memory: 2048Mi\n UsePodSecurityContext: true\n ServicePort: 8080\n ServiceType: LoadBalancer\n ServiceAnnotations: {}\n HealthProbes: true\n HealthProbesLivenessTimeout: 90\n HealthProbesReadinessTimeout: 60\n HealthProbeLivenessFailureThreshold: 12\n SlaveListenerPort: 50000\n DisabledAgentProtocols:\n - JNLP-connect\n - JNLP2-connect\n CSRF:\n DefaultCrumbIssuer:\n Enabled: true\n ProxyCompatability: true\n CLI: false\n SlaveListenerServiceType: ClusterIP\n SlaveListenerServiceAnnotations: {}\n LoadBalancerSourceRanges:\n - 0.0.0.0/0\n ExtraPorts: null\n InstallPlugins:\n - kubernetes:1.12.4\n - workflow-job:2.24\n - workflow-aggregator:2.5\n - credentials-binding:1.16\n - git:3.9.1\n InitScripts: null\n CustomConfigMap: {}\n OverwriteConfig: false\n NodeSelector: {}\n Tolerations: {}\n PodAnnotations: {}\n Ingress:\n ApiVersion: extensions/v1beta1\n Annotations: {}\n TLS: null\n AdminPassword: secret\nAgent:\n Enabled: true\n Image: jenkins/jnlp-slave\n ImageTag: 3.10-1\n CustomJenkinsLabels: []\n Component: jenkins-slave\n Privileged: false\n resources:\n requests:\n cpu: 200m\n memory: 256Mi\n limits:\n cpu: 200m\n memory: 256Mi\n AlwaysPullImage: false\n PodRetention: Never\n volumes: null\n NodeSelector: {}\nPersistence:\n Enabled: true\n Annotations: {}\n AccessMode: ReadWriteOnce\n Size: 8Gi\n volumes: null\n mounts: null\nNetworkPolicy:\n Enabled: false\n ApiVersion: extensions/v1beta1\nrbac:\n install: false\n serviceAccountName: default\n roleRef: cluster-admin\n roleBindingKind: ClusterRoleBinding\n", | ||
| "releaseName": "jenkins", | ||
| "helmValuesDefaults": "# Default values for jenkins.\n# This is a YAML-formatted file.\n# Declare name/value pairs to be passed into your templates.\n# name: value\n\n## Overrides for generated resource names\n# See templates/_helpers.tpl\n# nameOverride:\n# fullnameOverride:\n\nMaster:\n Name: jenkins-master\n Image: \"jenkins/jenkins\"\n ImageTag: \"lts\"\n ImagePullPolicy: \"Always\"\n# ImagePullSecret: jenkins\n Component: \"jenkins-master\"\n UseSecurity: true\n HostNetworking: false\n AdminUser: admin\n # AdminPassword: \u003cdefaults to random\u003e\n resources:\n requests:\n cpu: \"50m\"\n memory: \"256Mi\"\n limits:\n cpu: \"2000m\"\n memory: \"2048Mi\"\n # Environment variables that get added to the init container (useful for e.g. http_proxy)\n # InitContainerEnv:\n # - name: http_proxy\n # value: \"http://192.168.64.1:3128\"\n # ContainerEnv:\n # - name: http_proxy\n # value: \"http://192.168.64.1:3128\"\n # Set min/max heap here if needed with:\n # JavaOpts: \"-Xms512m -Xmx512m\"\n # JenkinsOpts: \"\"\n # JenkinsUriPrefix: \"/jenkins\"\n # Enable pod security context (must be `true` if RunAsUser or FsGroup are set)\n UsePodSecurityContext: true\n # Set RunAsUser to 1000 to let Jenkins run as non-root user 'jenkins' which exists in 'jenkins/jenkins' docker image.\n # When setting RunAsUser to a different value than 0 also set FsGroup to the same value:\n # RunAsUser: \u003cdefaults to 0\u003e\n # FsGroup: \u003cwill be omitted in deployment if RunAsUser is 0\u003e\n ServicePort: 8080\n # For minikube, set this to NodePort, elsewhere use LoadBalancer\n # Use ClusterIP if your setup includes ingress controller\n ServiceType: LoadBalancer\n # Master Service annotations\n ServiceAnnotations: {}\n # service.beta.kubernetes.io/aws-load-balancer-backend-protocol: https\n # Used to create Ingress record (should used with ServiceType: ClusterIP)\n # HostName: jenkins.cluster.local\n # NodePort: \u003cto set explicitly, choose port between 30000-32767\n # Enable Kubernetes Liveness and Readiness Probes\n # ~ 2 minutes to allow Jenkins to restart when upgrading plugins. Set ReadinessTimeout to be shorter than LivenessTimeout.\n HealthProbes: true\n HealthProbesLivenessTimeout: 90\n HealthProbesReadinessTimeout: 60\n HealthProbeLivenessFailureThreshold: 12\n SlaveListenerPort: 50000\n DisabledAgentProtocols:\n - JNLP-connect\n - JNLP2-connect\n CSRF:\n DefaultCrumbIssuer:\n Enabled: true\n ProxyCompatability: true\n CLI: false\n # Kubernetes service type for the JNLP slave service\n # SETTING THIS TO \"LoadBalancer\" IS A HUGE SECURITY RISK: https://github.com/kubernetes/charts/issues/1341\n SlaveListenerServiceType: ClusterIP\n SlaveListenerServiceAnnotations: {}\n LoadBalancerSourceRanges:\n - 0.0.0.0/0\n # Optionally assign a known public LB IP\n # LoadBalancerIP: 1.2.3.4\n # Optionally configure a JMX port\n # requires additional JavaOpts, ie\n # JavaOpts: \u003e\n # -Dcom.sun.management.jmxremote.port=4000\n # -Dcom.sun.management.jmxremote.authenticate=false\n # -Dcom.sun.management.jmxremote.ssl=false\n # JMXPort: 4000\n # Optionally configure other ports to expose in the Master container\n ExtraPorts:\n # - name: BuildInfoProxy\n # port: 9000\n # List of plugins to be install during Jenkins master start\n InstallPlugins:\n - kubernetes:1.12.4\n - workflow-job:2.24\n - workflow-aggregator:2.5\n - credentials-binding:1.16\n - git:3.9.1\n # Used to approve a list of groovy functions in pipelines used the script-security plugin. Can be viewed under /scriptApproval\n # ScriptApproval:\n # - \"method groovy.json.JsonSlurperClassic parseText java.lang.String\"\n # - \"new groovy.json.JsonSlurperClassic\"\n # List of groovy init scripts to be executed during Jenkins master start\n InitScripts:\n # - |\n # print 'adding global pipeline libraries, register properties, bootstrap jobs...'\n # Kubernetes secret that contains a 'credentials.xml' for Jenkins\n # CredentialsXmlSecret: jenkins-credentials\n # Kubernetes secret that contains files to be put in the Jenkins 'secrets' directory,\n # useful to manage encryption keys used for credentials.xml for instance (such as\n # master.key and hudson.util.Secret)\n # SecretsFilesSecret: jenkins-secrets\n # Jenkins XML job configs to provision\n # Jobs: |-\n # test: |-\n # \u003c\u003cxml here\u003e\u003e\n CustomConfigMap: false\n # By default, the configMap is only used to set the initial config the first time\n # that the chart is installed. Setting `OverwriteConfig` to `true` will overwrite\n # the jenkins config with the contents of the configMap every time the pod starts.\n OverwriteConfig: false\n # Node labels and tolerations for pod assignment\n # ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector\n # ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature\n NodeSelector: {}\n Tolerations: {}\n PodAnnotations: {}\n\n Ingress:\n ApiVersion: extensions/v1beta1\n Annotations: {}\n # kubernetes.io/ingress.class: nginx\n # kubernetes.io/tls-acme: \"true\"\n\n TLS:\n # - secretName: jenkins.cluster.local\n # hosts:\n # - jenkins.cluster.local\n\nAgent:\n Enabled: true\n Image: jenkins/jnlp-slave\n ImageTag: 3.10-1\n CustomJenkinsLabels: []\n# ImagePullSecret: jenkins\n Component: \"jenkins-slave\"\n Privileged: false\n resources:\n requests:\n cpu: \"200m\"\n memory: \"256Mi\"\n limits:\n cpu: \"200m\"\n memory: \"256Mi\"\n # You may want to change this to true while testing a new image\n AlwaysPullImage: false\n # Controls how slave pods are retained after the Jenkins build completes\n # Possible values: Always, Never, OnFailure\n PodRetention: Never\n # You can define the volumes that you want to mount for this container\n # Allowed types are: ConfigMap, EmptyDir, HostPath, Nfs, Pod, Secret\n # Configure the attributes as they appear in the corresponding Java class for that type\n # https://github.com/jenkinsci/kubernetes-plugin/tree/master/src/main/java/org/csanchez/jenkins/plugins/kubernetes/volumes\n volumes:\n # - type: Secret\n # secretName: mysecret\n # mountPath: /var/myapp/mysecret\n NodeSelector: {}\n # Key Value selectors. Ex:\n # jenkins-agent: v1\n\nPersistence:\n Enabled: true\n ## A manually managed Persistent Volume and Claim\n ## Requires Persistence.Enabled: true\n ## If defined, PVC must be created manually before volume will be bound\n # ExistingClaim:\n\n ## jenkins data Persistent Volume Storage Class\n ## If defined, storageClassName: \u003cstorageClass\u003e\n ## If set to \"-\", storageClassName: \"\", which disables dynamic provisioning\n ## If undefined (the default) or set to null, no storageClassName spec is\n ## set, choosing the default provisioner. (gp2 on AWS, standard on\n ## GKE, AWS \u0026 OpenStack)\n ##\n # StorageClass: \"-\"\n\n Annotations: {}\n AccessMode: ReadWriteOnce\n Size: 8Gi\n volumes:\n # - name: nothing\n # emptyDir: {}\n mounts:\n # - mountPath: /var/nothing\n # name: nothing\n # readOnly: true\n\nNetworkPolicy:\n # Enable creation of NetworkPolicy resources.\n Enabled: false\n # For Kubernetes v1.4, v1.5 and v1.6, use 'extensions/v1beta1'\n # For Kubernetes v1.7, use 'networking.k8s.io/v1'\n ApiVersion: extensions/v1beta1\n\n## Install Default RBAC roles and bindings\nrbac:\n install: false\n serviceAccountName: default\n # Role reference\n roleRef: cluster-admin\n # Role kind (RoleBinding or ClusterRoleBinding)\n roleBindingKind: ClusterRoleBinding\n", | ||
| "kustomize": { | ||
| "overlays": { | ||
| "ship": { | ||
| "excludedBases": [ | ||
| "/jenkins-test.yaml" | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "upstream": "github.com/helm/charts/tree/78858a2fb07aebe082efb11b8991b60e7fdd5d60/stable/jenkins", | ||
| "metadata": { | ||
| "applicationType": "helm", | ||
| "icon": "https://wiki.jenkins-ci.org/download/attachments/2916393/logo.png", | ||
| "name": "jenkins", | ||
| "releaseNotes": "Added ExtraPorts to open in the master pod (#7759)\n\n* Added ExtraPorts to open in the master pod\n\nSigned-off-by: ecejjar \u003cjesus.javier.arauz@ericsson.com\u003e\n\n* [stable/jenkins] Bumped up chart version\n\nSigned-off-by: ecejjar \u003cjesus.javier.arauz@ericsson.com\u003e", | ||
| "version": "0.20.1" | ||
| }, | ||
| "contentSHA": "c25b3cd58e801f1a642961c860c4162da2c171fa8a8cd33d32012c36631535e9" | ||
| } | ||
| } |
136 changes: 136 additions & 0 deletions
136
integration/update/jenkins-deployment-labels/expected/base/config.yaml
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 |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| apiVersion: v1 | ||
| data: | ||
| apply_config.sh: |- | ||
| mkdir -p /usr/share/jenkins/ref/secrets/; | ||
| echo "false" > /usr/share/jenkins/ref/secrets/slave-to-master-security-kill-switch; | ||
| cp --no-clobber /var/jenkins_config/config.xml /var/jenkins_home; | ||
| cp --no-clobber /var/jenkins_config/jenkins.CLI.xml /var/jenkins_home; | ||
| cp --no-clobber /var/jenkins_config/jenkins.model.JenkinsLocationConfiguration.xml /var/jenkins_home; | ||
| # Install missing plugins | ||
| cp /var/jenkins_config/plugins.txt /var/jenkins_home; | ||
| rm -rf /usr/share/jenkins/ref/plugins/*.lock | ||
| /usr/local/bin/install-plugins.sh `echo $(cat /var/jenkins_home/plugins.txt)`; | ||
| # Copy plugins to shared volume | ||
| cp -n /usr/share/jenkins/ref/plugins/* /var/jenkins_plugins; | ||
| config.xml: |- | ||
| <?xml version='1.0' encoding='UTF-8'?> | ||
| <hudson> | ||
| <disabledAdministrativeMonitors/> | ||
| <version>lts</version> | ||
| <numExecutors>0</numExecutors> | ||
| <mode>NORMAL</mode> | ||
| <useSecurity>true</useSecurity> | ||
| <authorizationStrategy class="hudson.security.FullControlOnceLoggedInAuthorizationStrategy"> | ||
| <denyAnonymousReadAccess>true</denyAnonymousReadAccess> | ||
| </authorizationStrategy> | ||
| <securityRealm class="hudson.security.LegacySecurityRealm"/> | ||
| <disableRememberMe>false</disableRememberMe> | ||
| <projectNamingStrategy class="jenkins.model.ProjectNamingStrategy$DefaultProjectNamingStrategy"/> | ||
| <workspaceDir>${JENKINS_HOME}/workspace/${ITEM_FULLNAME}</workspaceDir> | ||
| <buildsDir>${ITEM_ROOTDIR}/builds</buildsDir> | ||
| <markupFormatter class="hudson.markup.EscapedMarkupFormatter"/> | ||
| <jdks/> | ||
| <viewsTabBar class="hudson.views.DefaultViewsTabBar"/> | ||
| <myViewsTabBar class="hudson.views.DefaultMyViewsTabBar"/> | ||
| <clouds> | ||
| <org.csanchez.jenkins.plugins.kubernetes.KubernetesCloud plugin="kubernetes@1.12.4"> | ||
| <name>kubernetes</name> | ||
| <templates> | ||
| <org.csanchez.jenkins.plugins.kubernetes.PodTemplate> | ||
| <inheritFrom></inheritFrom> | ||
| <name>default</name> | ||
| <instanceCap>2147483647</instanceCap> | ||
| <idleMinutes>0</idleMinutes> | ||
| <label>jenkins-jenkins-slave </label> | ||
| <nodeSelector></nodeSelector> | ||
| <nodeUsageMode>NORMAL</nodeUsageMode> | ||
| <volumes> | ||
| </volumes> | ||
| <containers> | ||
| <org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate> | ||
| <name>jnlp</name> | ||
| <image>jenkins/jnlp-slave:3.10-1</image> | ||
| <privileged>false</privileged> | ||
| <alwaysPullImage>false</alwaysPullImage> | ||
| <workingDir>/home/jenkins</workingDir> | ||
| <command></command> | ||
| <args>${computer.jnlpmac} ${computer.name}</args> | ||
| <ttyEnabled>false</ttyEnabled> | ||
| # Resources configuration is a little hacky. This was to prevent breaking | ||
| # changes, and should be cleanned up in the future once everybody had | ||
| # enough time to migrate. | ||
| <resourceRequestCpu>200m</resourceRequestCpu> | ||
| <resourceRequestMemory>256Mi</resourceRequestMemory> | ||
| <resourceLimitCpu>200m</resourceLimitCpu> | ||
| <resourceLimitMemory>256Mi</resourceLimitMemory> | ||
| <envVars> | ||
| <org.csanchez.jenkins.plugins.kubernetes.ContainerEnvVar> | ||
| <key>JENKINS_URL</key> | ||
| <value>http://jenkins:8080</value> | ||
| </org.csanchez.jenkins.plugins.kubernetes.ContainerEnvVar> | ||
| </envVars> | ||
| </org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate> | ||
| </containers> | ||
| <envVars/> | ||
| <annotations/> | ||
| <imagePullSecrets/> | ||
| <nodeProperties/> | ||
| <podRetention class="org.csanchez.jenkins.plugins.kubernetes.pod.retention.Default"/> | ||
| </org.csanchez.jenkins.plugins.kubernetes.PodTemplate></templates> | ||
| <serverUrl>https://kubernetes.default</serverUrl> | ||
| <skipTlsVerify>false</skipTlsVerify> | ||
| <namespace>default</namespace> | ||
| <jenkinsUrl>http://jenkins:8080</jenkinsUrl> | ||
| <jenkinsTunnel>jenkins-agent:50000</jenkinsTunnel> | ||
| <containerCap>10</containerCap> | ||
| <retentionTimeout>5</retentionTimeout> | ||
| <connectTimeout>0</connectTimeout> | ||
| <readTimeout>0</readTimeout> | ||
| <podRetention class="org.csanchez.jenkins.plugins.kubernetes.pod.retention.Never"/> | ||
| </org.csanchez.jenkins.plugins.kubernetes.KubernetesCloud> | ||
| </clouds> | ||
| <quietPeriod>5</quietPeriod> | ||
| <scmCheckoutRetryCount>0</scmCheckoutRetryCount> | ||
| <views> | ||
| <hudson.model.AllView> | ||
| <owner class="hudson" reference="../../.."/> | ||
| <name>All</name> | ||
| <filterExecutors>false</filterExecutors> | ||
| <filterQueue>false</filterQueue> | ||
| <properties class="hudson.model.View$PropertyList"/> | ||
| </hudson.model.AllView> | ||
| </views> | ||
| <primaryView>All</primaryView> | ||
| <slaveAgentPort>50000</slaveAgentPort> | ||
| <disabledAgentProtocols> | ||
| <string>JNLP-connect</string> | ||
| <string>JNLP2-connect</string> | ||
| </disabledAgentProtocols> | ||
| <label></label> | ||
| <crumbIssuer class="hudson.security.csrf.DefaultCrumbIssuer"> | ||
| <excludeClientIPFromCrumb>true</excludeClientIPFromCrumb> | ||
| </crumbIssuer> | ||
| <nodeProperties/> | ||
| <globalNodeProperties/> | ||
| <noUsageStatistics>true</noUsageStatistics> | ||
| </hudson> | ||
| jenkins.CLI.xml: |- | ||
| <?xml version='1.1' encoding='UTF-8'?> | ||
| <jenkins.CLI> | ||
| <enabled>false</enabled> | ||
| </jenkins.CLI> | ||
| jenkins.model.JenkinsLocationConfiguration.xml: |- | ||
| <?xml version='1.1' encoding='UTF-8'?> | ||
| <jenkins.model.JenkinsLocationConfiguration> | ||
| <adminAddress></adminAddress> | ||
| <jenkinsUrl>http://jenkins:8080</jenkinsUrl> | ||
| </jenkins.model.JenkinsLocationConfiguration> | ||
| plugins.txt: |- | ||
| kubernetes:1.12.4 | ||
| workflow-job:2.24 | ||
| workflow-aggregator:2.5 | ||
| credentials-binding:1.16 | ||
| git:3.9.1 | ||
| kind: ConfigMap | ||
| metadata: | ||
| name: jenkins |
15 changes: 15 additions & 0 deletions
15
integration/update/jenkins-deployment-labels/expected/base/home-pvc.yaml
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 |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| apiVersion: v1 | ||
| kind: PersistentVolumeClaim | ||
| metadata: | ||
| labels: | ||
| app: jenkins | ||
| chart: jenkins-0.20.1 | ||
| heritage: Tiller | ||
| release: jenkins | ||
| name: jenkins | ||
| spec: | ||
| accessModes: | ||
| - ReadWriteOnce | ||
| resources: | ||
| requests: | ||
| storage: 8Gi |
16 changes: 16 additions & 0 deletions
16
integration/update/jenkins-deployment-labels/expected/base/jenkins-agent-svc.yaml
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 |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| apiVersion: v1 | ||
| kind: Service | ||
| metadata: | ||
| labels: | ||
| app: jenkins | ||
| chart: jenkins-0.20.1 | ||
| component: jenkins-jenkins-master | ||
| name: jenkins-agent | ||
| spec: | ||
| ports: | ||
| - name: slavelistener | ||
| port: 50000 | ||
| targetPort: 50000 | ||
| selector: | ||
| component: jenkins-jenkins-master | ||
| type: ClusterIP |
Oops, something went wrong.